5.15-stable patches

added patches:
	drm-amd-display-enable-cursor-degamma-for-dcn3-drm-legacy-gamma.patch

diff --git a/queue-5.15/drm-amd-display-enable-cursor-degamma-for-dcn3-drm-legacy-gamma.patch b/queue-5.15/drm-amd-display-enable-cursor-degamma-for-dcn3-drm-legacy-gamma.patch
new file mode 100644 (file)
index 0000000..41556dc
--- /dev/null
+++ b/queue-5.15/drm-amd-display-enable-cursor-degamma-for-dcn3-drm-legacy-gamma.patch
@@ -0,0 +1,44 @@
+From 57a943ebfcdb4a97fbb409640234bdb44bfa1953 Mon Sep 17 00:00:00 2001
+From: Melissa Wen <mwen@igalia.com>
+Date: Thu, 31 Aug 2023 15:12:28 -0100
+Subject: drm/amd/display: enable cursor degamma for DCN3+ DRM legacy gamma
+
+From: Melissa Wen <mwen@igalia.com>
+
+commit 57a943ebfcdb4a97fbb409640234bdb44bfa1953 upstream.
+
+For DRM legacy gamma, AMD display manager applies implicit sRGB degamma
+using a pre-defined sRGB transfer function. It works fine for DCN2
+family where degamma ROM and custom curves go to the same color block.
+But, on DCN3+, degamma is split into two blocks: degamma ROM for
+pre-defined TFs and `gamma correction` for user/custom curves and
+degamma ROM settings doesn't apply to cursor plane. To get DRM legacy
+gamma working as expected, enable cursor degamma ROM for implict sRGB
+degamma on HW with this configuration.
+
+Cc: stable@vger.kernel.org
+Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2803
+Fixes: 96b020e2163f ("drm/amd/display: check attr flag before set cursor degamma on DCN3+")
+Signed-off-by: Melissa Wen <mwen@igalia.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -8794,6 +8794,13 @@ static void handle_cursor_update(struct
+       attributes.rotation_angle    = 0;
+       attributes.attribute_flags.value = 0;
+ 
++      /* Enable cursor degamma ROM on DCN3+ for implicit sRGB degamma in DRM
++       * legacy gamma setup.
++       */
++      if (crtc_state->cm_is_degamma_srgb &&
++          adev->dm.dc->caps.color.dpp.gamma_corr)
++              attributes.attribute_flags.bits.ENABLE_CURSOR_DEGAMMA = 1;
++
+       attributes.pitch = afb->base.pitches[0] / afb->base.format->cpp[0];
+ 
+       if (crtc_state->stream) {

diff --git a/queue-5.15/series b/queue-5.15/series
index be7fbfe2e58bfe50763f20d77252d1d794354b4b..675a193acf756b66fde5dda9053ceba6cda3e447 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -107,3 +107,4 @@ ext4-fix-rec_len-verify-error.patch
 drm-amd-display-fix-the-white-screen-issue-when-64gb-dram.patch
 drm-amdgpu-fix-amdgpu_cs_p1_user_fence.patch
 net-sched-retire-rsvp-classifier.patch
+drm-amd-display-enable-cursor-degamma-for-dcn3-drm-legacy-gamma.patch