| Message ID | 20240227123833.2799647-1-bhanuprakash.modem@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/display/drrs: Refactor CPU transcoder DRRS check | expand |
We don't need to keep adding /display/ in the subject prefix. Just drm/i915/drrs: is fine. On Tue, 27 Feb 2024, Bhanuprakash Modem <bhanuprakash.modem@intel.com> wrote: > Rename cpu_transcoder_has_drrs() to intel_cpu_transcoder_has_drrs() > and make it as non-static, therefore it can be re-used. > > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > Cc: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 9 +++++++++ > drivers/gpu/drm/i915/display/intel_display.h | 2 ++ > drivers/gpu/drm/i915/display/intel_dp.c | 11 +---------- > 3 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 00ac65a14029..2210d3bb2e0a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -2582,6 +2582,15 @@ void intel_cpu_transcoder_set_m2_n2(struct intel_crtc *crtc, > PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder)); > } > > +bool intel_cpu_transcoder_has_drrs(struct drm_i915_private *i915, > + enum transcoder cpu_transcoder) > +{ > + if (HAS_DOUBLE_BUFFERED_M_N(i915)) > + return true; > + > + return intel_cpu_transcoder_has_m2_n2(i915, cpu_transcoder); > +} It really needs to be moved to intel_drrs.[ch], not here. intel_display.c must cease to be a dumping ground for random stuff. Otherwise seems like the right thing to do. BR, Jani. > + > static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state) > { > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index f4a0773f0fca..0dc39a8a517e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -484,6 +484,8 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc, > void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc, > enum transcoder cpu_transcoder, > struct intel_link_m_n *m_n); > +bool intel_cpu_transcoder_has_drrs(struct drm_i915_private *i915, > + enum transcoder cpu_transcoder); > int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); > int intel_crtc_dotclock(const struct intel_crtc_state *pipe_config); > enum intel_display_power_domain intel_port_to_power_domain(struct intel_digital_port *dig_port); > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index e13121dc3a03..5c3c0449e866 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2689,15 +2689,6 @@ intel_dp_compute_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, > intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GAMUT_METADATA); > } > > -static bool cpu_transcoder_has_drrs(struct drm_i915_private *i915, > - enum transcoder cpu_transcoder) > -{ > - if (HAS_DOUBLE_BUFFERED_M_N(i915)) > - return true; > - > - return intel_cpu_transcoder_has_m2_n2(i915, cpu_transcoder); > -} > - > static bool can_enable_drrs(struct intel_connector *connector, > const struct intel_crtc_state *pipe_config, > const struct drm_display_mode *downclock_mode) > @@ -2720,7 +2711,7 @@ static bool can_enable_drrs(struct intel_connector *connector, > if (pipe_config->has_pch_encoder) > return false; > > - if (!cpu_transcoder_has_drrs(i915, pipe_config->cpu_transcoder)) > + if (!intel_cpu_transcoder_has_drrs(i915, pipe_config->cpu_transcoder)) > return false; > > return downclock_mode &&
Hello Bug filing team, Below failures are False positive, please help to re-report. - Bhanu On 28-02-2024 01:58 pm, Patchwork wrote: > *Patch Details* > *Series:* series starting with [V2,1/2] drm/i915/drrs: Refactor CPU > transcoder DRRS check (rev2) > *URL:* https://patchwork.freedesktop.org/series/130433/ > <https://patchwork.freedesktop.org/series/130433/> > *State:* failure > *Details:* > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/index.html > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/index.html> > > > CI Bug Log - changes from CI_DRM_14354 -> Patchwork_130433v2 > > > Summary > > *FAILURE* > > Serious unknown changes coming with Patchwork_130433v2 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_130433v2, please notify your bug team > (I915-ci-infra@lists.freedesktop.org) 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_130433v2/index.html > > > Participating hosts (41 -> 41) > > Additional (1): bat-mtlp-8 > Missing (1): fi-snb-2520m > > > Possible new issues > > Here are the unknown changes that may have been introduced in > Patchwork_130433v2: > > > IGT changes > > > Possible regressions > > * igt@i915_selftest@live@guc_hang: > o bat-arls-1: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-arls-1/igt@i915_selftest@live@guc_hang.html> -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-arls-1/igt@i915_selftest@live@guc_hang.html> > > > Known issues > > Here are the changes found in Patchwork_130433v2 that come from known > issues: > > > CI changes > > > Issues hit > > * boot: > o fi-apl-guc: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/fi-apl-guc/boot.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/fi-apl-guc/boot.html> (i915#8293 <https://gitlab.freedesktop.org/drm/intel/issues/8293>) > > > Possible fixes > > * boot: > o bat-jsl-1: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-jsl-1/boot.html> (i915#8293 <https://gitlab.freedesktop.org/drm/intel/issues/8293>) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/boot.html> > > > IGT changes > > > Issues hit > > * > > igt@debugfs_test@basic-hwmon: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@debugfs_test@basic-hwmon.html> (i915#9318 <https://gitlab.freedesktop.org/drm/intel/issues/9318>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@debugfs_test@basic-hwmon.html> (i915#9318 <https://gitlab.freedesktop.org/drm/intel/issues/9318>) > * > > igt@gem_huc_copy@huc-copy: > > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@gem_huc_copy@huc-copy.html> (i915#2190 <https://gitlab.freedesktop.org/drm/intel/issues/2190>) > * > > igt@gem_lmem_swapping@verify-random: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_lmem_swapping@verify-random.html> (i915#4613 <https://gitlab.freedesktop.org/drm/intel/issues/4613>) +3 other tests skip > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@gem_lmem_swapping@verify-random.html> (i915#4613 <https://gitlab.freedesktop.org/drm/intel/issues/4613>) +3 other tests skip > * > > igt@gem_mmap@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_mmap@basic.html> (i915#4083 <https://gitlab.freedesktop.org/drm/intel/issues/4083>) > * > > igt@gem_mmap_gtt@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_mmap_gtt@basic.html> (i915#4077 <https://gitlab.freedesktop.org/drm/intel/issues/4077>) +2 other tests skip > * > > igt@gem_render_tiled_blits@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_render_tiled_blits@basic.html> (i915#4079 <https://gitlab.freedesktop.org/drm/intel/issues/4079>) +1 other test skip > * > > igt@i915_pm_rps@basic-api: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@i915_pm_rps@basic-api.html> (i915#6621 <https://gitlab.freedesktop.org/drm/intel/issues/6621>) > * > > igt@i915_selftest@live@late_gt_pm: > > o bat-arls-1: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-arls-1/igt@i915_selftest@live@late_gt_pm.html> -> DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-arls-1/igt@i915_selftest@live@late_gt_pm.html> (i915#10262 <https://gitlab.freedesktop.org/drm/intel/issues/10262>) > * > > igt@kms_addfb_basic@addfb25-y-tiled-small-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html> (i915#5190 <https://gitlab.freedesktop.org/drm/intel/issues/5190>) > * > > igt@kms_addfb_basic@basic-y-tiled-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_addfb_basic@basic-y-tiled-legacy.html> (i915#4212 <https://gitlab.freedesktop.org/drm/intel/issues/4212>) +8 other tests skip > * > > igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4213 <https://gitlab.freedesktop.org/drm/intel/issues/4213>) +1 other test skip > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4103 <https://gitlab.freedesktop.org/drm/intel/issues/4103>) +1 other test skip > * > > igt@kms_dsc@dsc-basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/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> / i915#9159 <https://gitlab.freedesktop.org/drm/intel/issues/9159>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_dsc@dsc-basic.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#9886 <https://gitlab.freedesktop.org/drm/intel/issues/9886>) > * > > igt@kms_force_connector_basic@force-load-detect: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285 <https://bugs.freedesktop.org/show_bug.cgi?id=109285>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285 <https://bugs.freedesktop.org/show_bug.cgi?id=109285>) > * > > igt@kms_force_connector_basic@prune-stale-modes: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_force_connector_basic@prune-stale-modes.html> (i915#5274 <https://gitlab.freedesktop.org/drm/intel/issues/5274>) > * > > igt@kms_psr@psr-primary-mmap-gtt@edp-1: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_psr@psr-primary-mmap-gtt@edp-1.html> (i915#4077 <https://gitlab.freedesktop.org/drm/intel/issues/4077> / i915#9688 <https://gitlab.freedesktop.org/drm/intel/issues/9688>) > * > > igt@kms_setmode@basic-clone-single-crtc: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#8809 <https://gitlab.freedesktop.org/drm/intel/issues/8809>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555>) > * > > igt@prime_vgem@basic-fence-mmap: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@prime_vgem@basic-fence-mmap.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 > * > > igt@prime_vgem@basic-fence-read: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@prime_vgem@basic-fence-read.html> (i915#3708 <https://gitlab.freedesktop.org/drm/intel/issues/3708>) +2 other tests skip > > > Possible fixes > > * igt@i915_selftest@live@hangcheck: > o {bat-rpls-3}: DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-rpls-3/igt@i915_selftest@live@hangcheck.html> (i915#5591 <https://gitlab.freedesktop.org/drm/intel/issues/5591>) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-rpls-3/igt@i915_selftest@live@hangcheck.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_14354 -> Patchwork_130433v2 > > CI-20190529: 20190529 > CI_DRM_14354: 0fbbc7c5d35d6bef7e7849f4e627658c41671188 @ > git://anongit.freedesktop.org/gfx-ci/linux > IGT_7731: 17f897a81868fb35c6a7033a8b07256659742248 @ > https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_130433v2: 0fbbc7c5d35d6bef7e7849f4e627658c41671188 @ > git://anongit.freedesktop.org/gfx-ci/linux > > > Linux commits > > 58b2fff27cac drm/i915/display/debugfs: Fix duplicate checks in > i915_drrs_status > f1940adfbbe5 drm/i915/drrs: Refactor CPU transcoder DRRS check >
Hi, https://patchwork.freedesktop.org/series/130433/ - Re-reported Thanks, Tejasree -----Original Message----- From: Modem, Bhanuprakash <bhanuprakash.modem@intel.com> Sent: Wednesday, February 28, 2024 2:25 PM To: intel-gfx@lists.freedesktop.org; LGCI Bug Filing <lgci.bug.filing@intel.com>; Illipilli, TejasreeX <tejasreex.illipilli@intel.com> Subject: Re: ✗ Fi.CI.BAT: failure for series starting with [V2,1/2] drm/i915/drrs: Refactor CPU transcoder DRRS check (rev2) Hello Bug filing team, Below failures are False positive, please help to re-report. - Bhanu On 28-02-2024 01:58 pm, Patchwork wrote: > *Patch Details* > *Series:* series starting with [V2,1/2] drm/i915/drrs: Refactor CPU > transcoder DRRS check (rev2) > *URL:* https://patchwork.freedesktop.org/series/130433/ > <https://patchwork.freedesktop.org/series/130433/> > *State:* failure > *Details:* > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/index.html > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/index.htm > l> > > > CI Bug Log - changes from CI_DRM_14354 -> Patchwork_130433v2 > > > Summary > > *FAILURE* > > Serious unknown changes coming with Patchwork_130433v2 absolutely need > to be verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_130433v2, please notify your bug team > (I915-ci-infra@lists.freedesktop.org) 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_130433v2/index.html > > > Participating hosts (41 -> 41) > > Additional (1): bat-mtlp-8 > Missing (1): fi-snb-2520m > > > Possible new issues > > Here are the unknown changes that may have been introduced in > Patchwork_130433v2: > > > IGT changes > > > Possible regressions > > * igt@i915_selftest@live@guc_hang: > o bat-arls-1: PASS > > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-arls-1/igt@ > i915_selftest@live@guc_hang.html> -> DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-arls- > 1/igt@i915_selftest@live@guc_hang.html> > > > Known issues > > Here are the changes found in Patchwork_130433v2 that come from known > issues: > > > CI changes > > > Issues hit > > * boot: > o fi-apl-guc: PASS > > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/fi-apl-guc/boot > .html> -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/fi-apl-gu > c/boot.html> (i915#8293 > <https://gitlab.freedesktop.org/drm/intel/issues/8293>) > > > Possible fixes > > * boot: > o bat-jsl-1: FAIL > > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-jsl-1/boot. > html> (i915#8293 > <https://gitlab.freedesktop.org/drm/intel/issues/8293>) -> PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1 > /boot.html> > > > IGT changes > > > Issues hit > > * > > igt@debugfs_test@basic-hwmon: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@debugfs_test@basic-hwmon.html> (i915#9318 <https://gitlab.freedesktop.org/drm/intel/issues/9318>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@debugfs_test@basic-hwmon.html> (i915#9318 <https://gitlab.freedesktop.org/drm/intel/issues/9318>) > * > > igt@gem_huc_copy@huc-copy: > > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@gem_huc_copy@huc-copy.html> (i915#2190 <https://gitlab.freedesktop.org/drm/intel/issues/2190>) > * > > igt@gem_lmem_swapping@verify-random: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_lmem_swapping@verify-random.html> (i915#4613 <https://gitlab.freedesktop.org/drm/intel/issues/4613>) +3 other tests skip > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@gem_lmem_swapping@verify-random.html> (i915#4613 <https://gitlab.freedesktop.org/drm/intel/issues/4613>) +3 other tests skip > * > > igt@gem_mmap@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_mmap@basic.html> (i915#4083 <https://gitlab.freedesktop.org/drm/intel/issues/4083>) > * > > igt@gem_mmap_gtt@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_mmap_gtt@basic.html> (i915#4077 <https://gitlab.freedesktop.org/drm/intel/issues/4077>) +2 other tests skip > * > > igt@gem_render_tiled_blits@basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@gem_render_tiled_blits@basic.html> (i915#4079 <https://gitlab.freedesktop.org/drm/intel/issues/4079>) +1 other test skip > * > > igt@i915_pm_rps@basic-api: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@i915_pm_rps@basic-api.html> (i915#6621 <https://gitlab.freedesktop.org/drm/intel/issues/6621>) > * > > igt@i915_selftest@live@late_gt_pm: > > o bat-arls-1: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-arls-1/igt@i915_selftest@live@late_gt_pm.html> -> DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-arls-1/igt@i915_selftest@live@late_gt_pm.html> (i915#10262 <https://gitlab.freedesktop.org/drm/intel/issues/10262>) > * > > igt@kms_addfb_basic@addfb25-y-tiled-small-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html> (i915#5190 <https://gitlab.freedesktop.org/drm/intel/issues/5190>) > * > > igt@kms_addfb_basic@basic-y-tiled-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_addfb_basic@basic-y-tiled-legacy.html> (i915#4212 <https://gitlab.freedesktop.org/drm/intel/issues/4212>) +8 other tests skip > * > > igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4213 <https://gitlab.freedesktop.org/drm/intel/issues/4213>) +1 other test skip > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html> (i915#4103 <https://gitlab.freedesktop.org/drm/intel/issues/4103>) +1 other test skip > * > > igt@kms_dsc@dsc-basic: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/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> / i915#9159 <https://gitlab.freedesktop.org/drm/intel/issues/9159>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_dsc@dsc-basic.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#9886 <https://gitlab.freedesktop.org/drm/intel/issues/9886>) > * > > igt@kms_force_connector_basic@force-load-detect: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285 <https://bugs.freedesktop.org/show_bug.cgi?id=109285>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_force_connector_basic@force-load-detect.html> (fdo#109285 <https://bugs.freedesktop.org/show_bug.cgi?id=109285>) > * > > igt@kms_force_connector_basic@prune-stale-modes: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_force_connector_basic@prune-stale-modes.html> (i915#5274 <https://gitlab.freedesktop.org/drm/intel/issues/5274>) > * > > igt@kms_psr@psr-primary-mmap-gtt@edp-1: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_psr@psr-primary-mmap-gtt@edp-1.html> (i915#4077 <https://gitlab.freedesktop.org/drm/intel/issues/4077> / i915#9688 <https://gitlab.freedesktop.org/drm/intel/issues/9688>) > * > > igt@kms_setmode@basic-clone-single-crtc: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555> / i915#8809 <https://gitlab.freedesktop.org/drm/intel/issues/8809>) > o bat-jsl-1: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-jsl-1/igt@kms_setmode@basic-clone-single-crtc.html> (i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555>) > * > > igt@prime_vgem@basic-fence-mmap: > > o bat-mtlp-8: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp-8/igt@prime_vgem@basic-fence-mmap.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 > * > > igt@prime_vgem@basic-fence-read: > > o bat-mtlp-8: NOTRUN -> SKIP > > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-mtlp- > 8/igt@prime_vgem@basic-fence-read.html> (i915#3708 > <https://gitlab.freedesktop.org/drm/intel/issues/3708>) +2 other tests > skip > > > Possible fixes > > * igt@i915_selftest@live@hangcheck: > o {bat-rpls-3}: DMESG-WARN > > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14354/bat-rpls-3/igt@ > i915_selftest@live@hangcheck.html> (i915#5591 > <https://gitlab.freedesktop.org/drm/intel/issues/5591>) -> PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_130433v2/bat-rpls- > 3/igt@i915_selftest@live@hangcheck.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_14354 -> Patchwork_130433v2 > > CI-20190529: 20190529 > CI_DRM_14354: 0fbbc7c5d35d6bef7e7849f4e627658c41671188 @ > git://anongit.freedesktop.org/gfx-ci/linux > IGT_7731: 17f897a81868fb35c6a7033a8b07256659742248 @ > https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_130433v2: 0fbbc7c5d35d6bef7e7849f4e627658c41671188 @ > git://anongit.freedesktop.org/gfx-ci/linux > > > Linux commits > > 58b2fff27cac drm/i915/display/debugfs: Fix duplicate checks in > i915_drrs_status > f1940adfbbe5 drm/i915/drrs: Refactor CPU transcoder DRRS check >
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 00ac65a14029..2210d3bb2e0a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -2582,6 +2582,15 @@ void intel_cpu_transcoder_set_m2_n2(struct intel_crtc *crtc, PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder)); } +bool intel_cpu_transcoder_has_drrs(struct drm_i915_private *i915, + enum transcoder cpu_transcoder) +{ + if (HAS_DOUBLE_BUFFERED_M_N(i915)) + return true; + + return intel_cpu_transcoder_has_m2_n2(i915, cpu_transcoder); +} + static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state) { struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index f4a0773f0fca..0dc39a8a517e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -484,6 +484,8 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc, void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc, enum transcoder cpu_transcoder, struct intel_link_m_n *m_n); +bool intel_cpu_transcoder_has_drrs(struct drm_i915_private *i915, + enum transcoder cpu_transcoder); int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); int intel_crtc_dotclock(const struct intel_crtc_state *pipe_config); enum intel_display_power_domain intel_port_to_power_domain(struct intel_digital_port *dig_port); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index e13121dc3a03..5c3c0449e866 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2689,15 +2689,6 @@ intel_dp_compute_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GAMUT_METADATA); } -static bool cpu_transcoder_has_drrs(struct drm_i915_private *i915, - enum transcoder cpu_transcoder) -{ - if (HAS_DOUBLE_BUFFERED_M_N(i915)) - return true; - - return intel_cpu_transcoder_has_m2_n2(i915, cpu_transcoder); -} - static bool can_enable_drrs(struct intel_connector *connector, const struct intel_crtc_state *pipe_config, const struct drm_display_mode *downclock_mode) @@ -2720,7 +2711,7 @@ static bool can_enable_drrs(struct intel_connector *connector, if (pipe_config->has_pch_encoder) return false; - if (!cpu_transcoder_has_drrs(i915, pipe_config->cpu_transcoder)) + if (!intel_cpu_transcoder_has_drrs(i915, pipe_config->cpu_transcoder)) return false; return downclock_mode &&
Rename cpu_transcoder_has_drrs() to intel_cpu_transcoder_has_drrs() and make it as non-static, therefore it can be re-used. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Cc: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 9 +++++++++ drivers/gpu/drm/i915/display/intel_display.h | 2 ++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +---------- 3 files changed, 12 insertions(+), 10 deletions(-)