diff options
author | Dave Airlie <airlied@redhat.com> | 2011-01-14 18:27:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 19:10:28 -0500 |
commit | 3632ef8909118db9584e1bed9538dc180adb32f8 (patch) | |
tree | 033925e11aef3c700492b4da0a1332f710de1299 /drivers/gpu/drm/radeon/radeon_fb.c | |
parent | 8473dbb43db92fa8de7c24d1973aaf1e0276a89f (diff) |
Revert "drm: Update fbdev fb_fix_screeninfo"
This reverts commit dfe63bb0ad9810db13aab0058caba97866e0a681.
This commit was causing nouveau not to work properly, for -rc1 I'd
prefer it worked and we can look if this is useful for 2.6.39.
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fb.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index ca32e9c1e91d..66324b5bb5ba 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -225,6 +225,8 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, | |||
225 | 225 | ||
226 | strcpy(info->fix.id, "radeondrmfb"); | 226 | strcpy(info->fix.id, "radeondrmfb"); |
227 | 227 | ||
228 | drm_fb_helper_fill_fix(info, fb->pitch, fb->depth); | ||
229 | |||
228 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | 230 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; |
229 | info->fbops = &radeonfb_ops; | 231 | info->fbops = &radeonfb_ops; |
230 | 232 | ||