Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
Subsystems (2)
PATCH 1/1 Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
This reverts commit 8f067837c4b713ce2e69be95af7b2a5eb3bd7de8.
HSD says "WA withdrawn. It was causing corruption with some images. WA is not strictly necessary since this bug just causes loss of FBC compression with some sizes and images, but doesn't break anything."
--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 12 ------------ 2 files changed, 15 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -3
@@ -2985,9 +2985,6 @@ enum i915_power_well_id {#define ILK_DPFC_CHICKEN _MMIO(0x43224)#define ILK_DPFC_DISABLE_DUMMY0 (1<<8)#define ILK_DPFC_NUKE_ON_ANY_MODIFICATION (1<<23) -#define GLK_SKIP_SEG_EN (1<<12) -#define GLK_SKIP_SEG_COUNT_MASK (3<<10) -#define GLK_SKIP_SEG_COUNT (x) ((x)<<10)#define ILK_FBC_RT_BASE _MMIO(0x2128)#define ILK_FBC_RT_VALID (1<<0)#define SNB_FBC_FRONT_BUFFER (1<<1)
drivers/gpu/drm/i915/intel_pm.c +0 -12
@@ -121,7 +121,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)static void glk_init_clock_gating (struct drm_i915_private *dev_priv) { -u32 val;gen9_init_clock_gating (dev_priv);/*
@@ -141,11 +140,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_MISC_2 , val); } -/* Display WA #1133: WaFbcSkipSegments:glk */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void i915_pineview_get_mem_freq (struct drm_i915_private *dev_priv)
@@ -8478,12 +8472,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) val |=SARBUNIT_CLKGATE_DIS ;I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , val); - -/* Display WA #1133: WaFbcSkipSegments:cnl */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void cfl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
== Series Details ==
== Series Details ==
Series: Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
URL : https://patchwork.freedesktop.org/series/33969/
State : success
== Summary ==
Series 33969v1 Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
https://patchwork.freedesktop.org/api/1.0/series/33969/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#103163fdo#103163 https://bugs.freedesktop.org/show_bug.cgi?id=103163
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:441s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:454s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:536s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:280s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:512s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:508s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:497s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:265s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:544s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:429s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:435s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:430s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:467s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:534s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:480s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:532s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:575s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:463s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:547s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:565s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:516s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:504s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:558s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s
Blacklisted hosts:
fi-cfl-s2 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:471s
6e008f5fb186b924d5a31f284b564b6955e9a511 drm-tip: 2017y-11m-16d-20h-16m-50s UTC integration manifest 3afde6f1ff39 Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7164/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
URL : https://patchwork.freedesktop.org/series/33969/
State : success
== Summary ==
Test drv_selftest:
Subgroup mock_sanitycheck:
dmesg-warn -> PASS (shard-hsw) fdo#103719
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> FAIL (shard-hsw) fdo#103375
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test kms_flip:
Subgroup plain-flip-fb-recreate-interruptible:
fail -> PASS (shard-hsw) fdo#100368 +1
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-toggle:
pass -> FAIL (shard-hsw) fdo#102670
Test perf:
Subgroup blocking:
fail -> PASS (shard-hsw) fdo#102252fdo#103719 https://bugs.freedesktop.org/show_bug.cgi?id=103719
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2584 pass:1471 dwarn:1 dfail:1 fail:12 skip:1099 time:9470s shard-snb total:2584 pass:1259 dwarn:2 dfail:1 fail:11 skip:1311 time:8014s Blacklisted hosts: shard-apl total:2584 pass:1622 dwarn:2 dfail:2 fail:22 skip:936 time:13351s shard-kbl total:2482 pass:1634 dwarn:15 dfail:4 fail:21 skip:805 time:9835s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7164/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Radhakrishna Sripada
This reverts commit
8f067837c4b713ce2e69be95af7b2a5eb3bd7de8.HSD says "WA withdrawn. It was causing corruption with some images. WA is not strictly necessary since this bug just causes loss of FBC compression with some sizes and images, but doesn't break anything."
(added when merging)
Quoted 2 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>
(post fact since I forgot to add this before hit push when merging :()
But I had reviewed yesterday the spec.
merged to dinq.
Thanks for the patch,
Rodrigo.
Quoted 59 lines
--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 12 ------------ 2 files changed, 15 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-3@@ -2985,9 +2985,6 @@ enum i915_power_well_id {#define ILK_DPFC_CHICKEN _MMIO(0x43224)#define ILK_DPFC_DISABLE_DUMMY0 (1<<8)#define ILK_DPFC_NUKE_ON_ANY_MODIFICATION (1<<23) -#define GLK_SKIP_SEG_EN (1<<12) -#define GLK_SKIP_SEG_COUNT_MASK (3<<10) -#define GLK_SKIP_SEG_COUNT (x) ((x)<<10)#define ILK_FBC_RT_BASE _MMIO(0x2128)#define ILK_FBC_RT_VALID (1<<0)#define SNB_FBC_FRONT_BUFFER (1<<1)drivers/gpu/drm/i915/intel_pm.c +0
-12@@ -121,7 +121,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)static void glk_init_clock_gating (struct drm_i915_private *dev_priv) { -u32 val;gen9_init_clock_gating (dev_priv);/* @@ -141,11 +140,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_MISC_2 , val); } -/* Display WA #1133: WaFbcSkipSegments:glk */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void i915_pineview_get_mem_freq (struct drm_i915_private *dev_priv)@@ -8478,12 +8472,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) val |=SARBUNIT_CLKGATE_DIS ;I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , val); - -/* Display WA #1133: WaFbcSkipSegments:cnl */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void cfl_init_clock_gating (struct drm_i915_private *dev_priv)Signature · 1 line
2.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx