drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
From: Tvrtko Ursulin <[email protected]>
intel_ring_workarounds_emit is exactly the same code.
--- drivers/gpu/drm/i915/intel_lrc.c | 35 +-------------------------------- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 3 files changed, 3 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +1 -34
@@ -890,39 +890,6 @@ static int execlists_request_alloc(struct drm_i915_gem_request *request)return ret; } -static int intel_logical_ring_workarounds_emit (struct drm_i915_gem_request *req) -{ -struct i915_workarounds *w = &req->i915->workarounds; -u32 *cs; -int ret, i; - -if (w->count ==0 ) -return 0 ; - - ret = req->engine->emit_flush (req,EMIT_BARRIER ); -if (ret) -return ret; - - cs =intel_ring_begin (req, w->count *2 +2 ); -if (IS_ERR (cs)) -return PTR_ERR (cs); - - *cs++ =MI_LOAD_REGISTER_IMM (w->count); -for (i =0 ; i < w->count; i++) { - *cs++ =i915_mmio_reg_offset (w->reg[i].addr); - *cs++ = w->reg[i].value; - } - *cs++ =MI_NOOP ; - -intel_ring_advance (req, cs); - - ret = req->engine->emit_flush (req,EMIT_BARRIER ); -if (ret) -return ret; - -return 0 ; -} -#define wa_ctx_emit (batch, index, cmd) \ do { \ int __index = (index)++; \
@@ -1672,7 +1639,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req) {int ret; - ret =intel_logical_ring_workarounds_emit (req); + ret =intel_ring_workarounds_emit (req);if (ret)return ret;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -644,7 +644,7 @@ static void reset_ring_common(struct intel_engine_cs *engine, } } -static int intel_ring_workarounds_emit (struct drm_i915_gem_request *req) +int intel_ring_workarounds_emit (struct drm_i915_gem_request *req) {struct i915_workarounds *w = &req->i915->workarounds;u32 *cs;
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -560,6 +560,7 @@ static inline u32 intel_engine_last_submit(struct intel_engine_cs *engine) }int init_workarounds_ring (struct intel_engine_cs *engine); +int intel_ring_workarounds_emit (struct drm_i915_gem_request *req);void intel_engine_get_instdone (struct intel_engine_cs *engine,struct intel_instdone *instdone);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
intel_ring_workarounds_emitis exactly the same code.Signed-off-by Tvrtko Ursulin <[email protected]>
This was entertaining.
Quoted 91 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 35 +-------------------------------- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 3 files changed, 3 insertions(+), 35 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +1
-34@@ -890,39 +890,6 @@ static int execlists_request_alloc(struct drm_i915_gem_request *request)return ret; } -static int intel_logical_ring_workarounds_emit (struct drm_i915_gem_request *req) -{ -struct i915_workarounds *w = &req->i915->workarounds; -u32 *cs; -int ret, i; - -if (w->count ==0 ) -return 0 ; - - ret = req->engine->emit_flush (req,EMIT_BARRIER ); -if (ret) -return ret; - - cs =intel_ring_begin (req, w->count *2 +2 ); -if (IS_ERR (cs)) -return PTR_ERR (cs); - - *cs++ =MI_LOAD_REGISTER_IMM (w->count); -for (i =0 ; i < w->count; i++) { - *cs++ =i915_mmio_reg_offset (w->reg[i].addr); - *cs++ = w->reg[i].value; - } - *cs++ =MI_NOOP ; - -intel_ring_advance (req, cs); - - ret = req->engine->emit_flush (req,EMIT_BARRIER ); -if (ret) -return ret; - -return 0 ; -} -#define wa_ctx_emit (batch, index, cmd) \ do { \ int __index = (index)++; \@@ -1672,7 +1639,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req) {int ret; - ret =intel_logical_ring_workarounds_emit (req); + ret =intel_ring_workarounds_emit (req);if (ret)return ret;drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -644,7 +644,7 @@ static void reset_ring_common(struct intel_engine_cs *engine, } } -static int intel_ring_workarounds_emit (struct drm_i915_gem_request *req) +int intel_ring_workarounds_emit (struct drm_i915_gem_request *req) {struct i915_workarounds *w = &req->i915->workarounds;u32 *cs;drivers/gpu/drm/i915/intel_ringbuffer.h +1
-0@@ -560,6 +560,7 @@ static inline u32 intel_engine_last_submit(struct intel_engine_cs *engine) }int init_workarounds_ring (struct intel_engine_cs *engine); +int intel_ring_workarounds_emit (struct drm_i915_gem_request *req);void intel_engine_get_instdone (struct intel_engine_cs *engine,struct intel_instdone *instdone);Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byQuoted 11 lines · Mika Kuoppala
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
intel_ring_workarounds_emitis exactly the same code.Signed-off-by Tvrtko Ursulin <[email protected]>This was entertaining.
Reviewed-by Mika Kuoppala <[email protected]>
Does somebody feel like taking the common code out of intel_ringbuffer.c and moving it to intel_engine_cs?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
URL : https://patchwork.freedesktop.org/series/19640/
State : failure
== Summary ==
Series 19640v1 drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
https://patchwork.freedesktop.org/api/1.0/series/19640/revisions/1/mbox/
Test gem_sync:
Subgroup basic-store-all:
pass -> FAIL (fi-ivb-3770)fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11 fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19 fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16 fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16 fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50 fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18 fi-ivb-3770 total:252 pass:233 dwarn:0 dfail:0 fail:1 skip:18 fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18 fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10 fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17 fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18 fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10 fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28 fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
7b80cb5504b3b3cebaea944d35f25e27415e89a6 drm-tip: 2017y-02m-14d-14h-36m-43s UTC integration manifest 13d905c drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3809/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
HI,
Quoted 17 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Patchwork
Sent: Tuesday, February 14, 2017 8:52 PM
To: Tvrtko Ursulin <[email protected]>
Cc: [email protected]
Subject: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Remove duplicateintel_logical_ring_workarounds_emit== Series Details ==
Series: drm/i915: Remove duplicate
intel_logical_ring_workarounds_emit
URL : https://patchwork.freedesktop.org/series/19640/
State : failure== Summary ==
Quoted 7 lines
Series 19640v1 drm/i915: Remove duplicate
intel_logical_ring_workarounds_emit
https://patchwork.freedesktop.org/api/1.0/series/19640/revisions/1/mbox/Test
gem_sync:Subgroup basic-store-all: pass -> FAIL (fi-ivb-3770)
This has failed actually same way once on CI too.
(gem_sync:8385) CRITICAL: Test assertion failure function store_all, file gem_sync.c:690:
(gem_sync:8385) CRITICAL: Failed assertion: intel_detect_and_clear_missed_interrupts(fd) == 0 (gem_sync:8385) CRITICAL: error: 1 != 0
Subtest basic-store-all failed.
Made fdo bug now: https://bugs.freedesktop.org/show_bug.cgi?id=99816
Quoted 10 lines
fi-ivb-3770 total:252 pass:233 dwarn:0 dfail:0 fail:1 skip:18
7b80cb5504b3b3cebaea944d35f25e27415e89a6drm-tip: 2017y-02m-14d-14h- 36m-43s UTC integration manifest 13d905c drm/i915: Remove duplicateintel_logical_ring_workarounds_emit== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3809/
Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: Remove duplicate intel_logical_ring_workarounds_emit
Quoted 25 lines · Jani
HI,
Quoted 17 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Patchwork
Sent: Tuesday, February 14, 2017 8:52 PM
To: Tvrtko Ursulin <[email protected]>
Cc: [email protected]
Subject: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Remove duplicateintel_logical_ring_workarounds_emit== Series Details ==
Series: drm/i915: Remove duplicate
intel_logical_ring_workarounds_emit
URL : https://patchwork.freedesktop.org/series/19640/
State : failure== Summary ==
Quoted 7 lines
Series 19640v1 drm/i915: Remove duplicate
intel_logical_ring_workarounds_emit
https://patchwork.freedesktop.org/api/1.0/series/19640/revisions/1/mbox/Test
gem_sync:Subgroup basic-store-all: pass -> FAIL (fi-ivb-3770)
Quoted 6 lines
This has failed actually same way once on CI too.
(gem_sync:8385) CRITICAL: Test assertion failure functionstore_all, file gem_sync.c:690:
(gem_sync:8385) CRITICAL: Failed assertion:intel_detect_and_clear_missed_interrupts(fd)== 0 (gem_sync:8385) CRITICAL: error: 1 != 0
Subtest basic-store-all failed.
Made fdo bug now: https://bugs.freedesktop.org/show_bug.cgi?id=99816
Thanks!
Quoted 6 lines
Quoted 6 lines
fi-ivb-3770 total:252 pass:233 dwarn:0 dfail:0 fail:1 skip:18
7b80cb5504b3b3cebaea944d35f25e27415e89a6drm-tip: 2017y-02m-14d-14h- 36m-43s UTC integration manifest 13d905c drm/i915: Remove duplicateintel_logical_ring_workarounds_emit
Pushed the patch, thanks for the review and again for raising the BAT BZ.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx