| Message ID | 20231120130214.3332726-1-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: Do not check psr2 if psr/panel replay is not supported | expand |
On Mon, 20 Nov 2023, Jouni Högander <jouni.hogander@intel.com> wrote: > Do not continue to psr2 checks if psr or panel replay is not supported. > > Cc: Animesh Manna <animesh.manna@intel.com> > > Fixes: b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9670 > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index 8d180132a74b..9aa1c269cfef 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, > else > crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state); > > + if (!(crtc_state->has_panel_replay || crtc_state->has_psr)) Pure nitpicking, but I always find it easier to think and read this: if (!has_panel_replay && !has_psr) BR, Jani. > + return; > + > crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); > > crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
> -----Original Message----- > From: Hogander, Jouni <jouni.hogander@intel.com> > Sent: Monday, November 20, 2023 6:32 PM > To: intel-gfx@lists.freedesktop.org > Cc: Hogander, Jouni <jouni.hogander@intel.com>; Manna, Animesh > <animesh.manna@intel.com> > Subject: [PATCH] drm/i915/display: Do not check psr2 if psr/panel replay is > not supported > > Do not continue to psr2 checks if psr or panel replay is not supported. > > Cc: Animesh Manna <animesh.manna@intel.com> > > Fixes: b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute > config for panel replay") > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9670 > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> LGTM. Reviewed-by: Animesh Manna <animesh.manna@intel.com> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index 8d180132a74b..9aa1c269cfef 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp > *intel_dp, > else > crtc_state->has_psr = _psr_compute_config(intel_dp, > crtc_state); > > + if (!(crtc_state->has_panel_replay || crtc_state->has_psr)) > + return; > + > crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); > > crtc_state->infoframes.enable |= > intel_hdmi_infoframe_enable(DP_SDP_VSC); > -- > 2.34.1
Hello,
Possible regression here is not related to my patch. Could you please re-report so I can get shards results as well?
BR,
Jouni Högander
On Tue, 2023-11-21 at 03:21 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/display: Do not check psr2 if psr/panel replay is not supported
URL: https://patchwork.freedesktop.org/series/126651/
State: failure
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/index.html
CI Bug Log - changes from CI_DRM_13901 -> Patchwork_126651v1
Summary
FAILURE
Serious unknown changes coming with Patchwork_126651v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_126651v1, please notify your bug team (lgci.bug.filing@intel.com) 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_126651v1/index.html
Participating hosts (31 -> 33)
Additional (4): fi-hsw-4770 bat-kbl-2 fi-pnv-d510 bat-dg1-5
Missing (2): fi-kbl-soraka fi-snb-2520m
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_126651v1:
IGT changes
Possible regressions
* igt@i915_selftest@live@gt_pm:
* fi-hsw-4770: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@i915_selftest@live@gt_pm.html>
Known issues
Here are the changes found in Patchwork_126651v1 that come from known issues:
IGT changes
Issues hit
* igt@fbdev@info:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@fbdev@info.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1849<https://gitlab.freedesktop.org/drm/intel/issues/1849>)
* igt@gem_lmem_swapping@basic:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-pnv-d510/igt@gem_lmem_swapping@basic.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +25 other tests skip
* igt@gem_lmem_swapping@parallel-random-engines:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@gem_lmem_swapping@parallel-random-engines.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +20 other tests skip
* igt@gem_mmap@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_mmap@basic.html> (i915#4083<https://gitlab.freedesktop.org/drm/intel/issues/4083>)
* igt@gem_tiled_fence_blits@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_tiled_fence_blits@basic.html> (i915#4077<https://gitlab.freedesktop.org/drm/intel/issues/4077>) +2 other tests skip
* igt@gem_tiled_pread_basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_tiled_pread_basic.html> (i915#4079<https://gitlab.freedesktop.org/drm/intel/issues/4079>) +1 other test skip
* igt@i915_pm_rps@basic-api:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@i915_pm_rps@basic-api.html> (i915#6621<https://gitlab.freedesktop.org/drm/intel/issues/6621>)
* igt@i915_selftest@live@gt_heartbeat:
* fi-glk-j4005: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html> (i915#5334<https://gitlab.freedesktop.org/drm/intel/issues/5334>)
* igt@i915_selftest@live@workarounds:
* bat-dg1-5: NOTRUN -> ABORT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@i915_selftest@live@workarounds.html> (i915#9413<https://gitlab.freedesktop.org/drm/intel/issues/9413>)
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
* fi-hsw-4770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5190<https://gitlab.freedesktop.org/drm/intel/issues/5190>)
* igt@kms_addfb_basic@basic-x-tiled-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_addfb_basic@basic-x-tiled-legacy.html> (i915#4212<https://gitlab.freedesktop.org/drm/intel/issues/4212>) +7 other tests skip
* igt@kms_addfb_basic@basic-y-tiled-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_addfb_basic@basic-y-tiled-legacy.html> (i915#4215<https://gitlab.freedesktop.org/drm/intel/issues/4215>)
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4103<https://gitlab.freedesktop.org/drm/intel/issues/4103> / i915#4213<https://gitlab.freedesktop.org/drm/intel/issues/4213>) +1 other test skip
* igt@kms_dsc@dsc-basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_dsc@dsc-basic.html> (i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#3840<https://gitlab.freedesktop.org/drm/intel/issues/3840>)
* igt@kms_force_connector_basic@force-load-detect:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285<https://bugs.freedesktop.org/show_bug.cgi?id=109285>)
* igt@kms_hdmi_inject@inject-audio:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_hdmi_inject@inject-audio.html> (i915#433<https://gitlab.freedesktop.org/drm/intel/issues/433>)
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-vga-1:
* fi-hsw-4770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-vga-1.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +12 other tests skip
* igt@kms_pipe_crc_basic@read-crc-frame-sequence:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1845<https://gitlab.freedesktop.org/drm/intel/issues/1845>) +14 other tests skip
* igt@kms_setmode@basic-clone-single-crtc:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555>)
* igt@prime_vgem@basic-fence-read:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@prime_vgem@basic-fence-read.html> (i915#3708<https://gitlab.freedesktop.org/drm/intel/issues/3708>) +3 other tests skip
* igt@prime_vgem@basic-gtt:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@prime_vgem@basic-gtt.html> (i915#3708<https://gitlab.freedesktop.org/drm/intel/issues/3708> / i915#4077<https://gitlab.freedesktop.org/drm/intel/issues/4077>) +1 other test skip
Possible fixes
* igt@i915_selftest@live@gt_heartbeat:
* fi-apl-guc: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html> (i915#5334<https://gitlab.freedesktop.org/drm/intel/issues/5334>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html>
* igt@kms_hdmi_inject@inject-audio:
* fi-kbl-guc: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html> (IGT#3<https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/3>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html>
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1:
* bat-rplp-1: ABORT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html> (i915#8668<https://gitlab.freedesktop.org/drm/intel/issues/8668>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html>
* {igt@kms_psr@psr_cursor_plane_move@edp-1}:
* bat-jsl-1: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/bat-jsl-1/igt@kms_psr@psr_cursor_plane_move@edp-1.html> (i915#9648<https://gitlab.freedesktop.org/drm/intel/issues/9648>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-jsl-1/igt@kms_psr@psr_cursor_plane_move@edp-1.html> +2 other tests pass
{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_13901 -> Patchwork_126651v1
CI-20190529: 20190529
CI_DRM_13901: 8d55b3869b666b36e26a40cfc2f1f84b72a34cd3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7595: cfa00d99b1dfa0621ea552d1ed54907798da1a1a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_126651v1: 8d55b3869b666b36e26a40cfc2f1f84b72a34cd3 @ git://anongit.freedesktop.org/gfx-ci/linux
Linux commits
adda8e8314c1 drm/i915/display: Do not check psr2 if psr/panel replay is not supported
Hi,
https://patchwork.freedesktop.org/series/126651/ - Re-reported
Thanks,
Tejasree
From: Hogander, Jouni <jouni.hogander@intel.com>
Sent: Wednesday, November 22, 2023 6:12 PM
To: LGCI Bug Filing <lgci.bug.filing@intel.com>; intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT: failure for drm/i915/display: Do not check psr2 if psr/panel replay is not supported
Hello,
Possible regression here is not related to my patch. Could you please re-report so I can get shards results as well?
BR,
Jouni Högander
On Tue, 2023-11-21 at 03:21 +0000, Patchwork wrote:
Patch Details
Series:
drm/i915/display: Do not check psr2 if psr/panel replay is not supported
URL:
https://patchwork.freedesktop.org/series/126651/
State:
failure
Details:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/index.html
CI Bug Log - changes from CI_DRM_13901 -> Patchwork_126651v1
Summary
FAILURE
Serious unknown changes coming with Patchwork_126651v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_126651v1, please notify your bug team (lgci.bug.filing@intel.com<mailto:lgci.bug.filing@intel.com>) 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_126651v1/index.html
Participating hosts (31 -> 33)
Additional (4): fi-hsw-4770 bat-kbl-2 fi-pnv-d510 bat-dg1-5
Missing (2): fi-kbl-soraka fi-snb-2520m
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_126651v1:
IGT changes
Possible regressions
* igt@i915_selftest@live@gt_pm:
* fi-hsw-4770: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@i915_selftest@live@gt_pm.html>
Known issues
Here are the changes found in Patchwork_126651v1 that come from known issues:
IGT changes
Issues hit
* igt@fbdev@info:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@fbdev@info.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1849<https://gitlab.freedesktop.org/drm/intel/issues/1849>)
* igt@gem_lmem_swapping@basic:
* fi-pnv-d510: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-pnv-d510/igt@gem_lmem_swapping@basic.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +25 other tests skip
* igt@gem_lmem_swapping@parallel-random-engines:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@gem_lmem_swapping@parallel-random-engines.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +20 other tests skip
* igt@gem_mmap@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_mmap@basic.html> (i915#4083<https://gitlab.freedesktop.org/drm/intel/issues/4083>)
* igt@gem_tiled_fence_blits@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_tiled_fence_blits@basic.html> (i915#4077<https://gitlab.freedesktop.org/drm/intel/issues/4077>) +2 other tests skip
* igt@gem_tiled_pread_basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@gem_tiled_pread_basic.html> (i915#4079<https://gitlab.freedesktop.org/drm/intel/issues/4079>) +1 other test skip
* igt@i915_pm_rps@basic-api:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@i915_pm_rps@basic-api.html> (i915#6621<https://gitlab.freedesktop.org/drm/intel/issues/6621>)
* igt@i915_selftest@live@gt_heartbeat:
* fi-glk-j4005: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html> (i915#5334<https://gitlab.freedesktop.org/drm/intel/issues/5334>)
* igt@i915_selftest@live@workarounds:
* bat-dg1-5: NOTRUN -> ABORT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@i915_selftest@live@workarounds.html> (i915#9413<https://gitlab.freedesktop.org/drm/intel/issues/9413>)
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
* fi-hsw-4770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5190<https://gitlab.freedesktop.org/drm/intel/issues/5190>)
* igt@kms_addfb_basic@basic-x-tiled-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_addfb_basic@basic-x-tiled-legacy.html> (i915#4212<https://gitlab.freedesktop.org/drm/intel/issues/4212>) +7 other tests skip
* igt@kms_addfb_basic@basic-y-tiled-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_addfb_basic@basic-y-tiled-legacy.html> (i915#4215<https://gitlab.freedesktop.org/drm/intel/issues/4215>)
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4103<https://gitlab.freedesktop.org/drm/intel/issues/4103> / i915#4213<https://gitlab.freedesktop.org/drm/intel/issues/4213>) +1 other test skip
* igt@kms_dsc@dsc-basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_dsc@dsc-basic.html> (i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#3840<https://gitlab.freedesktop.org/drm/intel/issues/3840>)
* igt@kms_force_connector_basic@force-load-detect:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285<https://bugs.freedesktop.org/show_bug.cgi?id=109285>)
* igt@kms_hdmi_inject@inject-audio:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_hdmi_inject@inject-audio.html> (i915#433<https://gitlab.freedesktop.org/drm/intel/issues/433>)
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-vga-1:
* fi-hsw-4770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-hsw-4770/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-vga-1.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +12 other tests skip
* igt@kms_pipe_crc_basic@read-crc-frame-sequence:
* bat-kbl-2: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-kbl-2/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1845<https://gitlab.freedesktop.org/drm/intel/issues/1845>) +14 other tests skip
* igt@kms_setmode@basic-clone-single-crtc:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555>)
* igt@prime_vgem@basic-fence-read:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@prime_vgem@basic-fence-read.html> (i915#3708<https://gitlab.freedesktop.org/drm/intel/issues/3708>) +3 other tests skip
* igt@prime_vgem@basic-gtt:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-dg1-5/igt@prime_vgem@basic-gtt.html> (i915#3708<https://gitlab.freedesktop.org/drm/intel/issues/3708> / i915#4077<https://gitlab.freedesktop.org/drm/intel/issues/4077>) +1 other test skip
Possible fixes
* igt@i915_selftest@live@gt_heartbeat:
* fi-apl-guc: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html> (i915#5334<https://gitlab.freedesktop.org/drm/intel/issues/5334>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html>
* igt@kms_hdmi_inject@inject-audio:
* fi-kbl-guc: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html> (IGT#3<https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/3>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html>
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1:
* bat-rplp-1: ABORT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html> (i915#8668<https://gitlab.freedesktop.org/drm/intel/issues/8668>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html>
* {igt@kms_psr@psr_cursor_plane_move@edp-1}:
* bat-jsl-1: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13901/bat-jsl-1/igt@kms_psr@psr_cursor_plane_move@edp-1.html> (i915#9648<https://gitlab.freedesktop.org/drm/intel/issues/9648>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_126651v1/bat-jsl-1/igt@kms_psr@psr_cursor_plane_move@edp-1.html> +2 other tests pass
{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_13901 -> Patchwork_126651v1
CI-20190529: 20190529
CI_DRM_13901: 8d55b3869b666b36e26a40cfc2f1f84b72a34cd3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7595: cfa00d99b1dfa0621ea552d1ed54907798da1a1a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_126651v1: 8d55b3869b666b36e26a40cfc2f1f84b72a34cd3 @ git://anongit.freedesktop.org/gfx-ci/linux
Linux commits
adda8e8314c1 drm/i915/display: Do not check psr2 if psr/panel replay is not supported
On Mon, 2023-11-20 at 17:17 +0000, Manna, Animesh wrote: > > > > -----Original Message----- > > From: Hogander, Jouni <jouni.hogander@intel.com> > > Sent: Monday, November 20, 2023 6:32 PM > > To: intel-gfx@lists.freedesktop.org > > Cc: Hogander, Jouni <jouni.hogander@intel.com>; Manna, Animesh > > <animesh.manna@intel.com> > > Subject: [PATCH] drm/i915/display: Do not check psr2 if psr/panel > > replay is > > not supported > > > > Do not continue to psr2 checks if psr or panel replay is not > > supported. > > > > Cc: Animesh Manna <animesh.manna@intel.com> > > > > Fixes: b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and > > compute > > config for panel replay") > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9670 > > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > > LGTM. > Reviewed-by: Animesh Manna <animesh.manna@intel.com> Thank you Animesh for your review. This is now pushed into drm-intel- next. BR, Jouni Högander > > > --- > > drivers/gpu/drm/i915/display/intel_psr.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > > b/drivers/gpu/drm/i915/display/intel_psr.c > > index 8d180132a74b..9aa1c269cfef 100644 > > --- a/drivers/gpu/drm/i915/display/intel_psr.c > > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > > @@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp > > *intel_dp, > > else > > crtc_state->has_psr = _psr_compute_config(intel_dp, > > crtc_state); > > > > + if (!(crtc_state->has_panel_replay || crtc_state->has_psr)) > > + return; > > + > > crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, > > crtc_state); > > > > crtc_state->infoframes.enable |= > > intel_hdmi_infoframe_enable(DP_SDP_VSC); > > -- > > 2.34.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 8d180132a74b..9aa1c269cfef 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, else crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state); + if (!(crtc_state->has_panel_replay || crtc_state->has_psr)) + return; + crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
Do not continue to psr2 checks if psr or panel replay is not supported. Cc: Animesh Manna <animesh.manna@intel.com> Fixes: b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9670 Signed-off-by: Jouni Högander <jouni.hogander@intel.com> --- drivers/gpu/drm/i915/display/intel_psr.c | 3 +++ 1 file changed, 3 insertions(+)