Skip to content

Commit 1c3217d

Browse files
Alvin Leealexdeucher
authored andcommitted
drm/amd/display: Use mpc.preblend flag to indicate preblend
[Description] Modifications in per asic capability means mpc.preblend flag should be used to indicate preblend. Update relevant paths to use this flag. Fixes: 3992305 ("drm/amd/display: Clear DPP 3DLUT Cap") Reviewed-by: Dillon Varone <dillon.varone@amd.com> Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com> Signed-off-by: Ivan Lipski <ivan.lipski@amd.com> Tested-by: Dan Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 9e5d4a5) Cc: stable@vger.kernel.org
1 parent 44b0fed commit 1c3217d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ int amdgpu_dm_verify_lut3d_size(struct amdgpu_device *adev,
821821
struct dm_plane_state *dm_plane_state = to_dm_plane_state(plane_state);
822822
const struct drm_color_lut *shaper = NULL, *lut3d = NULL;
823823
uint32_t exp_size, size, dim_size = MAX_COLOR_3DLUT_SIZE;
824-
bool has_3dlut = adev->dm.dc->caps.color.dpp.hw_3d_lut;
824+
bool has_3dlut = adev->dm.dc->caps.color.dpp.hw_3d_lut || adev->dm.dc->caps.color.mpc.preblend;
825825

826826
/* shaper LUT is only available if 3D LUT color caps */
827827
exp_size = has_3dlut ? MAX_COLOR_LUT_ENTRIES : 0;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ dm_atomic_plane_attach_color_mgmt_properties(struct amdgpu_display_manager *dm,
16331633
drm_object_attach_property(&plane->base,
16341634
dm->adev->mode_info.plane_ctm_property, 0);
16351635

1636-
if (dpp_color_caps.hw_3d_lut) {
1636+
if (dpp_color_caps.hw_3d_lut || dm->dc->caps.color.mpc.preblend) {
16371637
drm_object_attach_property(&plane->base,
16381638
mode_info.plane_shaper_lut_property, 0);
16391639
drm_object_attach_property(&plane->base,

0 commit comments

Comments
 (0)