diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-08-05 09:22:32 -0500 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2010-08-05 09:22:32 -0500 |
| commit | f90ebd9e98f366c41773ad8d0482dade668f5103 (patch) | |
| tree | fdc206571a96b405f64e1b211205d7861e5ba544 /drivers/gpu/drm/drm_fb_helper.c | |
| parent | c924b934d0cd14a4559611da91f28f59acebe32a (diff) | |
| download | op-kernel-dev-f90ebd9e98f366c41773ad8d0482dade668f5103.zip op-kernel-dev-f90ebd9e98f366c41773ad8d0482dade668f5103.tar.gz | |
drm_fb_helper: Preserve capability to use atomic kms
Commit 5349ef3127c77075ff70b2014f17ae0fbcaaf199 (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 <airlied@linux.ie>
CC: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -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 6245add..de82e20 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -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 !!! */ |
