[kdb] [PATCH 35/37] drm_fb_helper: Preserve capability to use atomic kms

Jason Wessel jason.wessel at windriver.com
Wed Dec 23 15:43:02 CST 2009


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 at linux.ie>
CC: Jesse Barnes <jbarnes at virtuousgeek.org>
CC: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
---
 drivers/gpu/drm/drm_fb_helper.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 80aab3c..b390fd8 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -683,6 +683,10 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 
 	if (var->pixclock != 0)
 		return -EINVAL;
+#ifdef CONFIG_KGDB
+	if (atomic_read(&kgdb_active) != -1)
+		return -EINVAL;
+#endif
 
 	/* Need to resize the fb object !!! */
 	if (var->xres > fb->width || var->yres > fb->height) {
-- 
1.6.4.rc1



More information about the kdb mailing list