diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-15 02:27:00 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 03:10:28 +0300 |
| commit | 3632ef8909118db9584e1bed9538dc180adb32f8 (patch) | |
| tree | 033925e11aef3c700492b4da0a1332f710de1299 /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
| parent | 8473dbb43db92fa8de7c24d1973aaf1e0276a89f (diff) | |
| download | linux-3632ef8909118db9584e1bed9538dc180adb32f8.tar.xz | |
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/nouveau/nouveau_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index a26d04740c88..6d56a54b6e2e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -359,6 +359,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo); info->screen_size = size; + drm_fb_helper_fill_fix(info, fb->pitch, fb->depth); drm_fb_helper_fill_var(info, &nfbdev->helper, sizes->fb_width, sizes->fb_height); /* Set aperture base/size for vesafb takeover */ |