diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2009-11-04 03:42:52 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-11-23 22:04:49 -0500 |
commit | 5349ef3127c77075ff70b2014f17ae0fbcaaf199 (patch) | |
tree | 98d5c2234304833ba716c791aa7d5732a8d827cc /drivers/gpu/drm/drm_fb_helper.c | |
parent | 79cc304f3e2fda202242036326afb2aeca486156 (diff) |
drm/fb: fix FBIOGET/PUT_VSCREENINFO pixel clock handling
When the framebuffer driver does not publish detailed timing information
for the current video mode, the correct value for the pixclock field is
zero, not -1.
Since pixclock is actually unsigned, the value -1 would be interpreted
as 4294967295 picoseconds (i.e., about 4 milliseconds) by
register_framebuffer() and userspace programs.
This patch allows X.org's fbdev driver to work.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Tested-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index dc8e374a0b55..65ef011fa8ba 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -599,7 +599,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, | |||
599 | struct drm_framebuffer *fb = fb_helper->fb; | 599 | struct drm_framebuffer *fb = fb_helper->fb; |
600 | int depth; | 600 | int depth; |
601 | 601 | ||
602 | if (var->pixclock == -1 || !var->pixclock) | 602 | if (var->pixclock != 0) |
603 | return -EINVAL; | 603 | return -EINVAL; |
604 | 604 | ||
605 | /* Need to resize the fb object !!! */ | 605 | /* Need to resize the fb object !!! */ |
@@ -691,7 +691,7 @@ int drm_fb_helper_set_par(struct fb_info *info) | |||
691 | int ret; | 691 | int ret; |
692 | int i; | 692 | int i; |
693 | 693 | ||
694 | if (var->pixclock != -1) { | 694 | if (var->pixclock != 0) { |
695 | DRM_ERROR("PIXEL CLCOK SET\n"); | 695 | DRM_ERROR("PIXEL CLCOK SET\n"); |
696 | return -EINVAL; | 696 | return -EINVAL; |
697 | } | 697 | } |
@@ -904,7 +904,7 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev, | |||
904 | fb_helper->fb = fb; | 904 | fb_helper->fb = fb; |
905 | 905 | ||
906 | if (new_fb) { | 906 | if (new_fb) { |
907 | info->var.pixclock = -1; | 907 | info->var.pixclock = 0; |
908 | if (register_framebuffer(info) < 0) | 908 | if (register_framebuffer(info) < 0) |
909 | return -EINVAL; | 909 | return -EINVAL; |
910 | } else { | 910 | } else { |