Skip to contentSkip to conversation

drm/i915/dsc/mtl: Update the DSC minor version

PATCH In review Jani Nikula 3 participants 11 messages Aug 17, 2022 – Aug 22, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/dsc/mtl: Update the DSC minor version

From: Vandita Kulkarni <[email protected]>

From MTL onwards we support DSC1.2, since there is hardcoding to minor version 1, update it.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +14 -4
index 32292c0be2bd..db5f536bde05 100644
@@ -1377,7 +1377,18 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 max_req_bpc)
 	return 0;
 }
 
-#define DSC_SUPPORTED_VERSION_MIN		1
+static int intel_dp_source_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+	return DISPLAY_VER(i915) >= 14 ? 2 : 1;
+}
+
+static int intel_dp_sink_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	return (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] & DP_DSC_MINOR_MASK) >>
+		DP_DSC_MINOR_SHIFT;
+}
 
 static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
 				       struct intel_crtc_state *crtc_state)
@@ -1416,9 +1427,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
 		(intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
 		 DP_DSC_MAJOR_MASK) >> DP_DSC_MAJOR_SHIFT;
 	vdsc_cfg->dsc_version_minor =
-		min(DSC_SUPPORTED_VERSION_MIN,
-		    (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
-		     DP_DSC_MINOR_MASK) >> DP_DSC_MINOR_SHIFT);
+		min(intel_dp_source_dsc_version_minor(intel_dp),
+		    intel_dp_sink_dsc_version_minor(intel_dp));
 
 	vdsc_cfg->convert_rgb = intel_dp->dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
 		DP_DSC_RGB;
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 drm/i915/dsc/mtl: Enable alternate ICH method

From: Vandita Kulkarni <[email protected]>

DSC 1.2 is supported from MTL, hence program ICH accordingly.

---
 drivers/gpu/drm/i915/display/intel_vdsc.c | 2 ++
 drivers/gpu/drm/i915/i915_reg.h           | 1 +
 2 files changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_vdsc.c +2 -0
index 43e1bbc1e303..ac4ba7ac85c6 100644
@@ -597,6 +597,8 @@ static void intel_dsc_pps_configure(const struct intel_crtc_state *crtc_state)
 		DSC_VER_MIN_SHIFT |
 		vdsc_cfg->bits_per_component << DSC_BPC_SHIFT |
 		vdsc_cfg->line_buf_depth << DSC_LINE_BUF_DEPTH_SHIFT;
+	if (vdsc_cfg->dsc_version_minor == 2)
+		pps_val |= DSC_ALT_ICH_SEL;
 	if (vdsc_cfg->block_pred_enable)
 		pps_val |= DSC_BLOCK_PREDICTION;
 	if (vdsc_cfg->convert_rgb)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 50d7bfd541ad..2e3aa684cf1b 100644
@@ -8003,6 +8003,7 @@ enum skl_power_gate {
 #define ICL_DSC1_PICTURE_PARAMETER_SET_0(pipe)	_MMIO_PIPE((pipe) - PIPE_B, \
 							   _ICL_DSC1_PICTURE_PARAMETER_SET_0_PB, \
 							   _ICL_DSC1_PICTURE_PARAMETER_SET_0_PC)
+#define  DSC_ALT_ICH_SEL		(1 << 20)
 #define  DSC_VBR_ENABLE			(1 << 19)
 #define  DSC_422_ENABLE			(1 << 18)
 #define  DSC_COLOR_SPACE_CONVERSION	(1 << 17)
Signature · 1 line
2.34.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [Intel-gfx] [PATCH 2/2] drm/i915/dsc/mtl: Enable alternate ICH method

LGTM.

Quoted 37 lines · Jani Nikula

From: Vandita Kulkarni <[email protected]>

DSC 1.2 is supported from MTL, hence program ICH accordingly.

---
  drivers/gpu/drm/i915/display/intel_vdsc.c | 2 ++
  drivers/gpu/drm/i915/i915_reg.h           | 1 +
  2 files changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_vdsc.c +2 -0
index 43e1bbc1e303..ac4ba7ac85c6 100644
@@ -597,6 +597,8 @@ static void intel_dsc_pps_configure(const struct intel_crtc_state *crtc_state)
  		DSC_VER_MIN_SHIFT |
  		vdsc_cfg->bits_per_component << DSC_BPC_SHIFT |
  		vdsc_cfg->line_buf_depth << DSC_LINE_BUF_DEPTH_SHIFT;
