From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: honor forced connector modes v2 Date: Tue, 4 Mar 2014 19:13:40 +0100 Message-ID: <20140304181340.GL17001@phenom.ffwll.local> References: <1392928087-1896-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by gabe.freedesktop.org (Postfix) with ESMTP id 717AFFB831 for ; Tue, 4 Mar 2014 10:37:53 -0800 (PST) Received: by mail-ee0-f44.google.com with SMTP id e49so2164167eek.31 for ; Tue, 04 Mar 2014 10:37:52 -0800 (PST) Content-Disposition: inline In-Reply-To: <1392928087-1896-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Feb 20, 2014 at 12:28:07PM -0800, Jesse Barnes wrote: > In the move over to use BIOS connector configs, we lost the ability to > force a specific set of connectors on or off. Try to remedy that by > dropping back to the old behavior if we detect a hard coded connector > config. > = > v2: don't deref connector state for disabled connectors (Jesse) > = > Reported-by: Ville Syrj=E4l=E4 > Signed-off-by: Jesse Barnes Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_fbdev.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/in= tel_fbdev.c > index 7693728..5935544 100644 > --- a/drivers/gpu/drm/i915/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > @@ -293,6 +293,24 @@ static bool intel_fb_initial_config(struct drm_fb_he= lper *fb_helper, > bool *save_enabled; > bool any_enabled =3D false; > = > + /* > + * If the user specified any force options, just bail here > + * and use that config. > + */ > + for (i =3D 0; i < fb_helper->connector_count; i++) { > + struct drm_fb_helper_connector *fb_conn; > + struct drm_connector *connector; > + > + fb_conn =3D fb_helper->connector_info[i]; > + connector =3D fb_conn->connector; > + > + if (!enabled[i]) > + continue; > + > + if (connector->force !=3D DRM_FORCE_UNSPECIFIED) > + return false; > + } > + > save_enabled =3D kcalloc(dev->mode_config.num_connector, sizeof(bool), > GFP_KERNEL); > if (!save_enabled) > -- = > 1.7.9.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch