diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-01-18 16:47:04 +0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-25 16:04:47 +1000 |
| commit | 5fd4df4d475a7fee96fff54f6341192f547984e0 (patch) | |
| tree | d6a5c1f2c9cf8cca953aabed543f86c732e2adee | |
| parent | d796d8446fe0ff4442c1a1d0b10c861f17ac8168 (diff) | |
| download | op-kernel-dev-5fd4df4d475a7fee96fff54f6341192f547984e0.zip op-kernel-dev-5fd4df4d475a7fee96fff54f6341192f547984e0.tar.gz | |
drm: fix regression in fb blank handling
commit 731b5a15a3b1474a41c2ca29b4c32b0f21bc852e
Author: James Simmons <jsimmons@infradead.org>
Date: Thu Oct 29 20:39:07 2009 +0000
drm/kms: properly handle fbdev blanking
uses DRM_MODE_DPMS_ON for FB_BLANK_NORMAL, but DRM_MODE_DPMS_ON
is actually for turning output on instead of blank.
This makes fb blank broken on my T61, it put LVDS on but leave
pipe disabled which made screen totally white or caused some
'burning' effect.
[airlied: James objects to this but at this point in 2.6.33,
I can't see a patch that will fix this properly like he wants coming
in time and otherwise this is a regression - proper fix for 2.6.34
hopefully.]
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 1c2b7d4..0f9e9055 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -389,7 +389,7 @@ int drm_fb_helper_blank(int blank, struct fb_info *info) break; /* Display: Off; HSync: On, VSync: On */ case FB_BLANK_NORMAL: - drm_fb_helper_off(info, DRM_MODE_DPMS_ON); + drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY); break; /* Display: Off; HSync: Off, VSync: On */ case FB_BLANK_HSYNC_SUSPEND: |
