drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
Subsystems (2)
PATCH 1/1 drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
This got duplicated on introducing icl workarounds. Fix by using the older definition and moving the wa bit definition there. No functional changes.
--- drivers/gpu/drm/i915/i915_reg.h | 4 +--- drivers/gpu/drm/i915/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -3
@@ -2400,6 +2400,7 @@ enum i915_power_well_id {#define GEN8_GAMW_ECO_DEV_RW_IA _MMIO(0x4080)#define GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF +#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)#define GAMT_CHKN_BIT_REG _MMIO(0x4ab8)#define GAMT_CHKN_DISABLE_L3_COH_PIPE (1 << 31)
@@ -8708,9 +8709,6 @@ enum {#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MAXALLOC (1 << 9)#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) -#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080) -#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) -#define GEN10_SAMPLER_MODE _MMIO(0xE18C)/* IVYBRIDGE DPF */
drivers/gpu/drm/i915/intel_workarounds.c +2 -2
@@ -867,8 +867,8 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv)/* Wa_220166154:icl * Formerly known as WaDisCtxReload */ -I915_WRITE (GAMW_ECO_DEV_RW_IA_REG ,I915_READ (GAMW_ECO_DEV_RW_IA_REG ) | -GAMW_ECO_DEV_CTX_RELOAD_DISABLE ); +I915_WRITE (GEN8_GAMW_ECO_DEV_RW_IA ,I915_READ (GEN8_GAMW_ECO_DEV_RW_IA ) | +GAMW_ECO_DEV_CTX_RELOAD_DISABLE );/* Wa_1405779004:icl (pre-prod) */ if (IS_ICL_REVID (dev_priv,ICL_REVID_A0 ,ICL_REVID_A0 ))
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Mika Kuoppala (2018-11-09 13:56:52)
Quoted 5 lines
This got duplicated on introducing icl workarounds. Fix by using the older definition and moving the wa bit definition there. No functional changes.
Fixes 908ae0517363 ("drm/i915/icl: WaDisCtxReload")
But worth backporting for no functional change? Maybe just References:
Quoted 33 lines
Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 4 +--- drivers/gpu/drm/i915/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-3@@ -2400,6 +2400,7 @@ enum i915_power_well_id {#define GEN8_GAMW_ECO_DEV_RW_IA _MMIO(0x4080)#define GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF +#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)#define GAMT_CHKN_BIT_REG _MMIO(0x4ab8)#define GAMT_CHKN_DISABLE_L3_COH_PIPE (1 << 31)@@ -8708,9 +8709,6 @@ enum {#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MAXALLOC (1 << 9)#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) -#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080) -#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) -#define GEN10_SAMPLER_MODE _MMIO(0xE18C)/* IVYBRIDGE DPF */ drivers/gpu/drm/i915/intel_workarounds.c +0
-0
drivers/gpu/drm/i915/intel_workarounds.c static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 871
Quoted 7 lines
drivers/gpu/drm/i915/intel_workarounds.c +2
-2@@ -867,8 +867,8 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv)/* Wa_220166154:icl * Formerly known as WaDisCtxReload */ -I915_WRITE (GAMW_ECO_DEV_RW_IA_REG ,I915_READ (GAMW_ECO_DEV_RW_IA_REG ) | -GAMW_ECO_DEV_CTX_RELOAD_DISABLE ); +I915_WRITE (GEN8_GAMW_ECO_DEV_RW_IA ,I915_READ (GEN8_GAMW_ECO_DEV_RW_IA ) | +GAMW_ECO_DEV_CTX_RELOAD_DISABLE );
What happened? I had this file all nicely aligned. And then icl polluted it again. Please remember the visual grouping.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
This got duplicated on introducing icl workarounds. Fix by using the older definition and moving the wa bit definition there. No functional changes.
v2: avoid fixes tag, whitespace (Chris)
References: 908ae0517363 ("drm/i915/icl: WaDisCtxReload")
--- drivers/gpu/drm/i915/i915_reg.h | 4 +--- drivers/gpu/drm/i915/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -3
@@ -2400,6 +2400,7 @@ enum i915_power_well_id {#define GEN8_GAMW_ECO_DEV_RW_IA _MMIO(0x4080)#define GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF +#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)#define GAMT_CHKN_BIT_REG _MMIO(0x4ab8)#define GAMT_CHKN_DISABLE_L3_COH_PIPE (1 << 31)
@@ -8708,9 +8709,6 @@ enum {#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MAXALLOC (1 << 9)#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) -#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080) -#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) -#define GEN10_SAMPLER_MODE _MMIO(0xE18C)/* IVYBRIDGE DPF */
drivers/gpu/drm/i915/intel_workarounds.c +2 -2
@@ -867,8 +867,8 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv)/* Wa_220166154:icl * Formerly known as WaDisCtxReload */ -I915_WRITE (GAMW_ECO_DEV_RW_IA_REG ,I915_READ (GAMW_ECO_DEV_RW_IA_REG ) | -GAMW_ECO_DEV_CTX_RELOAD_DISABLE ); +I915_WRITE (GEN8_GAMW_ECO_DEV_RW_IA ,I915_READ (GEN8_GAMW_ECO_DEV_RW_IA ) | +GAMW_ECO_DEV_CTX_RELOAD_DISABLE );/* Wa_1405779004:icl (pre-prod) */ if (IS_ICL_REVID (dev_priv,ICL_REVID_A0 ,ICL_REVID_A0 ))
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Mika Kuoppala (2018-11-09 14:18:19)
Quoted 41 lines
This got duplicated on introducing icl workarounds. Fix by using the older definition and moving the wa bit definition there. No functional changes.
v2: avoid fixes tag, whitespace (Chris)
References:
908ae0517363("drm/i915/icl: WaDisCtxReload")Signed-off-by Mika Kuoppala <[email protected]>Reviewed-by Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 4 +--- drivers/gpu/drm/i915/intel_workarounds.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-3@@ -2400,6 +2400,7 @@ enum i915_power_well_id {#define GEN8_GAMW_ECO_DEV_RW_IA _MMIO(0x4080)#define GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF +#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)#define GAMT_CHKN_BIT_REG _MMIO(0x4ab8)#define GAMT_CHKN_DISABLE_L3_COH_PIPE (1 << 31)@@ -8708,9 +8709,6 @@ enum {#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MAXALLOC (1 << 9)#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) -#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080) -#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) -#define GEN10_SAMPLER_MODE _MMIO(0xE18C)/* IVYBRIDGE DPF */ drivers/gpu/drm/i915/intel_workarounds.c +0
-0
drivers/gpu/drm/i915/intel_workarounds.c static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 871
Quoted 7 lines
drivers/gpu/drm/i915/intel_workarounds.c +2
-2@@ -867,8 +867,8 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv)/* Wa_220166154:icl * Formerly known as WaDisCtxReload */ -I915_WRITE (GAMW_ECO_DEV_RW_IA_REG ,I915_READ (GAMW_ECO_DEV_RW_IA_REG ) | -GAMW_ECO_DEV_CTX_RELOAD_DISABLE ); +I915_WRITE (GEN8_GAMW_ECO_DEV_RW_IA ,I915_READ (GEN8_GAMW_ECO_DEV_RW_IA ) | +GAMW_ECO_DEV_CTX_RELOAD_DISABLE );
Nah, we align to (
I915_WRITE(GEN8_GAMW_ECO_DEV_RW_IA, I915_READ(GEN8_GAMW_ECO_DEV_RW_IA) | GAMW_ECO_DEV_CTX_RELOAD_DISABLE);
Is what the rest of the file (and driver where foreign codingstyles haven't snuck in) uses.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
URL : https://patchwork.freedesktop.org/series/52297/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c48f4f89537d drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
-:13: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 908ae0517363 ("drm/i915/icl: WaDisCtxReload")'
#13:
References: 908ae0517363 ("drm/i915/icl: WaDisCtxReload")total: 1 errors, 0 warnings, 0 checks, 26 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
URL : https://patchwork.freedesktop.org/series/52297/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5113 -> Patchwork_10792 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/52297/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_10792 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_create@basic-files:
fi-icl-u2: PASS -> DMESG-WARN (fdo#107724)
igt@kms_flip@basic-flip-vs-modeset:
fi-hsw-4770r: PASS -> DMESG-WARN (fdo#105602) +1
igt@kms_frontbuffer_tracking@basic:
fi-icl-u2: PASS -> FAIL (fdo#103167)
igt@pm_rpm@module-reload:
fi-skl-6600u: PASS -> INCOMPLETE (fdo#107807)
==== Possible fixes ====
igt@gem_close_race@basic-threads:
fi-bsw-kefka: FAIL (fdo#108656) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#108656 https://bugs.freedesktop.org/show_bug.cgi?id=108656
== Participating hosts (53 -> 47) ==
Additional (1): fi-kbl-7560u
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5113 -> Patchwork_10792
CI_DRM_5113: 54a159cbae565f40866b2a54edef1620ef8581f1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10792: c48f4f89537dafd553b35f748fbbd2eeb4b2ab83 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c48f4f89537d drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10792/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: drm/i915: Deduplicate register definition for GAMW_ECO_DEV_RW_IA (rev2)
URL : https://patchwork.freedesktop.org/series/52297/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5113_full -> Patchwork_10792_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10792_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10792_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10792_full:
=== IGT changes ===
==== Warnings ====
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_10792_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-skl: NOTRUN -> TIMEOUT (fdo#108039)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +1
shard-kbl: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_cursor_crc@cursor-128x128-sliding:
shard-apl: PASS -> FAIL (fdo#103232)
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-skl: PASS -> FAIL (fdo#102887)
igt@kms_frontbuffer_tracking@fbc-stridechange:
shard-skl: NOTRUN -> FAIL (fdo#105683)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
shard-kbl: PASS -> DMESG-WARN (fdo#103313, fdo#105345)
igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
shard-skl: NOTRUN -> FAIL (fdo#107815, fdo#108145) +1
igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
shard-skl: NOTRUN -> FAIL (fdo#108145) +1
igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
shard-glk: PASS -> FAIL (fdo#103166)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
igt@pm_rpm@dpms-non-lpsp:
shard-skl: NOTRUN -> INCOMPLETE (fdo#107807)
igt@pm_rpm@system-suspend-modeset:
shard-skl: PASS -> INCOMPLETE (fdo#107807, fdo#107773, fdo#104108)
==== Possible fixes ====
igt@drv_suspend@forcewake:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106887, fdo#103665, fdo#106023) -> PASS
igt@gem_softpin@noreloc-s3:
shard-skl: INCOMPLETE (fdo#107773, fdo#104108) -> PASS
igt@kms_chv_cursor_fail@pipe-c-256x256-top-edge:
shard-skl: FAIL (fdo#104671) -> PASS
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-apl: FAIL (fdo#103232, fdo#103191) -> PASS
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: DMESG-WARN (fdo#105763, fdo#106538) -> PASS
igt@kms_flip@absolute-wf_vblank:
shard-kbl: DMESG-WARN (fdo#103313, fdo#105345) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-skl: FAIL (fdo#105363) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
shard-apl: FAIL (fdo#103167) -> PASS
igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-render:
shard-glk: DMESG-FAIL (fdo#106538) -> PASS
igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
shard-glk: FAIL (fdo#103166) -> PASS
igt@pm_rpm@dpms-mode-unset-lpsp:
shard-skl: INCOMPLETE (fdo#107807) -> PASS 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#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108039 https://bugs.freedesktop.org/show_bug.cgi?id=108039
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5113 -> Patchwork_10792
CI_DRM_5113: 54a159cbae565f40866b2a54edef1620ef8581f1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10792: c48f4f89537dafd553b35f748fbbd2eeb4b2ab83 @ 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_10792/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx