[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1261604584-5796-3-git-send-email-jason.wessel@windriver.com>
Date: Wed, 23 Dec 2009 15:43:02 -0600
From: Jason Wessel <jason.wessel@...driver.com>
To: linux-kernel@...r.kernel.org
Cc: kgdb-bugreport@...ts.sourceforge.net, kdb@....sgi.com,
mingo@...e.hu, Jason Wessel <jason.wessel@...driver.com>,
David Airlie <airlied@...ux.ie>,
Jesse Barnes <jbarnes@...tuousgeek.org>,
Clemens Ladisch <clemens@...isch.de>
Subject: [PATCH 35/37] 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@...ux.ie>
CC: Jesse Barnes <jbarnes@...tuousgeek.org>
CC: Clemens Ladisch <clemens@...isch.de>
Signed-off-by: Jason Wessel <jason.wessel@...driver.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists