* [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
@ 2015-07-29 19:21 Marc Herbert
2015-07-30 21:52 ` Rodrigo Vivi
2015-07-30 23:32 ` shuang.he
0 siblings, 2 replies; 4+ messages in thread
From: Marc Herbert @ 2015-07-29 19:21 UTC (permalink / raw)
To: intel-gfx; +Cc: Marc Herbert
With this simple git diff command one can see that skl_init_workarounds()
got two copies of WaBarrierPerformanceFixDisable:skl:
git diff -U21 ca6e4405779e^1 ca6e4405779e drivers/gpu/drm/i915/intel_ringbuffer.c
This happened when the backmerge of drm-intel-fixes-2015-07-15
Merged the same fix on both sides. Same fix but not identical enough for
git: with a different surrounding context; hence the code duplication.
This commit merely reverts the output of the git command above
= the duplication introduced in the backmerge.
(This duplication was found while running git sanity checks on a
_linearized_ i915 forklift for ChromeOS.)
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 177f7ed16cf0..1c14233d179f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1041,13 +1041,6 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
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
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
2015-07-29 19:21 [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl Marc Herbert
@ 2015-07-30 21:52 ` Rodrigo Vivi
2015-08-05 8:17 ` Daniel Vetter
2015-07-30 23:32 ` shuang.he
1 sibling, 1 reply; 4+ messages in thread
From: Rodrigo Vivi @ 2015-07-30 21:52 UTC (permalink / raw)
To: Marc Herbert; +Cc: intel-gfx
good catch.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Wed, Jul 29, 2015 at 12:21 PM, Marc Herbert <marc.herbert@intel.com> wrote:
> With this simple git diff command one can see that skl_init_workarounds()
> got two copies of WaBarrierPerformanceFixDisable:skl:
>
> git diff -U21 ca6e4405779e^1 ca6e4405779e drivers/gpu/drm/i915/intel_ringbuffer.c
>
> This happened when the backmerge of drm-intel-fixes-2015-07-15
> Merged the same fix on both sides. Same fix but not identical enough for
> git: with a different surrounding context; hence the code duplication.
>
> This commit merely reverts the output of the git command above
> = the duplication introduced in the backmerge.
>
> (This duplication was found while running git sanity checks on a
> _linearized_ i915 forklift for ChromeOS.)
>
> Signed-off-by: Marc Herbert <marc.herbert@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 177f7ed16cf0..1c14233d179f 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1041,13 +1041,6 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
> 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
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
2015-07-30 21:52 ` Rodrigo Vivi
@ 2015-08-05 8:17 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-08-05 8:17 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: Marc Herbert, intel-gfx
On Thu, Jul 30, 2015 at 02:52:07PM -0700, Rodrigo Vivi wrote:
> good catch.
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Queued for -next, thanks for the patch.
-Daniel
>
> On Wed, Jul 29, 2015 at 12:21 PM, Marc Herbert <marc.herbert@intel.com> wrote:
> > With this simple git diff command one can see that skl_init_workarounds()
> > got two copies of WaBarrierPerformanceFixDisable:skl:
> >
> > git diff -U21 ca6e4405779e^1 ca6e4405779e drivers/gpu/drm/i915/intel_ringbuffer.c
> >
> > This happened when the backmerge of drm-intel-fixes-2015-07-15
> > Merged the same fix on both sides. Same fix but not identical enough for
> > git: with a different surrounding context; hence the code duplication.
> >
> > This commit merely reverts the output of the git command above
> > = the duplication introduced in the backmerge.
> >
> > (This duplication was found while running git sanity checks on a
> > _linearized_ i915 forklift for ChromeOS.)
> >
> > Signed-off-by: Marc Herbert <marc.herbert@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_ringbuffer.c | 7 -------
> > 1 file changed, 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > index 177f7ed16cf0..1c14233d179f 100644
> > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > @@ -1041,13 +1041,6 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
> > 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
> > --
> > 2.1.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
2015-07-29 19:21 [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl Marc Herbert
2015-07-30 21:52 ` Rodrigo Vivi
@ 2015-07-30 23:32 ` shuang.he
1 sibling, 0 replies; 4+ messages in thread
From: shuang.he @ 2015-07-30 23:32 UTC (permalink / raw)
To: shuang.he, julianx.dumez, christophe.sureau, lei.a.liu, intel-gfx,
marc.herbert
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6895
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -1 297/297 296/297
SNB 315/315 315/315
IVB 342/342 342/342
BYT -1 282/282 281/282
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@flip-vs-dpms-interruptible PASS(1) DMESG_WARN(1)
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-05 8:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-29 19:21 [PATCH] drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl Marc Herbert
2015-07-30 21:52 ` Rodrigo Vivi
2015-08-05 8:17 ` Daniel Vetter
2015-07-30 23:32 ` shuang.he
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox