drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
Subsystems (2)
PATCH 1/1 drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
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.)
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -7
@@ -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
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
good catch.
Quoted 45 lines · 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
ca6e4405779edrivers/gpu/drm/i915/intel_ringbuffer.cThis 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 <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ------- 1 file changed, 7 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-8@@ -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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 3 lines · Rodrigo Vivi
good catch.
Reviewed-by Rodrigo Vivi <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 57 lines · Marc Herbert
Quoted 45 lines
With this simple git diff command one can see that
skl_init_workarounds()got two copies of WaBarrierPerformanceFixDisable:skl:git diff -U21 ca6e4405779e^1
ca6e4405779edrivers/gpu/drm/i915/intel_ringbuffer.cThis 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 <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ------- 1 file changed, 7 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-8@@ -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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx