From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [RFC 03/12] drm/i915: Mark as legacy if KMS is disabled Date: Fri, 21 Feb 2014 09:28:25 +0100 Message-ID: <20140221082824.GH22574@ulmo.nvidia.com> References: <1392969328-23133-1-git-send-email-thierry.reding@gmail.com> <1392969328-23133-4-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0679129555==" Return-path: Received: from mail-bk0-f48.google.com (mail-bk0-f48.google.com [209.85.214.48]) by gabe.freedesktop.org (Postfix) with ESMTP id CFF48FB445 for ; Fri, 21 Feb 2014 00:28:28 -0800 (PST) Received: by mail-bk0-f48.google.com with SMTP id 6so942693bkj.35 for ; Fri, 21 Feb 2014 00:28:27 -0800 (PST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Ilia Mirkin Cc: "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org --===============0679129555== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="r5lq+205vWdkqwtk" Content-Disposition: inline --r5lq+205vWdkqwtk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 21, 2014 at 03:17:28AM -0500, Ilia Mirkin wrote: > On Fri, Feb 21, 2014 at 2:55 AM, Thierry Reding > wrote: > > From: Thierry Reding > > > > 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 > > --- > > drivers/gpu/drm/i915/i915_drv.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i91= 5_drv.c > > index 2d05d7ce4c29..ea916e117f01 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -985,13 +985,19 @@ static int __init i915_init(void) > > #if defined(CONFIG_DRM_I915_KMS) > > if (i915.modeset !=3D 0) > > driver.driver_features |=3D DRIVER_MODESET; > > + else > > + driver.driver_features |=3D DRIVER_LEGACY; > > #endif > > if (i915.modeset =3D=3D 1) > > driver.driver_features |=3D DRIVER_MODESET; > > + else > > + driver.driver_features |=3D DRIVER_LEGACY; >=20 > If i915.modeset =3D=3D -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? I don't see a reason why the combination would be illegal, but it doesn't make a lot of sense either. So I think the above hunk should be turned into this instead: + if (i915.modeset =3D=3D 0) + driver.driver_features |=3D DRIVER_LEGACY; Thierry --r5lq+205vWdkqwtk Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJTBw4oAAoJEN0jrNd/PrOhSQkQAILUvAOuBaBnRXhSXNzbTQBD 7MDgtGXIeiUaNhIDK1bPF/XBJsYyxiGwBhx+g7XwLvIgOr3UHNyC9gpiHoruiduZ auHzbaeFygZY6ZMilOsEvhJWaSkB2ALlc/fNiI9pIRxG8WWISpuCh6eKU8nnTvYe e54UpRuzCX3z69ofLbqkOfhdkhk/piWq4WctlUn91bwYVdjB4rHn96a8HByeCTcR SsbrcR7gi/XiWVBD2Dm1DnRq4DSxI8FG0A8pVPUJ6TYtExcrOWXKYDrQsy2HOR+H xGbJWhUuJSpj2mwWqGO8Oxy2dzgvUCXHFdEoTJj5ed81YRKgTOnKbhIDZkxrJ70c wS1qGcGmjQT+vlqvWhXSCWPK8B0SuxpnmdHr8pPh2L6BweQgABbet63IphdHMMsE lII5PJryPO5N059+TBVdBEXoaSGisEy4jPRDl8FjQaU95veeWb7NfAFdpelC8FAU 3yhdIhYVCf1H+PkcD5jDWPBYwU58ogMKuU1ue+l+sigXTlri7G/H1fLC44kPzPRP rKXic8uH2Yx6ekQhq+VkEiDDoXCsVc4PPCy55esaVJKr6C4qrm8xNwkU/1cSLdxk lXU0FccsihMNnn0RVS8Wed4N2RzPvJvNl3YrXD4fYvz4Hx1Ed4C3Ks080BKg2b2m EWExhKLnvAmmqPQ31wJH =39vZ -----END PGP SIGNATURE----- --r5lq+205vWdkqwtk-- --===============0679129555== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --===============0679129555==--