* [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms.
@ 2019-02-21 23:14 Rodrigo Vivi
2019-02-22 2:01 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2019-02-21 23:14 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
No functional change. Just a reorg to match the preferred
behavior.
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 15f4a6dee5aa..743cf5b00155 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -564,26 +564,26 @@ void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
wa_init_start(wal, "context");
- if (INTEL_GEN(i915) < 8)
- return;
- else if (IS_BROADWELL(i915))
- bdw_ctx_workarounds_init(engine);
- else if (IS_CHERRYVIEW(i915))
- chv_ctx_workarounds_init(engine);
- else if (IS_SKYLAKE(i915))
- skl_ctx_workarounds_init(engine);
- else if (IS_BROXTON(i915))
- bxt_ctx_workarounds_init(engine);
- else if (IS_KABYLAKE(i915))
- kbl_ctx_workarounds_init(engine);
- else if (IS_GEMINILAKE(i915))
- glk_ctx_workarounds_init(engine);
- else if (IS_COFFEELAKE(i915))
- cfl_ctx_workarounds_init(engine);
+ if (IS_ICELAKE(i915))
+ icl_ctx_workarounds_init(engine);
else if (IS_CANNONLAKE(i915))
cnl_ctx_workarounds_init(engine);
- else if (IS_ICELAKE(i915))
- icl_ctx_workarounds_init(engine);
+ else if (IS_COFFEELAKE(i915))
+ cfl_ctx_workarounds_init(engine);
+ else if (IS_GEMINILAKE(i915))
+ glk_ctx_workarounds_init(engine);
+ else if (IS_KABYLAKE(i915))
+ kbl_ctx_workarounds_init(engine);
+ else if (IS_BROXTON(i915))
+ bxt_ctx_workarounds_init(engine);
+ else if (IS_SKYLAKE(i915))
+ skl_ctx_workarounds_init(engine);
+ else if (IS_CHERRYVIEW(i915))
+ chv_ctx_workarounds_init(engine);
+ else if (IS_BROADWELL(i915))
+ bdw_ctx_workarounds_init(engine);
+ else if (INTEL_GEN(i915) < 8)
+ return;
else
MISSING_CASE(INTEL_GEN(i915));
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Sort ctx workarounds init from newer to older platforms.
2019-02-21 23:14 [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms Rodrigo Vivi
@ 2019-02-22 2:01 ` Patchwork
2019-02-22 10:32 ` [PATCH] " Chris Wilson
2019-02-22 16:26 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-02-22 2:01 UTC (permalink / raw)
To: intel-gfx
== Series Details ==
Series: drm/i915: Sort ctx workarounds init from newer to older platforms.
URL : https://patchwork.freedesktop.org/series/57056/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5651 -> Patchwork_12281
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/57056/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12281 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
#### Possible fixes ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: SKIP [fdo#109271] -> PASS
* igt@i915_pm_rpm@basic-rte:
- fi-bsw-kefka: FAIL [fdo#108800] -> PASS
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (45 -> 37)
------------------------------
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-skl-6770hq fi-byt-squawks fi-bsw-cyan fi-icl-y fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5651 -> Patchwork_12281
CI_DRM_5651: 434503f9826f553df36a0495383b32eaa949a0aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4851: 2b7dd10a4e2ea0cabff68421fd15e96c99be3cad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12281: cd18a1e10e16456829955b444f66d559a2ff3504 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cd18a1e10e16 drm/i915: Sort ctx workarounds init from newer to older platforms.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12281/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms.
2019-02-21 23:14 [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms Rodrigo Vivi
2019-02-22 2:01 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-02-22 10:32 ` Chris Wilson
2019-02-22 21:25 ` Rodrigo Vivi
2019-02-22 16:26 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2019-02-22 10:32 UTC (permalink / raw)
To: Rodrigo Vivi, intel-gfx; +Cc: Lucas De Marchi
Quoting Rodrigo Vivi (2019-02-21 23:14:52)
> No functional change. Just a reorg to match the preferred
> behavior.
>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> index 15f4a6dee5aa..743cf5b00155 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -564,26 +564,26 @@ void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
>
> wa_init_start(wal, "context");
>
> - if (INTEL_GEN(i915) < 8)
> - return;
> - else if (IS_BROADWELL(i915))
> - bdw_ctx_workarounds_init(engine);
> - else if (IS_CHERRYVIEW(i915))
> - chv_ctx_workarounds_init(engine);
> - else if (IS_SKYLAKE(i915))
> - skl_ctx_workarounds_init(engine);
> - else if (IS_BROXTON(i915))
> - bxt_ctx_workarounds_init(engine);
> - else if (IS_KABYLAKE(i915))
> - kbl_ctx_workarounds_init(engine);
> - else if (IS_GEMINILAKE(i915))
> - glk_ctx_workarounds_init(engine);
> - else if (IS_COFFEELAKE(i915))
> - cfl_ctx_workarounds_init(engine);
If the chains start with
if (0)
/* space left intentionally blank */
else if (IS_ICELAKE(i915))
adding more to the chain later would have less collateral damage.
> + if (IS_ICELAKE(i915))
> + icl_ctx_workarounds_init(engine);
> else if (IS_CANNONLAKE(i915))
> cnl_ctx_workarounds_init(engine);
> - else if (IS_ICELAKE(i915))
> - icl_ctx_workarounds_init(engine);
> + else if (IS_COFFEELAKE(i915))
> + cfl_ctx_workarounds_init(engine);
> + else if (IS_GEMINILAKE(i915))
> + glk_ctx_workarounds_init(engine);
> + else if (IS_KABYLAKE(i915))
> + kbl_ctx_workarounds_init(engine);
> + else if (IS_BROXTON(i915))
> + bxt_ctx_workarounds_init(engine);
> + else if (IS_SKYLAKE(i915))
> + skl_ctx_workarounds_init(engine);
> + else if (IS_CHERRYVIEW(i915))
> + chv_ctx_workarounds_init(engine);
> + else if (IS_BROADWELL(i915))
> + bdw_ctx_workarounds_init(engine);
For the sake of consistency,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Sort ctx workarounds init from newer to older platforms.
2019-02-21 23:14 [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms Rodrigo Vivi
2019-02-22 2:01 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-02-22 10:32 ` [PATCH] " Chris Wilson
@ 2019-02-22 16:26 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-02-22 16:26 UTC (permalink / raw)
To: intel-gfx
== Series Details ==
Series: drm/i915: Sort ctx workarounds init from newer to older platforms.
URL : https://patchwork.freedesktop.org/series/57056/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5651_full -> Patchwork_12281_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12281_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_softpin@evict-snoop:
- shard-iclb: NOTRUN -> SKIP [fdo#109312]
* igt@gem_softpin@noreloc-s3:
- shard-iclb: PASS -> FAIL [fdo#103375]
* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-snb: PASS -> SKIP [fdo#109271]
* igt@i915_pm_rpm@fences:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] +5
* igt@i915_pm_rpm@universal-planes:
- shard-iclb: PASS -> INCOMPLETE [fdo#108840]
* igt@kms_atomic_transition@6x-modeset-transitions-nonblocking-fencing:
- shard-iclb: NOTRUN -> SKIP [fdo#109278]
* igt@kms_atomic_transition@plane-use-after-nonblocking-unbind-fencing:
- shard-hsw: PASS -> INCOMPLETE [fdo#103540]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-kbl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-hsw: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_ccs@pipe-b-crc-primary-rotation-180:
- shard-iclb: NOTRUN -> FAIL [fdo#107725]
* igt@kms_chamelium@dp-hpd-after-suspend:
- shard-iclb: NOTRUN -> SKIP [fdo#109284]
* igt@kms_cursor_crc@cursor-512x512-offscreen:
- shard-iclb: NOTRUN -> SKIP [fdo#109279]
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_flip@2x-absolute-wf_vblank:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +1
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: PASS -> FAIL [fdo#102887] / [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move:
- shard-apl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-snb: PASS -> DMESG-WARN [fdo#102365]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-iclb: PASS -> FAIL [fdo#103167] +3
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +4
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-hsw: NOTRUN -> SKIP [fdo#109271] +27
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-glk: PASS -> FAIL [fdo#108948]
* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-hsw: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_plane_multiple@atomic-pipe-c-tiling-none:
- shard-iclb: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-apl: PASS -> FAIL [fdo#103166] +3
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: NOTRUN -> SKIP [fdo#109441]
* igt@kms_vrr@flip-suspend:
- shard-iclb: NOTRUN -> SKIP [fdo#109502]
* igt@prime_nv_pcopy@test3_5:
- shard-iclb: NOTRUN -> SKIP [fdo#109291]
#### Possible fixes ####
* igt@i915_pm_rpm@gem-execbuf-stress-extra-wait:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS
* igt@i915_pm_rpm@universal-planes-dpms:
- shard-iclb: INCOMPLETE [fdo#107713] / [fdo#108840] -> PASS
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
- shard-kbl: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-glk: FAIL [fdo#108145] -> PASS
* igt@kms_color@pipe-a-degamma:
- shard-apl: FAIL [fdo#104782] / [fdo#108145] -> PASS
* igt@kms_color@pipe-b-ctm-max:
- shard-apl: FAIL [fdo#108147] -> PASS
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS +3
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-move:
- shard-iclb: FAIL [fdo#103167] -> PASS +3
* igt@kms_plane@pixel-format-pipe-b-planes:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
- shard-iclb: FAIL [fdo#103166] -> PASS +4
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
#### Warnings ####
* igt@i915_pm_backlight@fade_with_suspend:
- shard-iclb: FAIL [fdo#107847] -> DMESG-FAIL [fdo#107724] / [fdo#107847]
[fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107725]: https://bugs.freedesktop.org/show_bug.cgi?id=107725
[fdo#107847]: https://bugs.freedesktop.org/show_bug.cgi?id=107847
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109502]: https://bugs.freedesktop.org/show_bug.cgi?id=109502
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 6)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* Linux: CI_DRM_5651 -> Patchwork_12281
CI_DRM_5651: 434503f9826f553df36a0495383b32eaa949a0aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4851: 2b7dd10a4e2ea0cabff68421fd15e96c99be3cad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12281: cd18a1e10e16456829955b444f66d559a2ff3504 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12281/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms.
2019-02-22 10:32 ` [PATCH] " Chris Wilson
@ 2019-02-22 21:25 ` Rodrigo Vivi
2019-02-25 12:59 ` Jani Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2019-02-22 21:25 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, Lucas De Marchi
On Fri, Feb 22, 2019 at 10:32:25AM +0000, Chris Wilson wrote:
> Quoting Rodrigo Vivi (2019-02-21 23:14:52)
> > No functional change. Just a reorg to match the preferred
> > behavior.
> >
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++------------
> > 1 file changed, 18 insertions(+), 18 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> > index 15f4a6dee5aa..743cf5b00155 100644
> > --- a/drivers/gpu/drm/i915/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> > @@ -564,26 +564,26 @@ void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
> >
> > wa_init_start(wal, "context");
> >
> > - if (INTEL_GEN(i915) < 8)
> > - return;
> > - else if (IS_BROADWELL(i915))
> > - bdw_ctx_workarounds_init(engine);
> > - else if (IS_CHERRYVIEW(i915))
> > - chv_ctx_workarounds_init(engine);
> > - else if (IS_SKYLAKE(i915))
> > - skl_ctx_workarounds_init(engine);
> > - else if (IS_BROXTON(i915))
> > - bxt_ctx_workarounds_init(engine);
> > - else if (IS_KABYLAKE(i915))
> > - kbl_ctx_workarounds_init(engine);
> > - else if (IS_GEMINILAKE(i915))
> > - glk_ctx_workarounds_init(engine);
> > - else if (IS_COFFEELAKE(i915))
> > - cfl_ctx_workarounds_init(engine);
>
> If the chains start with
>
> if (0)
> /* space left intentionally blank */
> else if (IS_ICELAKE(i915))
>
> adding more to the chain later would have less collateral damage.
interesting idea... I will consider, but for now
let's move with the consistency and similar approach
everywhere.
>
> > + if (IS_ICELAKE(i915))
> > + icl_ctx_workarounds_init(engine);
> > else if (IS_CANNONLAKE(i915))
> > cnl_ctx_workarounds_init(engine);
> > - else if (IS_ICELAKE(i915))
> > - icl_ctx_workarounds_init(engine);
> > + else if (IS_COFFEELAKE(i915))
> > + cfl_ctx_workarounds_init(engine);
> > + else if (IS_GEMINILAKE(i915))
> > + glk_ctx_workarounds_init(engine);
> > + else if (IS_KABYLAKE(i915))
> > + kbl_ctx_workarounds_init(engine);
> > + else if (IS_BROXTON(i915))
> > + bxt_ctx_workarounds_init(engine);
> > + else if (IS_SKYLAKE(i915))
> > + skl_ctx_workarounds_init(engine);
> > + else if (IS_CHERRYVIEW(i915))
> > + chv_ctx_workarounds_init(engine);
> > + else if (IS_BROADWELL(i915))
> > + bdw_ctx_workarounds_init(engine);
>
> For the sake of consistency,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
pushed to dinq
Thanks,
Rodrigo.
> -Chris
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms.
2019-02-22 21:25 ` Rodrigo Vivi
@ 2019-02-25 12:59 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2019-02-25 12:59 UTC (permalink / raw)
To: Rodrigo Vivi, Chris Wilson; +Cc: intel-gfx, Lucas De Marchi
On Fri, 22 Feb 2019, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Fri, Feb 22, 2019 at 10:32:25AM +0000, Chris Wilson wrote:
>> Quoting Rodrigo Vivi (2019-02-21 23:14:52)
>> > No functional change. Just a reorg to match the preferred
>> > behavior.
>> >
>> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > ---
>> > drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++------------
>> > 1 file changed, 18 insertions(+), 18 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
>> > index 15f4a6dee5aa..743cf5b00155 100644
>> > --- a/drivers/gpu/drm/i915/intel_workarounds.c
>> > +++ b/drivers/gpu/drm/i915/intel_workarounds.c
>> > @@ -564,26 +564,26 @@ void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
>> >
>> > wa_init_start(wal, "context");
>> >
>> > - if (INTEL_GEN(i915) < 8)
>> > - return;
>> > - else if (IS_BROADWELL(i915))
>> > - bdw_ctx_workarounds_init(engine);
>> > - else if (IS_CHERRYVIEW(i915))
>> > - chv_ctx_workarounds_init(engine);
>> > - else if (IS_SKYLAKE(i915))
>> > - skl_ctx_workarounds_init(engine);
>> > - else if (IS_BROXTON(i915))
>> > - bxt_ctx_workarounds_init(engine);
>> > - else if (IS_KABYLAKE(i915))
>> > - kbl_ctx_workarounds_init(engine);
>> > - else if (IS_GEMINILAKE(i915))
>> > - glk_ctx_workarounds_init(engine);
>> > - else if (IS_COFFEELAKE(i915))
>> > - cfl_ctx_workarounds_init(engine);
>>
>> If the chains start with
>>
>> if (0)
>> /* space left intentionally blank */
>> else if (IS_ICELAKE(i915))
>>
>> adding more to the chain later would have less collateral damage.
>
> interesting idea... I will consider, but for now
> let's move with the consistency and similar approach
> everywhere.
I actually wondered if we've made a mistake sorting all if ladders
newest to oldest. Having the newest platform in the else branch would
solve a lot of problems. But too much churn now.
BR,
Jani.
>
>>
>> > + if (IS_ICELAKE(i915))
>> > + icl_ctx_workarounds_init(engine);
>> > else if (IS_CANNONLAKE(i915))
>> > cnl_ctx_workarounds_init(engine);
>> > - else if (IS_ICELAKE(i915))
>> > - icl_ctx_workarounds_init(engine);
>> > + else if (IS_COFFEELAKE(i915))
>> > + cfl_ctx_workarounds_init(engine);
>> > + else if (IS_GEMINILAKE(i915))
>> > + glk_ctx_workarounds_init(engine);
>> > + else if (IS_KABYLAKE(i915))
>> > + kbl_ctx_workarounds_init(engine);
>> > + else if (IS_BROXTON(i915))
>> > + bxt_ctx_workarounds_init(engine);
>> > + else if (IS_SKYLAKE(i915))
>> > + skl_ctx_workarounds_init(engine);
>> > + else if (IS_CHERRYVIEW(i915))
>> > + chv_ctx_workarounds_init(engine);
>> > + else if (IS_BROADWELL(i915))
>> > + bdw_ctx_workarounds_init(engine);
>>
>> For the sake of consistency,
>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> pushed to dinq
>
> Thanks,
> Rodrigo.
>
>> -Chris
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-25 12:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-21 23:14 [PATCH] drm/i915: Sort ctx workarounds init from newer to older platforms Rodrigo Vivi
2019-02-22 2:01 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-02-22 10:32 ` [PATCH] " Chris Wilson
2019-02-22 21:25 ` Rodrigo Vivi
2019-02-25 12:59 ` Jani Nikula
2019-02-22 16:26 ` ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.