summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Ashton <joshua@froggi.es>2023-11-02 07:32:16 +0000
committerJoshua Ashton <joshua@froggi.es>2023-11-03 01:29:14 +0000
commit3e2cebf9bcd10e092d45211fc0698efcaf988411 (patch)
tree07aa473ac32214f4ed430a80ffa9a90e896176f6
parent72697d5c31c2b6781cbf52cee5f623b7b0d6fd51 (diff)
downloadlinux-3e2cebf9bcd10e092d45211fc0698efcaf988411.tar.gz
drm/amd/display: Remove erroneous color_mgmt_changed check in amdgpu_dm_plane_set_color_properties
Pure luck we didn't run into this before.

Could be a newly allocated dc_plane_state.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index c84692612bd2..86a2d449cf07 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -1031,8 +1031,15 @@ amdgpu_dm_plane_set_color_properties(struct drm_plane_state *plane_state,
 	int ret;
 
 	/* We have nothing to do here, return */
+	/*
+	 * JoshA: WE HAVE TO DO THIS EVERY TIME.
+	 * It's on a new dc_plane_state allocation, none of this data is here!
+	 * !!!!!!!!
+	 * This was always true before we duped properties due to LUCK and the
+	 * properties matching.
 	if (!plane_state->color_mgmt_changed)
 		return 0;
+	*/
 
 	dc_plane_state->hdr_mult = dc_fixpt_from_s3132(dm_plane_state->hdr_mult);