projects/linux·commit ca56a95e

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

ca56a95e · Linus Torvalds <[email protected]> · 2011-06-29 18:18:48 -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
Commit
ca56a95eedcc95f8fea7b49c87565cd961d74fe2
Parents
0e47427b · b271a988

Merge commit. Changes below are compared with the first parent: 0e47427b.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/gpu/drm/radeon/radeon_bios.cmodified+1−1View file

drivers/gpu/drm/radeon/radeon_bios.c

View file
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 1aba85c..3fc5fa1 100644
--- 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))