From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@intel.com>,
"Zanoni, Paulo R" <paulo.r.zanoni@intel.com>
Subject: Re: [PATCH 1/2] drm/i915/fbc: Don't set an illegal fence if unfenced
Date: Thu, 18 Aug 2016 13:33:53 +0300 [thread overview]
Message-ID: <1471516433.3659.5.camel@linux.intel.com> (raw)
In-Reply-To: <20160818082103.15702-1-chris@chris-wilson.co.uk>
On to, 2016-08-18 at 09:21 +0100, Chris Wilson wrote:
> @@ -190,9 +190,11 @@ static void g4x_fbc_activate(struct drm_i915_private *dev_priv)
> dpfc_ctl |= DPFC_CTL_LIMIT_2X;
> else
> dpfc_ctl |= DPFC_CTL_LIMIT_1X;
> - dpfc_ctl |= DPFC_CTL_FENCE_EN | params->fb.fence_reg;
>
> - I915_WRITE(DPFC_FENCE_YOFF, params->crtc.fence_y_offset);
> + if (params->fb.fence_reg != I915_FENCE_REG_NONE) {
> + dpfc_ctl |= DPFC_CTL_FENCE_EN | params->fb.fence_reg;
> + I915_WRITE(DPFC_FENCE_YOFF, params->crtc.fence_y_offset);
> + }
Here the fence_y_offset is conditional on the fence existing.
> @@ -244,21 +246,24 @@ static void ilk_fbc_activate(struct drm_i915_private *dev_priv)
> dpfc_ctl |= DPFC_CTL_LIMIT_1X;
> break;
> }
> - dpfc_ctl |= DPFC_CTL_FENCE_EN;
> - if (IS_GEN5(dev_priv))
> - dpfc_ctl |= params->fb.fence_reg;
> +
> + if (params->fb.fence_reg != I915_FENCE_REG_NONE) {
> + dpfc_ctl |= DPFC_CTL_FENCE_EN;
> + if (IS_GEN5(dev_priv))
> + dpfc_ctl |= params->fb.fence_reg;
> + if (IS_GEN6(dev_priv)) {
> + I915_WRITE(SNB_DPFC_CTL_SA,
> + SNB_CPU_FENCE_ENABLE | params->fb.fence_reg);
> + I915_WRITE(DPFC_CPU_FENCE_OFFSET,
> + params->crtc.fence_y_offset);
> + }
> + }
>
> I915_WRITE(ILK_DPFC_FENCE_YOFF, params->crtc.fence_y_offset);
Here it is not?
> @@ -305,7 +310,12 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)
> break;
> }
>
> - dpfc_ctl |= IVB_DPFC_CTL_FENCE_EN;
> + if (params->fb.fence_reg != I915_FENCE_REG_NONE) {
> + dpfc_ctl |= IVB_DPFC_CTL_FENCE_EN;
> + I915_WRITE(SNB_DPFC_CTL_SA,
> + SNB_CPU_FENCE_ENABLE | params->fb.fence_reg);
> + I915_WRITE(DPFC_CPU_FENCE_OFFSET, params->crtc.fence_y_offset);
> + }
>
> if (dev_priv->fbc.false_color)
> dpfc_ctl |= FBC_CTL_FALSE_COLOR;
> @@ -324,10 +334,6 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)
>
> I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl | DPFC_CTL_EN);
>
> - I915_WRITE(SNB_DPFC_CTL_SA,
> - SNB_CPU_FENCE_ENABLE | params->fb.fence_reg);
> - I915_WRITE(DPFC_CPU_FENCE_OFFSET, params->crtc.fence_y_offset);
Here it is again moved conditionally. So I suggest you unify that.
This changes the order of the register writes on older platforms so
Tested-bys would be good.
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-08-18 10:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 8:21 [PATCH 1/2] drm/i915/fbc: Don't set an illegal fence if unfenced Chris Wilson
2016-08-18 8:21 ` [PATCH 2/2] drm/i915/fbc: Allow on unfenced surfaces, for recent gen Chris Wilson
2016-08-18 13:56 ` Zanoni, Paulo R
2016-08-18 14:02 ` chris
2016-08-18 14:21 ` Joonas Lahtinen
2016-08-22 18:57 ` Zanoni, Paulo R
2016-08-23 0:39 ` Paulo Zanoni
2016-08-24 5:54 ` Daniel Vetter
2016-08-24 11:06 ` Daniel Vetter
2016-08-24 6:43 ` Chris Wilson
2016-08-24 14:22 ` Zanoni, Paulo R
2016-08-18 8:55 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915/fbc: Don't set an illegal fence if unfenced Patchwork
2016-08-18 10:33 ` Joonas Lahtinen [this message]
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=1471516433.3659.5.camel@linux.intel.com \
--to=joonas.lahtinen@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/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