drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/3 drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
According to Spec for SKL+: "Isochronous Priority Control. If enabled, Display sends demoted requests once the transition watermark is reached. If transition watermark is not enabled, Display sends demoted requests when the display buffer is full."
The commit 'e57f1c02155f ("drm/i915/gen9+: Add has_ipc flag in device info structure")' introduced that as gen9+ but missing many SKL Skus.
I believe the reason for that is Spec also mentions workarounds for
SKL-ALL: "IPC (Isoch Priority Control) may cause underflows
WA: Do not enable IPC in register ARB_CTL2"
It seems lame to add the feature and forever disable it, but it will avoid a mistake of enabling it when we are reorganizing the feature definitions on i915_pci.c later.
It will also allow us to probably extend that workaround for other platforms.
--- drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -426,6 +426,7 @@ static const struct intel_device_info intel_cherryview_info __initconst = { .platform = INTEL_SKYLAKE, \ .has_csr = 1, \ .has_guc = 1, \ + .has_ipc = 1, \ .ddb_size = 896 static const struct intel_device_info intel_skylake_gt1_info __initconst = {
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -5827,6 +5827,12 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv) {u32 val; +/* Display WA #0477 WaDisableIPC: skl */ +if (IS_SKYLAKE (dev_priv)) { + dev_priv->ipc_enabled = false; +return ; + } + val =I915_READ (DISP_ARB_CTL2 );if (dev_priv->ipc_enabled)
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/3 drm/i915: Organize GEN features inheritance.
As Chris noticed the current organization is confusing and inheritance is not clear.
So, let's split it in GEN<n>_FEATURES <cdn>_PLATFORM where new GEN inherit features from previous gens and Platforms only use gen features plus what ever is specific for that platform and shouldn't be passed on.
--- drivers/gpu/drm/i915/i915_pci.c | 48 +++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +22 -26
@@ -329,7 +329,7 @@ static const struct intel_device_info intel_valleyview_info __initconst = { CURSOR_OFFSETS }; -#define HSW_FEATURES \ +#define G75_FEATURES \ GEN7_FEATURES, \ .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, \ .has_ddi = 1, \
@@ -341,7 +341,7 @@ static const struct intel_device_info intel_valleyview_info __initconst = { .has_runtime_pm = 1#define HSW_PLATFORM \ - HSW_FEATURES, \ + G75_FEATURES, \ .platform = INTEL_HASWELL, \ .has_l3_dpf = 1
@@ -360,8 +360,8 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = { .gt = 3, }; -#define BDW_FEATURES \ - HSW_FEATURES, \ +#define GEN8_FEATURES \ + G75_FEATURES, \ BDW_COLORS, \ .has_logical_ring_contexts = 1, \ .has_full_48bit_ppgtt = 1, \
@@ -369,7 +369,7 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = { .has_reset_engine = 1#define BDW_PLATFORM \ - BDW_FEATURES, \ + GEN8_FEATURES, \ .gen = 8, \ .platform = INTEL_BROADWELL
@@ -420,15 +420,18 @@ static const struct intel_device_info intel_cherryview_info __initconst = { CHV_COLORS, }; -#define SKL_PLATFORM \ - BDW_FEATURES, \ - .gen = 9, \ - .platform = INTEL_SKYLAKE, \ +#define GEN9_FEATURES \ + GEN8_FEATURES, \ .has_csr = 1, \ .has_guc = 1, \ .has_ipc = 1, \ .ddb_size = 896 +#define SKL_PLATFORM \ + GEN9_FEATURES, \ + .gen = 9, \ + .platform = INTEL_SKYLAKE +static const struct intel_device_info intel_skylake_gt1_info__initconst = {SKL_PLATFORM , .gt =1 ,
@@ -497,13 +500,9 @@ static const struct intel_device_info intel_geminilake_info __initconst = { };#define KBL_PLATFORM \ - BDW_FEATURES, \ + GEN9_FEATURES, \ .gen = 9, \ - .platform = INTEL_KABYLAKE, \ - .has_csr = 1, \ - .has_guc = 1, \ - .has_ipc = 1, \ - .ddb_size = 896 + .platform = INTEL_KABYLAKEstatic const struct intel_device_info intel_kabylake_gt1_info__initconst = {KBL_PLATFORM ,
@@ -522,13 +521,9 @@ static const struct intel_device_info intel_kabylake_gt3_info __initconst = { };#define CFL_PLATFORM \ - BDW_FEATURES, \ + GEN9_FEATURES, \ .gen = 9, \ - .platform = INTEL_COFFEELAKE, \ - .has_csr = 1, \ - .has_guc = 1, \ - .has_ipc = 1, \ - .ddb_size = 896 + .platform = INTEL_COFFEELAKEstatic const struct intel_device_info intel_coffeelake_gt1_info__initconst = {CFL_PLATFORM ,
@@ -546,16 +541,17 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, }; +#define GEN10_FEATURES \ + GEN9_FEATURES, \ + .ddb_size = 1024, \ + .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 } +static const struct intel_device_info intel_cannonlake_gt2_info__initconst = { -BDW_FEATURES , +GEN10_FEATURES , .is_alpha_support =1 , .platform =INTEL_CANNONLAKE , .gen =10 , .gt =2 , - .ddb_size =1024 , - .has_csr =1 , - .has_ipc =1 , - .color = { .degamma_lut_size =0 , .gamma_lut_size =1024 } };/*
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 3/3 drm/i915: Organize GLK_COLORS.
In reply to Rodrigo ViviLet's organize this in a way that it gets more obvious when looking to the platform colors and in a easier way to get inherited.
v2: Add comma at the end (Jani), when possible.
--- drivers/gpu/drm/i915/i915_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +4 -2
@@ -54,6 +54,8 @@ .color = { .degamma_lut_size = 512, .gamma_lut_size = 512 }#define CHV_COLORS \ .color = { .degamma_lut_size = 65, .gamma_lut_size = 257 } +#define GLK_COLORS \ + .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }/* Keep in gen based order, and chronological order within a gen */ #define GEN2_FEATURES \
@@ -496,7 +498,7 @@ static const struct intel_device_info intel_geminilake_info __initconst = { GEN9_LP_FEATURES, .platform = INTEL_GEMINILAKE, .ddb_size =1024 , - .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 } + GLK_COLORS, };#define KBL_PLATFORM \
@@ -544,7 +546,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {#define GEN10_FEATURES \ GEN9_FEATURES, \ .ddb_size = 1024, \ - .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 } + GLK_COLORSstatic const struct intel_device_info intel_cannonlake_gt2_info__initconst = {GEN10_FEATURES ,
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH 3/3] drm/i915: Organize GLK_COLORS.
patches merged to dinq. Thanks for ideas, reviews and comments.
Quoted 47 lines · Rodrigo Vivi
Let's organize this in a way that it gets more obvious when looking to the platform colors and in a easier way to get inherited.
v2: Add comma at the end (Jani), when possible.
Cc Jani Nikula <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Reviewed-by Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_pci.c +4
-2@@ -54,6 +54,8 @@ .color = { .degamma_lut_size = 512, .gamma_lut_size = 512 }#define CHV_COLORS \ .color = { .degamma_lut_size = 65, .gamma_lut_size = 257 } +#define GLK_COLORS \ + .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }/* Keep in gen based order, and chronological order within a gen */ #define GEN2_FEATURES \@@ -496,7 +498,7 @@ static const struct intel_device_info intel_geminilake_info __initconst = { GEN9_LP_FEATURES, .platform = INTEL_GEMINILAKE, .ddb_size =1024 , - .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 } + GLK_COLORS, };#define KBL_PLATFORM \@@ -544,7 +546,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {#define GEN10_FEATURES \ GEN9_FEATURES, \ .ddb_size = 1024, \ - .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 } + GLK_COLORSstatic const struct intel_device_info intel_cannonlake_gt2_info__initconst = {GEN10_FEATURES ,Signature · 1 line
2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
URL : https://patchwork.freedesktop.org/series/31304/
State : success
== Summary ==
Series 31304v1 series starting with [1/3] drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
https://patchwork.freedesktop.org/api/1.0/series/31304/revisions/1/mbox/
Test drv_module_reload:
Subgroup basic-no-display:
pass -> INCOMPLETE (fi-cfl-s) k.org#196765k.org#196765 https://bugzilla.kernel.org/show_bug.cgi?id=196765
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:461s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:473s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:392s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:569s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:527s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:532s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:540s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:523s fi-cfl-s total:287 pass:254 dwarn:1 dfail:0 fail:0 skip:31 fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:613s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:438s fi-glk-1 total:289 pass:258 dwarn:3 dfail:0 fail:0 skip:28 time:597s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:441s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:423s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:462s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:505s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:477s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:508s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:573s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:500s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:587s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:655s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:481s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:535s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:528s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:479s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:585s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:428s
14f3207683e165f826d0e5861944fc6f39e8e20f drm-tip: 2017y-10m-02d-20h-23m-38s UTC integration manifest 51b418d33232 drm/i915: Organize GLK_COLORS.3b3ce673c27a drm/i915: Organize GEN features inheritance.893a1d4fd265 drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5874/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/3] drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/skl: Fix has_ipc on skl and document WaDisableIPC.
URL : https://patchwork.freedesktop.org/series/31304/
State : success
== Summary ==
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252 +1
Test kms_flip:
Subgroup wf_vblank-vs-dpms-interruptible:
dmesg-warn -> PASS (shard-hsw) fdo#102614fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
shard-hsw total:2429 pass:1330 dwarn:7 dfail:0 fail:9 skip:1083 time:10078s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5874/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx