DG2 DMC Support
Subsystems (3)
cover DG2 DMC Support
While DG2 supports DC5 and DC9, some of the tests in fast-feedback blew up DG2 when the tests forced transition from dc5->dc9 on suspend and dc9->dc5 on resume. Some local experiments performed with Rodrigo on a RIL system showed promising results when dc5 was completely diabled and i915 took only dc9 paths.
Sending this so we can check the CI results to confirm the findings from local testing which will hopefully help narrow down the root cause of MMIO BAR lost issue
Anusha Srivatsa (1):
drm/i915/dmc: Load DMC on DG2
drivers/gpu/drm/i915/display/intel_display_power.c | 4 +++- drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/1 drm/i915/dmc: Load DMC on DG2
Add Support for DC states on Dg2.
v2: Add dc9 as the max supported DC states and disable DC5.
v3: set max_dc to 0. (Imre)
--- drivers/gpu/drm/i915/display/intel_display_power.c | 4 +++- drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +3 -1
@@ -907,7 +907,9 @@ static u32 get_allowed_dc_mask(const struct drm_i915_private *dev_priv,if (!HAS_DISPLAY (dev_priv))return 0 ; -if (IS_DG1 (dev_priv)) +if (IS_DG2 (dev_priv)) + max_dc =0 ; +else if (IS_DG1 (dev_priv)) max_dc =3 ;else if (DISPLAY_VER (dev_priv) >=12 ) max_dc =4 ;
drivers/gpu/drm/i915/display/intel_dmc.c +9 -1
@@ -52,6 +52,10 @@#define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 06) +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 06) +MODULE_FIRMWARE (DG2_DMC_PATH ); +#define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16)#define ADLP_DMC_VERSION_REQUIRED DMC_VERSION(2, 16)MODULE_FIRMWARE (ADLP_DMC_PATH );
@@ -688,7 +692,11 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)*/ intel_dmc_runtime_pm_get (dev_priv); -if (IS_ALDERLAKE_P (dev_priv)) { +if (IS_DG2 (dev_priv)) { + dmc->fw_path =DG2_DMC_PATH ; + dmc->required_version =DG2_DMC_VERSION_REQUIRED ; + dmc->max_fw_size =DISPLAY_VER13_DMC_MAX_FW_SIZE ; + }else if (IS_ALDERLAKE_P (dev_priv)) { dmc->fw_path =ADLP_DMC_PATH ; dmc->required_version =ADLP_DMC_VERSION_REQUIRED ; dmc->max_fw_size =DISPLAY_VER13_DMC_MAX_FW_SIZE ;
Signature · 1 line
2.25.1
Vivi, Rodrigo
maintainerRe: [Intel-gfx] [PATCH] drm/i915/dmc: Load DMC on DG2
Quoted 23 lines · Anusha Srivatsa
Add Support for DC states on Dg2.
v2: Add dc9 as the max supported DC states and disable DC5.
v3: setmax_dcto 0. (Imre)Cc Imre Deak <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>(v1)---
drivers/gpu/drm/i915/display/intel_display_power.c | 4 +++- drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++-2 files changed, 12 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0@@ -907,7 +907,9 @@ static u32 get_allowed_dc_mask(const struct drm_i915_private *dev_priv, if (!HAS_DISPLAY(dev_priv)) return 0;
Quoted 4 lines
- if (IS_DG1(dev_priv))
+ if (IS_DG2(dev_priv))
+ max_dc = 0;
Please add a /* FIXME: */
explaining the DC5 bugs that are under investigation or something like that... and that DC9 doesn't depend on DMC, but we are loading it in order to unblock the runtime_pm.
Quoted 34 lines
+ else if (
IS_DG1(dev_priv))
max_dc = 3;
else if (DISPLAY_VER(dev_priv)>= 12)
max_dc = 4;drivers/gpu/drm/i915/display/intel_dmc.c +0
-0@@ -52,6 +52,10 @@
#define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZEdrivers/gpu/drm/i915/display/intel_dmc.c +4
-0+#define DG2_DMC_PATH DMC_PATH(dg2, 2, 06) +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 06) +MODULE_FIRMWARE (DG2_DMC_PATH ); +#define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16) #define ADLP_DMC_VERSION_REQUIRED DMC_VERSION(2, 16)
MODULE_FIRMWARE(ADLP_DMC_PATH);drivers/gpu/drm/i915/display/intel_dmc.c +0
-0@@ -688,7 +692,11 @@ void intel_dmc_ucode_init(structdrm_i915_private *dev_priv) */ intel_dmc_runtime_pm_get(dev_priv);
- if (IS_ALDERLAKE_P(dev_priv)) {
+ if (IS_DG2(dev_priv)) {
+ dmc->fw_path =DG2_DMC_PATH;
+ dmc->required_version =DG2_DMC_VERSION_REQUIRED; + dmc->max_fw_size =DISPLAY_VER13_DMC_MAX_FW_SIZE; + } else if (IS_ALDERLAKE_P(dev_priv)) {dmc->fw_path=ADLP_DMC_PATH;dmc->required_version=ADLP_DMC_VERSION_REQUIRED;dmc->max_fw_size=DISPLAY_VER13_DMC_MAX_FW_SIZE;
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dmc: Load DMC on DG2 (rev2)
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: drm/i915/dmc: Load DMC on DG2 (rev2)
URL : https://patchwork.freedesktop.org/series/103625/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11610 -> Patchwork_103625v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/index.html
Participating hosts (43 -> 39)
------------------------------
Additional (2): bat-adlm-1 bat-dg1-6
Missing (6): bat-dg2-8 fi-icl-u2 fi-bsw-cyan bat-rpls-1 bat-rpls-2 bat-jsl-1
Known issues
------------
Here are the changes found in Patchwork_103625v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap@basic:
- bat-dg1-6: NOTRUN -> [SKIP][1] ([i915#4083])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@gem_tiled_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][2] ([i915#4077]) +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-dg1-6: NOTRUN -> [SKIP][3] ([i915#4079]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-6: NOTRUN -> [SKIP][4] ([i915#1155])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-cfl-8109u: [PASS][5] -> [DMESG-FAIL][6] ([i915#62])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-cfl-8109u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-cfl-8109u/igt@[email protected]
* igt@i915_selftest@live@gt_engines:
- bat-dg1-6: NOTRUN -> [INCOMPLETE][7] ([i915#4418])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@i915_selftest@live@gt_engines.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-cfl-8700k: [PASS][8] -> [DMESG-FAIL][9] ([i915#5334])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-bdw-5557u: NOTRUN -> [INCOMPLETE][10] ([i915#3921])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-bdw-5557u/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@memory_region:
- fi-cfl-8109u: [PASS][11] -> [DMESG-WARN][12] ([i915#5904]) +11 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-cfl-8109u/igt@i915_selftest@live@memory_region.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-cfl-8109u/igt@i915_selftest@live@memory_region.html
* igt@kms_addfb_basic@addfb25-x-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][13] ([i915#4212]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][14] ([i915#4215])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- bat-adlp-4: NOTRUN -> [SKIP][15] ([fdo#111827])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-adlp-4/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- bat-dg1-6: NOTRUN -> [SKIP][16] ([fdo#111827]) +7 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-dg1-6: NOTRUN -> [SKIP][17] ([i915#4103] / [i915#4213]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@kms_flip@basic-flip-vs-modeset@a-edp1:
- bat-adlp-4: [PASS][18] -> [DMESG-WARN][19] ([i915#3576])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/bat-adlp-4/igt@kms_flip@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-adlp-4/igt@kms_flip@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-6: NOTRUN -> [SKIP][20] ([fdo#109285])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: [PASS][21] -> [DMESG-WARN][22] ([i915#62]) +15 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-cfl-8109u/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-cfl-8109u/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- bat-dg1-6: NOTRUN -> [SKIP][23] ([i915#1072] / [i915#4078]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-6: NOTRUN -> [SKIP][24] ([i915#3555])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- bat-dg1-6: NOTRUN -> [SKIP][25] ([i915#3708] / [i915#4077]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-dg1-6: NOTRUN -> [SKIP][26] ([i915#3708] / [i915#4873])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-dg1-6: NOTRUN -> [SKIP][27] ([i915#3708]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-6: NOTRUN -> [FAIL][28] ([i915#4312] / [i915#5257])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {fi-ehl-2}: [DMESG-WARN][29] ([i915#5122]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-ehl-2/igt@gem_exec_suspend@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-ehl-2/igt@gem_exec_suspend@[email protected]
* igt@i915_pm_rpm@module-reload:
- bat-adlp-4: [INCOMPLETE][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/bat-adlp-4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-adlp-4/igt@[email protected]
* igt@i915_selftest@live@gem_migrate:
- fi-bdw-5557u: [INCOMPLETE][33] ([i915#5716]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/fi-bdw-5557u/igt@i915_selftest@live@gem_migrate.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/fi-bdw-5557u/igt@i915_selftest@live@gem_migrate.html
* igt@kms_flip@basic-flip-vs-modeset@b-edp1:
- {bat-adlp-6}: [DMESG-WARN][35] ([i915#3576]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/bat-adlp-6/igt@kms_flip@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-adlp-6/igt@kms_flip@[email protected]
- bat-adlp-4: [DMESG-WARN][37] ([i915#3576]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11610/bat-adlp-4/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/bat-adlp-4/igt@kms_flip@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#2373]: https://gitlab.freedesktop.org/drm/intel/issues/2373
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5716]: https://gitlab.freedesktop.org/drm/intel/issues/5716
[i915#5801]: https://gitlab.freedesktop.org/drm/intel/issues/5801
[i915#5904]: https://gitlab.freedesktop.org/drm/intel/issues/5904
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
Build changes
-------------
* Linux: CI_DRM_11610 -> Patchwork_103625v2
CI-20190529: 20190529
CI_DRM_11610: c0acb508f6f2581929400eeef6c0a94e925ae264 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6465: f6bb4399881a806fbff75ce3df89b60286d55917 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_103625v2: c0acb508f6f2581929400eeef6c0a94e925ae264 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
982498ede3f7 drm/i915/dmc: Load DMC on DG2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103625v2/index.html