Subject: linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 28 Apr 2010 13:58:23 +1000

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/r300.c between commit
94f7bf647315472c80b8368c849739038e5620a3 ("drm/radeon: 9800 SE has only
one quadpipe") from Linus' tree and commit
90aca4d2740255bd130ea71a91530b9920c70abe ("drm/radeon/kms: simplify &
improve GPU reset V2") from the drm tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/radeon/r300.c
index eaf1f6b,bb005bf..0000000
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@@ -323,9 -328,9 +328,8 @@@ void r300_gpu_init(struct radeon_devic
  {
  	uint32_t gb_tile_config, tmp;
  
- 	r100_hdp_reset(rdev);
 -	/* FIXME: rv380 one pipes ? */
  	if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) ||
 -	    (rdev->family == CHIP_R350)) {
 +	    (rdev->family == CHIP_R350 && rdev->pdev->device != 0x4148)) {
  		/* r300,r350 */
  		rdev->num_gb_pipes = 2;
  	} else {