From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Meelis Roos <mroos@ut.ee>
Subject: Re: [PATCH] drm/i915: preserve pipe A quirk in i9xx_set_pipeconf
Date: Mon, 23 Sep 2013 11:17:33 +0300 [thread overview]
Message-ID: <20130923081733.GS4531@intel.com> (raw)
In-Reply-To: <1379875872-16674-1-git-send-email-daniel.vetter@ffwll.ch>
On Sun, Sep 22, 2013 at 08:51:12PM +0200, Daniel Vetter wrote:
> This regression has been introduced in
>
> commit 9f11a9e4e50006b615ba94722dfc33ced89664cf
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Thu Jun 13 00:54:58 2013 +0200
>
> drm/i915: set up PIPECONF explicitly for i9xx/vlv platforms
>
> Ville brough up the idea that this is just the pipe A quirk gone
> wrong.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66462
> References: https://lkml.org/lkml/2013/8/26/238
> Cc: Meelis Roos <mroos@ut.ee>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f7d868e..be97b42 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4833,7 +4833,11 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
> struct drm_i915_private *dev_priv = dev->dev_private;
> uint32_t pipeconf;
>
> - pipeconf = 0;
> + if (dev_priv->quirks & QUIRK_PIPEA_FORCE) {
> + pipeconf =
> + I915_READ(PIPECONF(intel_crtc->pipe)) & PIPECONF_ENABLE;
> + } else
> + pipeconf = 0;
Hmm. Why not just this?
pipeconf = 0;
if (pipe == PIPE_A && QUIRK)
pipeconf |= PIPECONF_ENABLE;
>
> if (intel_crtc->config.double_wide)
> pipeconf |= PIPECONF_DOUBLE_WIDE;
> --
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2013-09-23 8:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-22 18:51 [PATCH] drm/i915: preserve pipe A quirk in i9xx_set_pipeconf Daniel Vetter
2013-09-23 8:17 ` Ville Syrjälä [this message]
2013-09-23 8:37 ` Daniel Vetter
2013-09-23 9:55 ` Chris Wilson
2013-09-23 21:18 ` Meelis Roos
2013-09-23 21:19 ` Chris Wilson
2013-09-24 9:05 ` Daniel Vetter
2013-09-24 9:11 ` Chris Wilson
2013-09-23 12:06 ` Meelis Roos
2013-09-23 20:05 ` Meelis Roos
2013-09-23 20:11 ` Chris Wilson
2013-09-24 9:46 ` Daniel Vetter
2013-09-24 12:05 ` Chris Wilson
2013-09-24 12:50 ` Daniel Vetter
2013-09-23 15:15 ` Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130923081733.GS4531@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=mroos@ut.ee \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox