[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <87sia6a8fr.fsf@intel.com>
Date: Fri, 05 Jun 2015 11:03:20 +0300
From: Jani Nikula <jani.nikula@...el.com>
To: "mpe\@ellerman.id.au" <michael@...abs.org>,
Dave Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel.vetter@...ll.ch>,
intel-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Nick Hoath <nicholas.hoath@...el.com>,
Ville Syrjälä <ville.syrjala@...ux.intel.com>,
"Damien Lespiau" <damien.lespiau@...el.com>
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
On Fri, 05 Jun 2015, "mpe@...erman.id.au" <michael@...abs.org> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7 ("drm/i915:
> Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
> drm-intel-fixes tree and commit b62adbd1ea1f ("drm/i915/bxt: Move
> WaForceEnableNonCoherent to Skylake only") from the drm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Our tree seems to have the if blocks the other way round. I don't think
it matters, but Ville, Damien, chime in if you think it does.
BR
Jani.
>
> cheers
>
> diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
> index 005b5e04de4d,d934f857394d..000000000000
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@@ -1017,13 -1030,17 +1023,24 @@@ static int skl_init_workarounds(struct
> WA_SET_BIT_MASKED(HIZ_CHICKEN,
> BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
>
> + if (INTEL_REVID(dev) == SKL_REVID_C0 ||
> + INTEL_REVID(dev) == SKL_REVID_D0)
> + /* WaBarrierPerformanceFixDisable:skl */
> + WA_SET_BIT_MASKED(HDC_CHICKEN0,
> + HDC_FENCE_DEST_SLM_DISABLE |
> + HDC_BARRIER_PERFORMANCE_DISABLE);
> +
> + if (INTEL_REVID(dev) <= SKL_REVID_D0) {
> + /*
> + *Use Force Non-Coherent whenever executing a 3D context. This
> + * is a workaround for a possible hang in the unlikely event
> + * a TLB invalidation occurs during a PSD flush.
> + */
> + /* WaForceEnableNonCoherent:skl */
> + WA_SET_BIT_MASKED(HDC_CHICKEN0,
> + HDC_FORCE_NON_COHERENT);
> + }
> +
> return skl_tune_iz_hashing(ring);
> }
>
--
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists