Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

torvalds · torvalds · commit ca56a95eedcc · 2011-06-29T18:18:48.000-07:00
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: increase rom size for atrm method
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -104,7 +104,7 @@ static bool radeon_read_bios(struct radeon_device *rdev)
 static bool radeon_atrm_get_bios(struct radeon_device *rdev)
 {
 	int ret;
-	int size = 64 * 1024;
+	int size = 256 * 1024;
 	int i;
 
 	if (!radeon_atrm_supported(rdev->pdev))

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static bool radeon_read_bios(struct radeon_device *rdev)`
`104`	`104`	`static bool radeon_atrm_get_bios(struct radeon_device *rdev)`
`105`	`105`	`{`
`106`	`106`	`int ret;`
`107`		`- int size = 64 * 1024;`
	`107`	`+ int size = 256 * 1024;`
`108`	`108`	`int i;`
`109`	`109`
`110`	`110`	`if (!radeon_atrm_supported(rdev->pdev))`