From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Don't check gmch state on inherited configs Date: Wed, 23 Apr 2014 11:21:45 +0300 Message-ID: <20140423082145.GD18465@intel.com> References: <1397383233-18579-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id AE35C6EA14 for ; Wed, 23 Apr 2014 01:22:41 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1397383233-18579-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Intel Graphics Development , Alan Stern , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Sun, Apr 13, 2014 at 12:00:33PM +0200, Daniel Vetter wrote: > ... our current modeset code isn't good enough yet to handle this. The > scenario is: > = > 1. BIOS sets up a cloned config with lvds+external screen on the same > pipe, e.g. pipe B. > = > 2. We read out that state for pipe B and assign the gmch_pfit state to > it. > = > 3. The initial modeset switches the lvds to pipe A but due to lack of > atomic modeset we don't recompute the config of pipe B. > = > -> both pipes now claim (in the sw pipe config structure) to use the > gmch_pfit, which just won't work. > = > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D74081 > Cc: Alan Stern > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter Right. Until we get atomic modeset this seems like the least hackish thing to do. Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_display.c | 23 ++++++++++++++++++----- > drivers/gpu/drm/i915/intel_drv.h | 3 ++- > 2 files changed, 20 insertions(+), 6 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 1390ab5e00dc..7b7987dc65ba 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -9655,11 +9655,22 @@ intel_pipe_config_compare(struct drm_device *dev, > PIPE_CONF_CHECK_I(pipe_src_w); > PIPE_CONF_CHECK_I(pipe_src_h); > = > - PIPE_CONF_CHECK_I(gmch_pfit.control); > - /* pfit ratios are autocomputed by the hw on gen4+ */ > - if (INTEL_INFO(dev)->gen < 4) > - PIPE_CONF_CHECK_I(gmch_pfit.pgm_ratios); > - PIPE_CONF_CHECK_I(gmch_pfit.lvds_border_bits); > + /* > + * FIXME: BIOS likes to set up a cloned config with lvds+external > + * screen. Since we don't yet re-compute the pipe config when moving > + * just the lvds port away to another pipe the sw tracking won't match. > + * > + * Proper atomic modesets with recomputed global state will fix this. > + * Until then just don't check gmch state for inherited modes. > + */ > + if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_INHERITED_MODE)) { > + PIPE_CONF_CHECK_I(gmch_pfit.control); > + /* pfit ratios are autocomputed by the hw on gen4+ */ > + if (INTEL_INFO(dev)->gen < 4) > + PIPE_CONF_CHECK_I(gmch_pfit.pgm_ratios); > + PIPE_CONF_CHECK_I(gmch_pfit.lvds_border_bits); > + } > + > PIPE_CONF_CHECK_I(pch_pfit.enabled); > if (current_config->pch_pfit.enabled) { > PIPE_CONF_CHECK_I(pch_pfit.pos); > @@ -11618,6 +11629,8 @@ static void intel_modeset_readout_hw_state(struct= drm_device *dev) > base.head) { > memset(&crtc->config, 0, sizeof(crtc->config)); > = > + crtc->config.quirks |=3D PIPE_CONFIG_QUIRK_INHERITED_MODE; > + > crtc->active =3D dev_priv->display.get_pipe_config(crtc, > &crtc->config); > = > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/inte= l_drv.h > index c551472b892e..b885df150910 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -236,7 +236,8 @@ struct intel_crtc_config { > * tracked with quirk flags so that fastboot and state checker can act > * accordingly. > */ > -#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS (1<<0) /* unreliable sync mode= .flags */ > +#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS (1<<0) /* unreliable sync mode= .flags */ > +#define PIPE_CONFIG_QUIRK_INHERITED_MODE (1<<1) /* mode inherited from f= irmware */ > unsigned long quirks; > = > /* User requested mode, only valid as a starting point to > -- = > 1.8.4.rc3 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC