[RFC 03/12] drm/i915: Mark as legacy if KMS is disabled (original) (raw)

Ilia Mirkin imirkin at alum.mit.edu
Fri Feb 21 00:17:28 PST 2014

On Fri, Feb 21, 2014 at 2:55 AM, Thierry Reding <thierry.reding at gmail.com> wrote:

From: Thierry Reding <treding at nvidia.com>

When kernel mode-setting is disabled, mark the driver as legacy to pick up the special semantics required for userspace mode-setting. Signed-off-by: Thierry Reding <treding at nvidia.com> --- drivers/gpu/drm/i915/i915drv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915drv.c b/drivers/gpu/drm/i915/i915drv.c index 2d05d7ce4c29..ea916e117f01 100644 --- a/drivers/gpu/drm/i915/i915drv.c +++ b/drivers/gpu/drm/i915/i915drv.c _@@ -985,13 +985,19 @@ static int init i915init(void) #if defined(CONFIGDRMI915KMS) if (i915.modeset != 0) driver.driverfeatures |= DRIVERMODESET; + else + driver.driverfeatures |= DRIVERLEGACY; #endif if (i915.modeset == 1) driver.driverfeatures |= DRIVERMODESET; + else + driver.driverfeatures |= DRIVERLEGACY;

If i915.modeset == -1 (which seems like a legal value as per the hunk below, and I'm guessing the default), it'll end up with both MODESET and LEGACY. Is that a legal combination?

#ifdef CONFIGVGACONSOLE - if (vgacontextforce() && i915.modeset == -1) + if (vgacontextforce() && i915.modeset == -1) { driver.driverfeatures &= ~DRIVERMODESET; + driver.driverfeatures |= DRIVERLEGACY; + } #endif if (!(driver.driverfeatures & DRIVERMODESET)) { -- 1.8.4.2

dri-devel mailing list dri-devel at lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel

More information about the dri-devel mailing list