Skip to content

Commit

Permalink
drm_fb_helper: Preserve capability to use atomic kms
Browse files Browse the repository at this point in the history
Commit 5349ef3 (drm/fb: fix
FBIOGET/PUT_VSCREENINFO pixel clock handling) changed the logic of
when a pixclock was valid vs invalid.

The atomic kernel mode setting used by the kernel debugger relies upon
the drm_fb_helper_check_var() to always return -EINVAL.  Until a
better solution exists, this behavior will be restored.

CC: David Airlie <[email protected]>
CC: Jesse Barnes <[email protected]>
CC: Clemens Ladisch <[email protected]>
Signed-off-by: Jason Wessel <[email protected]>
  • Loading branch information
jwessel committed Aug 5, 2010
1 parent c924b93 commit f90ebd9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_fb_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
struct drm_framebuffer *fb = fb_helper->fb;
int depth;

if (var->pixclock != 0)
if (var->pixclock != 0 || in_dbg_master())
return -EINVAL;

/* Need to resize the fb object !!! */
Expand Down

0 comments on commit f90ebd9

Please sign in to comment.