+	if (vdsc_cfg->dsc_version_minor == 2)
+		pps_val |= DSC_ALT_ICH_SEL;
  	if (vdsc_cfg->block_pred_enable)
  		pps_val |= DSC_BLOCK_PREDICTION;
  	if (vdsc_cfg->convert_rgb)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 50d7bfd541ad..2e3aa684cf1b 100644
@@ -8003,6 +8003,7 @@ enum skl_power_gate {
  #define ICL_DSC1_PICTURE_PARAMETER_SET_0(pipe)	_MMIO_PIPE((pipe) - PIPE_B, \
  							   _ICL_DSC1_PICTURE_PARAMETER_SET_0_PB, \
  							   _ICL_DSC1_PICTURE_PARAMETER_SET_0_PC)
+#define  DSC_ALT_ICH_SEL		(1 << 20)
  #define  DSC_VBR_ENABLE			(1 << 19)
  #define  DSC_422_ENABLE			(1 << 18)
  #define  DSC_COLOR_SPACE_CONVERSION	(1 << 17)
#3 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version
URL : https://patchwork.freedesktop.org/series/107366/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11993 -> Patchwork_107366v1
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_107366v1 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_107366v1, 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_107366v1/index.html

Participating hosts (31 -> 34)
------------------------------

Additional (4): bat-adln-1 bat-adlm-1 fi-icl-u2 fi-tgl-dsi
Missing (1): fi-pnv-d510

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_107366v1:

### IGT changes ###

#### Possible regressions ####

