| Message ID | 20220413005707.3627314-1-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dmc: Load DMC on DG2 | expand |
On Tue, Apr 12, 2022 at 05:57:07PM -0700, Anusha Srivatsa wrote: > Add Support for DC states on Dg2. > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index 6a5695008f7c..5a0cab82a156 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -4770,7 +4770,7 @@ 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_DG1(dev_priv) || IS_DG2(dev_priv)) > max_dc = 3; Oh, this max_dc and the enable_dc param is so ugly... it should deserve at least a enum, but with the dc9 being totally independent on the decision I couldn't see a clean and quick way... so let's continue with this for now > else if (DISPLAY_VER(dev_priv) >= 12) > max_dc = 4; > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > index 257cf662f9f4..2f01aca4d981 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -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; probably worth to rename the dev_priv to i915 on these functions you are touching in here... anyway: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > -- > 2.25.1 >
From: Patchwork <patchwork@emeril.freedesktop.org>
Sent: Wednesday, April 13, 2022 1:01 PM
To: Srivatsa, Anusha <anusha.srivatsa@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915/dmc: Load DMC on DG2
Patch Details
Series:
drm/i915/dmc: Load DMC on DG2
URL:
https://patchwork.freedesktop.org/series/102630/
State:
failure
Details:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/index.html
CI Bug Log - changes from CI_DRM_11496 -> Patchwork_102630v1
Summary
FAILURE
Serious unknown changes coming with Patchwork_102630v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_102630v1, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/index.html
Participating hosts (50 -> 46)
Additional (1): fi-pnv-d510
Missing (5): fi-cml-u2 fi-bsw-cyan fi-icl-u2 bat-hsw-1 fi-bdw-samus
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_102630v1:
IGT changes
Possible regressions
* igt@i915_selftest@live@hangcheck:
* fi-hsw-4770: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html>
The failure reported is not because of the changes introduced.
Anusha
Known issues
Here are the changes found in Patchwork_102630v1 that come from known issues:
IGT changes
Issues hit
* igt@kms_busy@basic@modeset:
* fi-tgl-u2: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/fi-tgl-u2/igt@kms_busy@basic@modeset.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-tgl-u2/igt@kms_busy@basic@modeset.html> (i915#402<https://gitlab.freedesktop.org/drm/intel/issues/402>)
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-pnv-d510/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* igt@prime_vgem@basic-userptr:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-pnv-d510/igt@prime_vgem@basic-userptr.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +39 similar issues
* igt@runner@aborted:
* fi-bdw-5557u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-bdw-5557u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
Possible fixes
* igt@gem_exec_suspend@basic-s3@smem:
* fi-bdw-5557u: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3@smem.html> (i915#146<https://gitlab.freedesktop.org/drm/intel/issues/146>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3@smem.html>
* igt@i915_pm_rps@basic-api:
* {bat-dg2-9}: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/bat-dg2-9/igt@i915_pm_rps@basic-api.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/bat-dg2-9/igt@i915_pm_rps@basic-api.html>
* igt@i915_selftest@live@gt_heartbeat:
* fi-skl-guc: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html>
* igt@i915_selftest@live@hangcheck:
* fi-snb-2600: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> (i915#3921<https://gitlab.freedesktop.org/drm/intel/issues/3921>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/fi-snb-2600/igt@i915_selftest@live@hangcheck.html>
* igt@kms_busy@basic@flip:
* {bat-adlp-6}: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11496/bat-adlp-6/igt@kms_busy@basic@flip.html> (i915#3576<https://gitlab.freedesktop.org/drm/intel/issues/3576>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v1/bat-adlp-6/igt@kms_busy@basic@flip.html>
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
Build changes
* Linux: CI_DRM_11496 -> Patchwork_102630v1
CI-20190529: 20190529
CI_DRM_11496: 6dec7597a5027afe15cf36f1e796a0f2e5189741 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_102630v1: 6dec7597a5027afe15cf36f1e796a0f2e5189741 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d2f87101f94b drm/i915/dmc: Load DMC on DG2
HI,
The result here says SUCCESS but closer look shows that it never ran on any DG2. Wanted to know if something went wrong at the system side and if it needs to be revived. The patch is simply loading DMC and shouldn’t cause the system to not boot up at all.
Any info in this regard will be very useful.
Thanks,
Anusha
From: Patchwork <patchwork@emeril.freedesktop.org>
Sent: Thursday, April 14, 2022 11:04 AM
To: Srivatsa, Anusha <anusha.srivatsa@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✓ Fi.CI.BAT: success for drm/i915/dmc: Load DMC on DG2 (rev4)
Patch Details
Series:
drm/i915/dmc: Load DMC on DG2 (rev4)
URL:
https://patchwork.freedesktop.org/series/102630/
State:
success
Details:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html
CI Bug Log - changes from CI_DRM_11500 -> Patchwork_102630v4
Summary
SUCCESS
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html
Participating hosts (48 -> 45)
Additional (2): bat-adlm-1 fi-pnv-d510
Missing (5): bat-dg2-8 fi-bsw-cyan fi-icl-u2 bat-dg2-9 fi-bdw-samus
Known issues
Here are the changes found in Patchwork_102630v4 that come from known issues:
IGT changes
Issues hit
* igt@i915_selftest@live@execlists:
* fi-bsw-nick: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-bsw-nick/igt@i915_selftest@live@execlists.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@i915_selftest@live@execlists.html> (i915#2940<https://gitlab.freedesktop.org/drm/intel/issues/2940>)
* igt@i915_selftest@live@hangcheck:
* fi-snb-2600: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> (i915#3921<https://gitlab.freedesktop.org/drm/intel/issues/3921>)
* igt@i915_selftest@live@requests:
* fi-blb-e6850: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-blb-e6850/igt@i915_selftest@live@requests.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@i915_selftest@live@requests.html> (i915#4528<https://gitlab.freedesktop.org/drm/intel/issues/4528>)
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* igt@prime_vgem@basic-userptr:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@prime_vgem@basic-userptr.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +39 similar issues
* igt@runner@aborted:
* fi-bsw-nick: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#3428<https://gitlab.freedesktop.org/drm/intel/issues/3428> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-bdw-5557u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bdw-5557u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-blb-e6850: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2403<https://gitlab.freedesktop.org/drm/intel/issues/2403> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
Build changes
* Linux: CI_DRM_11500 -> Patchwork_102630v4
CI-20190529: 20190529
CI_DRM_11500: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_102630v4: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
16f68d87628e drm/i915/dmc: Load DMC on DG2
On Tue, Apr 12, 2022 at 05:57:07PM -0700, Anusha Srivatsa wrote: >Add Support for DC states on Dg2. > >Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Failure in CI seems unrelated. Although it's unfortunate the DG2 couldn't get tested with this patch. were you able to test this locally and get a pass on tests not currently passing in BAT? thanks Lucas De Marchi >--- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c >index 6a5695008f7c..5a0cab82a156 100644 >--- a/drivers/gpu/drm/i915/display/intel_display_power.c >+++ b/drivers/gpu/drm/i915/display/intel_display_power.c >@@ -4770,7 +4770,7 @@ 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_DG1(dev_priv) || IS_DG2(dev_priv)) > max_dc = 3; > else if (DISPLAY_VER(dev_priv) >= 12) > max_dc = 4; >diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c >index 257cf662f9f4..2f01aca4d981 100644 >--- a/drivers/gpu/drm/i915/display/intel_dmc.c >+++ b/drivers/gpu/drm/i915/display/intel_dmc.c >@@ -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; >-- >2.25.1 >
On Thu, Apr 14, 2022 at 08:54:49PM +0000, Anusha Srivatsa wrote: >HI, > >The result here says SUCCESS but closer look shows that it never ran on any DG2. Wanted to know if something went wrong at the system side and if it needs to be revived. The patch is simply loading DMC and shouldn’t cause the system to not boot up at all. > >Any info in this regard will be very useful. I think the issue is less about the feedback saying "SUCCESS" and more about "why was it not tested on DG2 and we have no clue what happened?". Not gating a "SUCCESS" message is needed for platforms that are unstable due to not been completed yet: otherwise almost all patches series would return "FAIL" and it would be even more useless. So, as DG2 is one of those platforms, I think it's ok to have this behavior. But it's not very good to simply have no results and no feedback on what really happened. Lucas De Marchi > >Thanks, >Anusha > >From: Patchwork <patchwork@emeril.freedesktop.org> >Sent: Thursday, April 14, 2022 11:04 AM >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> >Cc: intel-gfx@lists.freedesktop.org >Subject: ✓ Fi.CI.BAT: success for drm/i915/dmc: Load DMC on DG2 (rev4) > >Patch Details >Series: > >drm/i915/dmc: Load DMC on DG2 (rev4) > >URL: > >https://patchwork.freedesktop.org/series/102630/ > >State: > >success > >Details: > >https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html > >CI Bug Log - changes from CI_DRM_11500 -> Patchwork_102630v4 >Summary > >SUCCESS > >No regressions found. > >External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html > >Participating hosts (48 -> 45) > >Additional (2): bat-adlm-1 fi-pnv-d510 >Missing (5): bat-dg2-8 fi-bsw-cyan fi-icl-u2 bat-dg2-9 fi-bdw-samus > >Known issues > >Here are the changes found in Patchwork_102630v4 that come from known issues: > >IGT changes >Issues hit > > * igt@i915_selftest@live@execlists: > > * fi-bsw-nick: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-bsw-nick/igt@i915_selftest@live@execlists.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@i915_selftest@live@execlists.html> (i915#2940<https://gitlab.freedesktop.org/drm/intel/issues/2940>) > > * igt@i915_selftest@live@hangcheck: > > * fi-snb-2600: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> (i915#3921<https://gitlab.freedesktop.org/drm/intel/issues/3921>) > > * igt@i915_selftest@live@requests: > > * fi-blb-e6850: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-blb-e6850/igt@i915_selftest@live@requests.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@i915_selftest@live@requests.html> (i915#4528<https://gitlab.freedesktop.org/drm/intel/issues/4528>) > > * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c: > > * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>) > > * igt@prime_vgem@basic-userptr: > > * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@prime_vgem@basic-userptr.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +39 similar issues > > * igt@runner@aborted: > > * fi-bsw-nick: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#3428<https://gitlab.freedesktop.org/drm/intel/issues/3428> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > * fi-bdw-5557u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bdw-5557u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > * fi-blb-e6850: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2403<https://gitlab.freedesktop.org/drm/intel/issues/2403> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > >{name}: This element is suppressed. This means it is ignored when computing >the status of the difference (SUCCESS, WARNING, or FAILURE). > >Build changes > > * Linux: CI_DRM_11500 -> Patchwork_102630v4 > >CI-20190529: 20190529 >CI_DRM_11500: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux >IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git >Patchwork_102630v4: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux > >== Linux commits == > >16f68d87628e drm/i915/dmc: Load DMC on DG2
On Thu, Apr 14, 2022 at 09:37:14PM -0700, Lucas De Marchi wrote: >On Thu, Apr 14, 2022 at 08:54:49PM +0000, Anusha Srivatsa wrote: >>HI, >> >>The result here says SUCCESS but closer look shows that it never ran on any DG2. Wanted to know if something went wrong at the system side and if it needs to be revived. The patch is simply loading DMC and shouldn’t cause the system to not boot up at all. >> >>Any info in this regard will be very useful. > >I think the issue is less about the feedback saying "SUCCESS" and more >about "why was it not tested on DG2 and we have no clue what happened?". > >Not gating a "SUCCESS" message is needed for platforms that are unstable >due to not been completed yet: otherwise almost all patches series would >return "FAIL" and it would be even more useless. > >So, as DG2 is one of those platforms, I think it's ok to have this >behavior. But it's not very good to simply have no results and no >feedback on what really happened. So I got a local system with DG2 to check and results were not good, which may explain the CI behavior. Running BAT with the command below (should be roughly equivalent to what CI uses) $ sudo ./build/runner/igt_runner --piglit-style-dmesg --dmesg-warn-level 4 \ --disk-usage-limit 20M --per-test-timeout 180 \ -o -s -b tests/intel-ci/blacklist-pre-merge.txt \ --test-list tests/intel-ci/fast-feedback.testlist \ build/tests ~/igt-results When trying this with DMC, the machine rebooted when reached the kms_busy test. Resuming with igt_resume, the machine froze on igt@i915_pm_rpm@basic-rte (I think, not really sure it was this, but it was one of the pm-related patches). If enabling DMC depends on a newer IFWI, it's likely CI system doesn't have it. Same for the system I tried since I didn't try updating. Either that or there still seems to be something missing. Can you try the command above locally to make sure it at least completes? thanks Lucas De Marchi > >Lucas De Marchi > >> >>Thanks, >>Anusha >> >>From: Patchwork <patchwork@emeril.freedesktop.org> >>Sent: Thursday, April 14, 2022 11:04 AM >>To: Srivatsa, Anusha <anusha.srivatsa@intel.com> >>Cc: intel-gfx@lists.freedesktop.org >>Subject: ✓ Fi.CI.BAT: success for drm/i915/dmc: Load DMC on DG2 (rev4) >> >>Patch Details >>Series: >> >>drm/i915/dmc: Load DMC on DG2 (rev4) >> >>URL: >> >>https://patchwork.freedesktop.org/series/102630/ >> >>State: >> >>success >> >>Details: >> >>https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html >> >>CI Bug Log - changes from CI_DRM_11500 -> Patchwork_102630v4 >>Summary >> >>SUCCESS >> >>No regressions found. >> >>External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html >> >>Participating hosts (48 -> 45) >> >>Additional (2): bat-adlm-1 fi-pnv-d510 >>Missing (5): bat-dg2-8 fi-bsw-cyan fi-icl-u2 bat-dg2-9 fi-bdw-samus >> >>Known issues >> >>Here are the changes found in Patchwork_102630v4 that come from known issues: >> >>IGT changes >>Issues hit >> >> * igt@i915_selftest@live@execlists: >> >> * fi-bsw-nick: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-bsw-nick/igt@i915_selftest@live@execlists.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@i915_selftest@live@execlists.html> (i915#2940<https://gitlab.freedesktop.org/drm/intel/issues/2940>) >> >> * igt@i915_selftest@live@hangcheck: >> >> * fi-snb-2600: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> (i915#3921<https://gitlab.freedesktop.org/drm/intel/issues/3921>) >> >> * igt@i915_selftest@live@requests: >> >> * fi-blb-e6850: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11500/fi-blb-e6850/igt@i915_selftest@live@requests.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@i915_selftest@live@requests.html> (i915#4528<https://gitlab.freedesktop.org/drm/intel/issues/4528>) >> >> * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c: >> >> * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>) >> >> * igt@prime_vgem@basic-userptr: >> >> * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-pnv-d510/igt@prime_vgem@basic-userptr.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +39 similar issues >> >> * igt@runner@aborted: >> >> * fi-bsw-nick: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bsw-nick/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#3428<https://gitlab.freedesktop.org/drm/intel/issues/3428> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) >> * fi-bdw-5557u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-bdw-5557u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) >> * fi-blb-e6850: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/fi-blb-e6850/igt@runner@aborted.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2403<https://gitlab.freedesktop.org/drm/intel/issues/2403> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) >> >>{name}: This element is suppressed. This means it is ignored when computing >>the status of the difference (SUCCESS, WARNING, or FAILURE). >> >>Build changes >> >> * Linux: CI_DRM_11500 -> Patchwork_102630v4 >> >>CI-20190529: 20190529 >>CI_DRM_11500: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux >>IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git >>Patchwork_102630v4: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ git://anongit.freedesktop.org/gfx-ci/linux >> >>== Linux commits == >> >>16f68d87628e drm/i915/dmc: Load DMC on DG2
This week I've been working to get the Public CI work more reliably on bat-* machines which are hosted on a different site. The BAT for IGT, IGTPW, CI_DRM and Patchwork seems to be stabilized pretty well, and probably Trybot/TrybotIGT will be added soon enough. This isn't a promise that even one DG2 is always present on testing: the pre-production platforms are as fickle as ever. If DG2 results are needed, and none of the DG2 machines were successfully rebooted with the dGPU present, best I can do is 're-test the series'. For FULL, we can't enable all the builds on all shards because lack of machine hours. DG2 has hundreds of more tests than the next worst shard, the tests take more time, and we have less DG2s than the next worst shard. In the end, we probably end up here with a w/a: DG2-specific blacklist for the most commonly hanging, and longest lasting tests. Regards, Tomi > From: De Marchi, Lucas <lucas.demarchi@intel.com> > > On Thu, Apr 14, 2022 at 08:54:49PM +0000, Anusha Srivatsa wrote: > >HI, > > > >The result here says SUCCESS but closer look shows that it never ran on any > DG2. Wanted to know if something went wrong at the system side and if it > needs to be revived. The patch is simply loading DMC and shouldn’t cause > the system to not boot up at all. > > > >Any info in this regard will be very useful. > > I think the issue is less about the feedback saying "SUCCESS" and more > about "why was it not tested on DG2 and we have no clue what happened?". > > Not gating a "SUCCESS" message is needed for platforms that are unstable > due to not been completed yet: otherwise almost all patches series would > return "FAIL" and it would be even more useless. > > So, as DG2 is one of those platforms, I think it's ok to have this > behavior. But it's not very good to simply have no results and no > feedback on what really happened. > > Lucas De Marchi > > > > >Thanks, > >Anusha > > > >From: Patchwork <patchwork@emeril.freedesktop.org> > >Sent: Thursday, April 14, 2022 11:04 AM > >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> > >Cc: intel-gfx@lists.freedesktop.org > >Subject: ✓ Fi.CI.BAT: success for drm/i915/dmc: Load DMC on DG2 (rev4) > > > >Patch Details > >Series: > > > >drm/i915/dmc: Load DMC on DG2 (rev4) > > > >URL: > > > >https://patchwork.freedesktop.org/series/102630/ > > > >State: > > > >success > > > >Details: > > > >https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102630v4/index.html > > > >CI Bug Log - changes from CI_DRM_11500 -> Patchwork_102630v4 > >Summary > > > >SUCCESS > > > >No regressions found. > > > >External URL: https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/index.html > > > >Participating hosts (48 -> 45) > > > >Additional (2): bat-adlm-1 fi-pnv-d510 > >Missing (5): bat-dg2-8 fi-bsw-cyan fi-icl-u2 bat-dg2-9 fi-bdw-samus > > > >Known issues > > > >Here are the changes found in Patchwork_102630v4 that come from known > issues: > > > >IGT changes > >Issues hit > > > > * igt@i915_selftest@live@execlists: > > > > * fi-bsw-nick: PASS<https://intel-gfx-ci.01.org/tree/drm- > tip/CI_DRM_11500/fi-bsw-nick/igt@i915_selftest@live@execlists.html> -> > INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-bsw- > nick/igt@i915_selftest@live@execlists.html> > (i915#2940<https://gitlab.freedesktop.org/drm/intel/issues/2940>) > > > > * igt@i915_selftest@live@hangcheck: > > > > * fi-snb-2600: PASS<https://intel-gfx-ci.01.org/tree/drm- > tip/CI_DRM_11500/fi-snb-2600/igt@i915_selftest@live@hangcheck.html> -> > INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-snb- > 2600/igt@i915_selftest@live@hangcheck.html> > (i915#3921<https://gitlab.freedesktop.org/drm/intel/issues/3921>) > > > > * igt@i915_selftest@live@requests: > > > > * fi-blb-e6850: PASS<https://intel-gfx-ci.01.org/tree/drm- > tip/CI_DRM_11500/fi-blb-e6850/igt@i915_selftest@live@requests.html> -> > DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-blb- > e6850/igt@i915_selftest@live@requests.html> > (i915#4528<https://gitlab.freedesktop.org/drm/intel/issues/4528>) > > > > * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c: > > > > * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-pnv-d510/igt@kms_pipe_crc_basic@compare- > crc-sanitycheck-pipe-c.html> > (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>) > > > > * igt@prime_vgem@basic-userptr: > > > > * fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-pnv-d510/igt@prime_vgem@basic- > userptr.html> > (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +39 > similar issues > > > > * igt@runner@aborted: > > > > * fi-bsw-nick: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-bsw-nick/igt@runner@aborted.html> > (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#3428<https://gitlab.freedesktop.org/drm/intel/issues/3428> / > i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > > * fi-bdw-5557u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-bdw-5557u/igt@runner@aborted.html> > (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > > * fi-blb-e6850: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm- > tip/Patchwork_102630v4/fi-blb-e6850/igt@runner@aborted.html> > (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#2403<https://gitlab.freedesktop.org/drm/intel/issues/2403> / > i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) > > > >{name}: This element is suppressed. This means it is ignored when > computing > >the status of the difference (SUCCESS, WARNING, or FAILURE). > > > >Build changes > > > > * Linux: CI_DRM_11500 -> Patchwork_102630v4 > > > >CI-20190529: 20190529 > >CI_DRM_11500: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ > git://anongit.freedesktop.org/gfx-ci/linux > >IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ > https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > >Patchwork_102630v4: 91c829bc09be35f3e9a6674274969c72f60b5e22 @ > git://anongit.freedesktop.org/gfx-ci/linux > > > >== Linux commits == > > > >16f68d87628e drm/i915/dmc: Load DMC on DG2
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 6a5695008f7c..5a0cab82a156 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -4770,7 +4770,7 @@ 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_DG1(dev_priv) || IS_DG2(dev_priv)) max_dc = 3; else if (DISPLAY_VER(dev_priv) >= 12) max_dc = 4; diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 257cf662f9f4..2f01aca4d981 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -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;
Add Support for DC states on Dg2. Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)