diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-02-18 16:22:53 -0600 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2010-02-18 16:22:53 -0600 |
| commit | 7d73481d224411dd41371af6cf274a6d376e0688 (patch) | |
| tree | c35ff38746bee3cf367a9655ae1a81b023204348 /drivers/gpu | |
| parent | 8c788dfbcc883fbbf32fb41fee20bc756b16bf99 (diff) | |
drm_fb_helper: Preserve capability to use atomic kms
Commit 5349ef3127c77075ff70b2014f17ae0fbcaaf199 changed logic of when
a pixclock was valid vs invalid.
The atomic kernel mode setting used by the kernel debugger relied 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')
| -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 ea06bf31b7b4..35ede534d736 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -677,7 +677,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 !!! */ |