* igt@i915_module_load@load:
- fi-icl-u2: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/fi-icl-u2/igt@[email protected]

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@i915_module_load@load:
- {bat-adln-1}: NOTRUN -> [DMESG-WARN][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/bat-adln-1/igt@[email protected]

* igt@i915_module_load@reload:
- {fi-tgl-dsi}: NOTRUN -> [WARN][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/fi-tgl-dsi/igt@[email protected]

* igt@runner@aborted:
- {bat-adlm-1}: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/bat-adlm-1/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_107366v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@runner@aborted:
- fi-icl-u2: NOTRUN -> [FAIL][5] ([i915#4312])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/fi-icl-u2/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: [DMESG-FAIL][6] ([i915#4494] / [i915#4957]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11993/bat-dg1-5/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/bat-dg1-5/igt@i915_selftest@[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#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1245]: https://gitlab.freedesktop.org/drm/intel/issues/1245
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#6559]: https://gitlab.freedesktop.org/drm/intel/issues/6559

Build changes
-------------

* Linux: CI_DRM_11993 -> Patchwork_107366v1

CI-20190529: 20190529
CI_DRM_11993: 2dfc67084761ba9b6259873bd574548dc4827296 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6629: d24e986fb3b2ab6d755498d27828bc85931d12ff @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107366v1: 2dfc67084761ba9b6259873bd574548dc4827296 @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

244565c8e5fe drm/i915/dsc/mtl: Enable alternate ICH method 29a5c37b1646 drm/i915/dsc/mtl: Update the DSC minor version

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v1/index.html

#4 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)
URL : https://patchwork.freedesktop.org/series/107366/
State : warning

== Summary ==

Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.

#5 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)
URL : https://patchwork.freedesktop.org/series/107366/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11997 -> Patchwork_107366v2
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/index.html

Participating hosts (33 -> 31)
------------------------------

Additional (1): fi-kbl-soraka
Missing (3): bat-rpls-2 fi-icl-u2 fi-tgl-dsi

Known issues
------------

Here are the changes found in Patchwork_107366v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: NOTRUN -> [DMESG-FAIL][1] ([i915#4494] / [i915#4957])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/bat-dg1-6/igt@i915_selftest@[email protected]

* igt@i915_suspend@basic-s2idle-without-i915:
- bat-dg1-6: NOTRUN -> [INCOMPLETE][2] ([i915#6011])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/bat-dg1-6/igt@[email protected]

* igt@runner@aborted:
- fi-kbl-soraka: NOTRUN -> [FAIL][3] ([i915#6219])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@gt_engines:
- bat-dg1-6: [INCOMPLETE][4] ([i915#4418]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/bat-dg1-6/igt@i915_selftest@live@gt_engines.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/bat-dg1-6/igt@i915_selftest@live@gt_engines.html

#### Warnings ####

* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: [DMESG-FAIL][6] ([i915#4957]) -> [DMESG-FAIL][7] ([i915#4494] / [i915#4957])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/bat-dg1-5/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/bat-dg1-5/igt@i915_selftest@[email protected]

[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#6011]: https://gitlab.freedesktop.org/drm/intel/issues/6011
[i915#6219]: https://gitlab.freedesktop.org/drm/intel/issues/6219

Build changes
-------------

* Linux: CI_DRM_11997 -> Patchwork_107366v2

CI-20190529: 20190529
CI_DRM_11997: ce38effc5cd7cb2af612fd8946149275e3c1f919 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6630: b5e2222c9a988015bdf237e6ebb9f5b6d87ac7e1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107366v2: ce38effc5cd7cb2af612fd8946149275e3c1f919 @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

90b42ac9ce9f drm/i915/dsc/mtl: Enable alternate ICH method e1dc5d511811 drm/i915/dsc/mtl: Update the DSC minor version

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/index.html

#6 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dsc/mtl: Update the DSC minor version (rev2)
URL : https://patchwork.freedesktop.org/series/107366/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11997_full -> Patchwork_107366v2_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (12 -> 11)
------------------------------

Missing (1): pig-kbl-iris

Known issues
------------

Here are the changes found in Patchwork_107366v2_full that come from known issues:

### CI changes ###

#### Issues hit ####

* boot:
- shard-glk: ([PASS][1], [PASS][2], [PASS][3], [PASS][4], [PASS][5], [PASS][6], [PASS][7], [PASS][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [PASS][13], [PASS][14], [PASS][15], [PASS][16], [PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25]) -> ([PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [FAIL][48], [PASS][49], [PASS][50]) ([i915#4392])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk1/boot.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk1/boot.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk1/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk2/boot.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk2/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk2/boot.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk2/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk3/boot.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk3/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk3/boot.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk5/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk5/boot.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk6/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk6/boot.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk6/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk6/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk7/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk7/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk7/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk8/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk8/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk8/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk9/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk9/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-glk9/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk1/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk1/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk1/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk2/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk2/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk2/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk3/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk3/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk3/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk5/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk5/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk5/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk5/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk6/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk6/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk6/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk7/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk7/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk7/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk8/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk8/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk8/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk9/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk9/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-glk9/boot.html

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: NOTRUN -> [FAIL][51] ([i915#2842])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [PASS][52] -> [FAIL][53] ([i915#2842])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-kbl1/igt@gem_exec_fair@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@gem_exec_fair@[email protected]

* igt@gem_lmem_swapping@random:
- shard-kbl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#4613]) +2 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl1/igt@[email protected]

* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][55] -> [DMESG-WARN][56] ([i915#180])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl4/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-apl: [PASS][57] -> [DMESG-WARN][58] ([i915#5566] / [i915#716])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl4/igt@[email protected]

* igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][59] ([fdo#109271] / [i915#3886]) +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_mc_ccs.html

* igt@kms_chamelium@hdmi-audio:
- shard-kbl: NOTRUN -> [SKIP][60] ([fdo#109271] / [fdo#111827]) +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-kbl: NOTRUN -> [TIMEOUT][61] ([i915#1319])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl1/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-kbl: NOTRUN -> [FAIL][62] ([i915#2105])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

* igt@kms_fbcon_fbt@psr-suspend:
- shard-kbl: NOTRUN -> [SKIP][63] ([fdo#109271]) +104 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-kbl: [PASS][64] -> [DMESG-WARN][65] ([i915#180]) +2 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-kbl1/igt@kms_flip@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl4/igt@kms_flip@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][66] ([fdo#108145] / [i915#265])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][67] ([i915#265]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl1/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area:
- shard-kbl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#658])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

* igt@kms_vblank@pipe-a-wait-idle:
- shard-apl: [PASS][69] -> [DMESG-WARN][70] ([i915#62]) +28 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl3/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl3/igt@[email protected]

* igt@sysfs_clients@fair-0:
- shard-kbl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#2994]) +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl7/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [DMESG-WARN][72] ([i915#180]) -> [PASS][73] +9 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-kbl4/igt@gem_ctx_isolation@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl1/igt@gem_ctx_isolation@[email protected]

* igt@gem_eio@kms:
- shard-tglb: [FAIL][74] ([i915#5784]) -> [PASS][75] +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-tglb5/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-tglb7/igt@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][76] ([i915#2842]) -> [PASS][77] +1 similar issue
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl8/igt@gem_exec_fair@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@rcs0:
- shard-kbl: [FAIL][78] ([i915#2842]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-kbl1/igt@gem_exec_fair@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl1/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][80] ([i915#2190]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-tglb7/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-tglb5/igt@[email protected]

* igt@kms_hdr@bpc-switch-dpms@pipe-a-dp-1:
- shard-kbl: [FAIL][82] ([i915#1188]) -> [PASS][83] +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-kbl1/igt@kms_hdr@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-kbl4/igt@kms_hdr@[email protected]

* igt@perf@polling-parameterized:
- shard-tglb: [FAIL][84] ([i915#5639]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-tglb5/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-tglb3/igt@[email protected]

#### Warnings ####

* igt@gem_eio@in-flight-suspend:
- shard-snb: [INCOMPLETE][86] -> [INCOMPLETE][87] ([i915#6598])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-snb4/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-snb4/igt@[email protected]

* igt@kms_cursor_crc@cursor-suspend@pipe-a-dp-1:
- shard-apl: [INCOMPLETE][88] ([i915#6598]) -> [INCOMPLETE][89] ([i915#180] / [i915#6598])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl1/igt@kms_cursor_crc@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl4/igt@kms_cursor_crc@[email protected]

* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [INCOMPLETE][90] ([i915#6598]) -> [INCOMPLETE][91] ([i915#1982] / [i915#6598])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl1/igt@kms_flip@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl1/igt@kms_flip@[email protected]

* igt@runner@aborted:
- shard-apl: [FAIL][92] ([i915#4312] / [i915#6599]) -> ([FAIL][93], [FAIL][94], [FAIL][95]) ([fdo#109271] / [i915#180] / [i915#4312] / [i915#5257] / [i915#6599])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11997/shard-apl7/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl1/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl4/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/shard-apl4/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1063]: https://gitlab.freedesktop.org/drm/intel/issues/1063
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2105]: https://gitlab.freedesktop.org/drm/intel/issues/2105
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3376]: https://gitlab.freedesktop.org/drm/intel/issues/3376
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3828]: https://gitlab.freedesktop.org/drm/intel/issues/3828
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3936]: https://gitlab.freedesktop.org/drm/intel/issues/3936
[i915#3938]: https://gitlab.freedesktop.org/drm/intel/issues/3938
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[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#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4392]: https://gitlab.freedesktop.org/drm/intel/issues/4392
[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4853]: https://gitlab.freedesktop.org/drm/intel/issues/4853
[i915#4855]: https://gitlab.freedesktop.org/drm/intel/issues/4855
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4883]: https://gitlab.freedesktop.org/drm/intel/issues/4883
[i915#4893]: https://gitlab.freedesktop.org/drm/intel/issues/4893
[i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5287]: https://gitlab.freedesktop.org/drm/intel/issues/5287
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6331]: https://gitlab.freedesktop.org/drm/intel/issues/6331
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6458]: https://gitlab.freedesktop.org/drm/intel/issues/6458
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716

Build changes
-------------

* Linux: CI_DRM_11997 -> Patchwork_107366v2

CI-20190529: 20190529
CI_DRM_11997: ce38effc5cd7cb2af612fd8946149275e3c1f919 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6630: b5e2222c9a988015bdf237e6ebb9f5b6d87ac7e1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107366v2: ce38effc5cd7cb2af612fd8946149275e3c1f919 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107366v2/index.html

Reviewed-by on v1 1/2
#7 lore raw
In reply to Jani Nikula

LGTM.

Quoted 48 lines · Jani Nikula

From: Vandita Kulkarni <[email protected]>

From MTL onwards we support DSC1.2, since there is hardcoding
to minor version 1, update it.

---
  drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +14 -4
index 32292c0be2bd..db5f536bde05 100644
@@ -1377,7 +1377,18 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 max_req_bpc)
  	return 0;
  }
 
-#define DSC_SUPPORTED_VERSION_MIN		1
+static int intel_dp_source_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+	return DISPLAY_VER(i915) >= 14 ? 2 : 1;
+}
+
+static int intel_dp_sink_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	return (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] & DP_DSC_MINOR_MASK) >>
+		DP_DSC_MINOR_SHIFT;
+}
 
  static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
  				       struct intel_crtc_state *crtc_state)
@@ -1416,9 +1427,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
  		(intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
  		 DP_DSC_MAJOR_MASK) >> DP_DSC_MAJOR_SHIFT;
  	vdsc_cfg->dsc_version_minor =
-		min(DSC_SUPPORTED_VERSION_MIN,
-		    (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
-		     DP_DSC_MINOR_MASK) >> DP_DSC_MINOR_SHIFT);
+		min(intel_dp_source_dsc_version_minor(intel_dp),
+		    intel_dp_sink_dsc_version_minor(intel_dp));
 
  	vdsc_cfg->convert_rgb = intel_dp->dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
  		DP_DSC_RGB;
#8 lore raw
Quoted 3 lines · Ankit K

LGTM.

Thanks; does this apply to both patches?

BR,
Jani.

Quoted 50 lines · Jani Nikula
Quoted 48 lines

From: Vandita Kulkarni <[email protected]>

From MTL onwards we support DSC1.2, since there is hardcoding
to minor version 1, update it.

---
  drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +14 -4
index 32292c0be2bd..db5f536bde05 100644
@@ -1377,7 +1377,18 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 max_req_bpc)
  	return 0;
  }
 
-#define DSC_SUPPORTED_VERSION_MIN		1
+static int intel_dp_source_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+	return DISPLAY_VER(i915) >= 14 ? 2 : 1;
+}
+
+static int intel_dp_sink_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	return (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] & DP_DSC_MINOR_MASK) >>
+		DP_DSC_MINOR_SHIFT;
+}
 
  static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
  				       struct intel_crtc_state *crtc_state)
@@ -1416,9 +1427,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
  		(intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
  		 DP_DSC_MAJOR_MASK) >> DP_DSC_MAJOR_SHIFT;
  	vdsc_cfg->dsc_version_minor =
-		min(DSC_SUPPORTED_VERSION_MIN,
-		    (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
-		     DP_DSC_MINOR_MASK) >> DP_DSC_MINOR_SHIFT);
+		min(intel_dp_source_dsc_version_minor(intel_dp),
+		    intel_dp_sink_dsc_version_minor(intel_dp));
 
  	vdsc_cfg->convert_rgb = intel_dp->dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
  		DP_DSC_RGB;
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#9 lore raw
Quoted 5 lines · Jani Nikula
Quoted 3 lines · Ankit K

LGTM.

Thanks; does this apply to both patches?

I have given RB on the other patch separately.

Regards,

Ankit

Quoted 54 lines

BR,
Jani.

Quoted 49 lines · Jani Nikula
Quoted 48 lines

From: Vandita Kulkarni <[email protected]>

From MTL onwards we support DSC1.2, since there is hardcoding
to minor version 1, update it.

---
   drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++++----
   1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +14 -4
index 32292c0be2bd..db5f536bde05 100644
@@ -1377,7 +1377,18 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 max_req_bpc)
   	return 0;
   }
 
-#define DSC_SUPPORTED_VERSION_MIN		1
+static int intel_dp_source_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+	return DISPLAY_VER(i915) >= 14 ? 2 : 1;
+}
+
+static int intel_dp_sink_dsc_version_minor(struct intel_dp *intel_dp)
+{
+	return (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] & DP_DSC_MINOR_MASK) >>
+		DP_DSC_MINOR_SHIFT;
+}
 
   static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
   				       struct intel_crtc_state *crtc_state)
@@ -1416,9 +1427,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
   		(intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
   		 DP_DSC_MAJOR_MASK) >> DP_DSC_MAJOR_SHIFT;
   	vdsc_cfg->dsc_version_minor =
-		min(DSC_SUPPORTED_VERSION_MIN,
-		    (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
-		     DP_DSC_MINOR_MASK) >> DP_DSC_MINOR_SHIFT);
+		min(intel_dp_source_dsc_version_minor(intel_dp),
+		    intel_dp_sink_dsc_version_minor(intel_dp));
 
   	vdsc_cfg->convert_rgb = intel_dp->dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
   		DP_DSC_RGB;
#10 lore raw
Quoted 8 lines · Ankit K
Quoted 5 lines · Jani Nikula
Quoted 3 lines · Ankit K

LGTM.

Thanks; does this apply to both patches?

I have given RB on the other patch separately.

Thanks, both pushed to drm-intel-next.

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center