drm/i915/dmc: Make no_stepping_info an array
Subsystems (2)
PATCH 1/2 drm/i915/dmc: Make no_stepping_info an array
Make no_stepping_info an array of structs so that on plaforms that have only one binary of DMC, we can iterate through this array by having the same logic for firmware loads
--- drivers/gpu/drm/i915/intel_csr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +4 -2
@@ -186,7 +186,9 @@ static const struct stepping_info bxt_stepping_info[] = { {'B', '0'}, {'B', '1'}, {'B', '2'} }; -static const struct stepping_info no_stepping_info = {'*' ,'*' }; +static const struct stepping_info no_stepping_info[] = { + {'*' ,'*' } +};static const struct stepping_info *intel_get_stepping_info (struct drm_i915_private *dev_priv)
@@ -210,7 +212,7 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)if (INTEL_REVID (dev_priv) < size)return si +INTEL_REVID (dev_priv); -return &no_stepping_info; +return no_stepping_info; }static void gen9_set_dc_state_debugmask (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/DMC/KBL: Load DMC on KBL using he no_stepping_info array
Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info for loading the firmware image.
--- drivers/gpu/drm/i915/intel_csr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +2 -8
@@ -168,12 +168,6 @@ struct stepping_info {char substepping; }; -static const struct stepping_info kbl_stepping_info[] = { - {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, - {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, - {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, -}; -static const struct stepping_info skl_stepping_info[] = { {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' },
@@ -197,8 +191,8 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)unsigned int size;if (IS_KABYLAKE (dev_priv)) { - size =ARRAY_SIZE (kbl_stepping_info); - si = kbl_stepping_info; + size =ARRAY_SIZE (no_stepping_info); + si = no_stepping_info; }else if (IS_SKYLAKE (dev_priv)) { size =ARRAY_SIZE (skl_stepping_info); si = skl_stepping_info;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerRe: [PATCH 2/2] drm/i915/DMC/KBL: Load DMC on KBL using he no_stepping_info array
Quoted 28 lines · Anusha Srivatsa
Currently, for display there is only one DMC image for KBL. Remove the
stepping_infotable for KBL and use theno_stepping_infofor loading the firmware image.Cc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/intel_csr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_csr.c +0
-6@@ -168,12 +168,6 @@ struct stepping_info {char substepping; }; -static const struct stepping_info kbl_stepping_info[] = { - {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, - {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, - {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, -}; -static const struct stepping_info skl_stepping_info[] = { {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' },
drivers/gpu/drm/i915/intel_csr.c intel_get_stepping_info(struct drm_i915_private *dev_priv) · line 195
Quoted 7 lines
drivers/gpu/drm/i915/intel_csr.c +2
-2@@ -197,8 +191,8 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)unsigned int size;if (IS_KABYLAKE (dev_priv)) { - size =ARRAY_SIZE (kbl_stepping_info); - si = kbl_stepping_info; + size =ARRAY_SIZE (no_stepping_info); + si = no_stepping_info;
I believe we could just remove this entire block so it would just return the no_stepping_info...
drivers/gpu/drm/i915/intel_csr.c intel_get_stepping_info(struct drm_i915_private *dev_priv) · line 198
Quoted 3 lines
drivers/gpu/drm/i915/intel_csr.c +0
-0}else if (IS_SKYLAKE (dev_priv)) { size =ARRAY_SIZE (skl_stepping_info); si = skl_stepping_info;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915/dmc: Make no_stepping_info an array
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/dmc: Make no_stepping_info an array
URL : https://patchwork.freedesktop.org/series/13818/
State : warning
== Summary ==
Series 13818v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/13818/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> SKIP (fi-skl-6770hq)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
dmesg-warn -> PASS (fi-skl-6700k)
dmesg-warn -> PASS (fi-skl-6770hq)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
dmesg-warn -> PASS (fi-ilk-650)
Subgroup read-crc-pipe-b:
dmesg-warn -> PASS (fi-ilk-650)
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-byt-j1900)
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (fi-skl-6700k)
Test vgem_basic:
Subgroup unload:
pass -> SKIP (fi-bdw-5557u)
pass -> SKIP (fi-hsw-4770)
skip -> PASS (fi-skl-6770hq)fi-bdw-5557u total:246 pass:230 dwarn:0 dfail:0 fail:0 skip:16 fi-bsw-n3050 total:246 pass:204 dwarn:0 dfail:0 fail:0 skip:42 fi-bxt-t5700 total:246 pass:216 dwarn:0 dfail:0 fail:0 skip:30 fi-byt-j1900 total:246 pass:212 dwarn:2 dfail:0 fail:1 skip:31 fi-byt-n2820 total:246 pass:210 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-4770 total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-hsw-4770r total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-650 total:246 pass:184 dwarn:0 dfail:0 fail:2 skip:60 fi-ivb-3520m total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25 fi-kbl-7200u total:246 pass:222 dwarn:0 dfail:0 fail:0 skip:24 fi-skl-6260u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-skl-6700k total:246 pass:221 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-6770hq total:246 pass:229 dwarn:1 dfail:0 fail:1 skip:15 fi-snb-2520m total:246 pass:210 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-2600 total:246 pass:209 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2731/
38ecbe9082e477953fe165265c76e6c6061aeaf6 drm-intel-nightly: 2016y-10m-14d-16h-23m-48s UTC integration manifest 6c7e89b drm/i915/DMC/KBL: Load DMC on KBL using he no_stepping_info array
a43c6e5 drm/i915/dmc: Make no_stepping_info an array
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915/dmc: Make no_stepping_info an array
Quoted 7 lines
== Series Details ==
Series: series starting with [1/2] drm/i915/dmc: Make
no_stepping_infoan array
URL : https://patchwork.freedesktop.org/series/13818/
State : warning
Quoted 7 lines
== Summary ==
Series 13818v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/13818/revisions/1/mbox/Test
drv_module_reload_basic:pass -> SKIP (fi-skl-6770hq)
Unstable
Quoted 11 lines
Test
kms_flip:Subgroup basic-flip-vs-wf_vblank: dmesg-warn -> PASS (fi-skl-6700k) dmesg-warn -> PASS (fi-skl-6770hq) Test kms_pipe_crc_basic: Subgroup read-crc-pipe-a-frame-sequence: dmesg-warn -> PASS (fi-ilk-650) Subgroup read-crc-pipe-b: dmesg-warn -> PASS (fi-ilk-650) Subgroup suspend-read-crc-pipe-a: pass -> DMESG-WARN (fi-byt-j1900)
https://bugs.freedesktop.org/show_bug.cgi?id=98040
Quoted 7 lines
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (fi-skl-6700k)
Test vgem_basic:
Subgroup unload:
pass -> SKIP (fi-bdw-5557u)
pass -> SKIP (fi-hsw-4770)
skip -> PASS (fi-skl-6770hq)Unstable...
Quoted 19 lines
fi-bdw-5557u total:246 pass:230 dwarn:0 dfail:0 fail:0 skip:16 fi-bsw-n3050 total:246 pass:204 dwarn:0 dfail:0 fail:0 skip:42 fi-bxt-t5700 total:246 pass:216 dwarn:0 dfail:0 fail:0 skip:30 fi-byt-j1900 total:246 pass:212 dwarn:2 dfail:0 fail:1 skip:31 fi-byt-n2820 total:246 pass:210 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-4770 total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-hsw-4770r total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-650 total:246 pass:184 dwarn:0 dfail:0 fail:2 skip:60 fi-ivb-3520m total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25 fi-kbl-7200u total:246 pass:222 dwarn:0 dfail:0 fail:0 skip:24 fi-skl-6260u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-skl-6700k total:246 pass:221 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-6770hq total:246 pass:229 dwarn:1 dfail:0 fail:1 skip:15 fi-snb-2520m total:246 pass:210 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-2600 total:246 pass:209 dwarn:0 dfail:0 fail:0 skip:37
Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_2731/
38ecbe9082e477953fe165265c76e6c6061aeaf6drm-intel-nightly: 2016y-10m- 14d-16h-23m-48s UTC integration manifest 6c7e89b drm/i915/DMC/KBL:
Load DMC on KBL using heno_stepping_infoarray
a43c6e5 drm/i915/dmc: Makeno_stepping_infoan array
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
Quoted 27 lines · Anusha Srivatsa
Make
no_stepping_infoan array of structs so that on plaforms that have only one binary of DMC, we can iterate through this array by having the same logic for firmware loadsCc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/intel_csr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_csr.c +3
-1@@ -186,7 +186,9 @@ static const struct stepping_info bxt_stepping_info[] = { {'B', '0'}, {'B', '1'}, {'B', '2'} }; -static const struct stepping_info no_stepping_info = {'*' ,'*' }; +static const struct stepping_info no_stepping_info[] = { + {'*' ,'*' } +};static const struct stepping_info *intel_get_stepping_info (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_csr.c intel_get_stepping_info(struct drm_i915_private *dev_priv) · line 218
Quoted 8 lines
drivers/gpu/drm/i915/intel_csr.c +1
-1@@ -210,7 +212,7 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)if (INTEL_REVID (dev_priv) < size)return si +INTEL_REVID (dev_priv); -return &no_stepping_info; +return no_stepping_info; }static void gen9_set_dc_state_debugmask (struct drm_i915_private *dev_priv)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx