diff options
author | David S. Miller <davem@davemloft.net> | 2007-03-01 21:29:14 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-03-02 18:22:54 -0500 |
commit | 7ab876703dcbe852652db6441f0aadb3d6b75e94 (patch) | |
tree | 4c9f04c21962c5d6a265a4ae0adf19110ea3633e | |
parent | c4c31fe0e2298529afa1357ebd9dad54b44c4e19 (diff) |
[RADEON]: Fix blanking return value.
If you'll recall, over a year ago, I pointed out that the current
Radeon driver erroneously returns -EINVAL for valid blanking codes,
here is a link to that thread:
http://lkml.org/lkml/2006/1/28/6
No other driver does this, and it confuses the X server into thinking
that the device does not support blanking properly.
I looked again and there is simply no reason for the Radeon driver to
return -EINVAL for FB_BLANK_NORMAL. It claims it wants to do this in
order to convince fbcon to blank in software, right here:
if (fb_blank(info, blank))
fbcon_generic_blank(vc, info, blank);
to software blank the screen. But it only causes that to happen
in the FB_BLANK_NORMAL case.
That makes no sense because the Radeon code does this:
val |= CRTC_DISPLAY_DIS;
in the FB_BLANK_NORMAL case so should be blanking the hardware, and
there is therefore no reason to SW blank by returning -EINVAL.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Antonino Daplas <adaplas@gmail.com>
-rw-r--r-- | drivers/video/aty/radeon_base.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 7e228aded4c2..46ba1235f03a 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -1026,8 +1026,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch) | |||
1026 | break; | 1026 | break; |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | /* let fbcon do a soft blank for us */ | 1029 | return 0; |
1030 | return (blank == FB_BLANK_NORMAL) ? -EINVAL : 0; | ||
1031 | } | 1030 | } |
1032 | 1031 | ||
1033 | static int radeonfb_blank (int blank, struct fb_info *info) | 1032 | static int radeonfb_blank (int blank, struct fb_info *info) |