diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3560-drm-amd-display-Hookup-color-management-functions.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3560-drm-amd-display-Hookup-color-management-functions.patch | 154 |
1 files changed, 154 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3560-drm-amd-display-Hookup-color-management-functions.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3560-drm-amd-display-Hookup-color-management-functions.patch new file mode 100644 index 00000000..77547ad8 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3560-drm-amd-display-Hookup-color-management-functions.patch @@ -0,0 +1,154 @@ +From 39ac4ab0e05ec7fd836db46bf5c166e2e1df9bad Mon Sep 17 00:00:00 2001 +From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com> +Date: Fri, 2 Feb 2018 10:18:56 -0500 +Subject: [PATCH 3560/4131] drm/amd/display: Hookup color management functions + +Hookup new color management functions into amdgpu_dm: + +- Notify DRM that we support CRTC color management during CRTC init +- Call color management functions within atomic check to update dc + states in preparation for a commit + +Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com> +Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + +Conflicts: + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + +Change-Id: I908d4ce0df1ad2a37478dc7cd5c140e6bebf7fba +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 65 ++++++++++++----------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + 2 files changed, 34 insertions(+), 32 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 0191634..6cf7d0c 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -475,6 +475,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) + DRM_DEBUG_DRIVER("amdgpu: freesync_module init done %p.\n", + adev->dm.freesync_module); + ++ amdgpu_dm_init_color_mod(); ++ + if (amdgpu_dm_initialize_drm_device(adev)) { + DRM_ERROR( + "amdgpu: failed to initialize sw for display support.\n"); +@@ -1960,32 +1962,6 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev, + + } + +-static void fill_gamma_from_crtc_state(const struct drm_crtc_state *crtc_state, +- struct dc_plane_state *plane_state) +-{ +- int i; +- struct dc_gamma *gamma; +- struct drm_color_lut *lut = +- (struct drm_color_lut *) crtc_state->gamma_lut->data; +- +- gamma = dc_create_gamma(); +- +- if (gamma == NULL) { +- WARN_ON(1); +- return; +- } +- +- gamma->type = GAMMA_RGB_256; +- gamma->num_entries = GAMMA_RGB_256_ENTRIES; +- for (i = 0; i < GAMMA_RGB_256_ENTRIES; i++) { +- gamma->entries.red[i] = dal_fixed31_32_from_int(lut[i].red); +- gamma->entries.green[i] = dal_fixed31_32_from_int(lut[i].green); +- gamma->entries.blue[i] = dal_fixed31_32_from_int(lut[i].blue); +- } +- +- plane_state->gamma_correction = gamma; +-} +- + static int fill_plane_attributes(struct amdgpu_device *adev, + struct dc_plane_state *dc_plane_state, + struct drm_plane_state *plane_state, +@@ -2013,15 +1989,16 @@ static int fill_plane_attributes(struct amdgpu_device *adev, + if (input_tf == NULL) + return -ENOMEM; + +- input_tf->type = TF_TYPE_PREDEFINED; +- input_tf->tf = TRANSFER_FUNCTION_SRGB; +- + dc_plane_state->in_transfer_func = input_tf; + + /* In case of gamma set, update gamma value */ + if (crtc_state->gamma_lut) +- fill_gamma_from_crtc_state(crtc_state, dc_plane_state); +- ++ /* ++ * Always set input transfer function, since plane state is refreshed ++ * every time. ++ */ ++ ret = amdgpu_dm_set_degamma_lut(crtc_state, dc_plane_state); ++ + return ret; + } + +@@ -3324,6 +3301,7 @@ static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm, + acrtc->base.enabled = false; + + dm->adev->mode_info.crtcs[crtc_index] = acrtc; ++ drm_crtc_enable_color_mgmt(&acrtc->base, 256, true, 256); + drm_mode_crtc_set_gamma_size(&acrtc->base, 256); + + return 0; +@@ -4752,6 +4730,30 @@ static int dm_update_crtcs_state(struct dc *dc, + /* Release extra reference */ + if (new_stream) + dc_stream_release(new_stream); ++ ++ /* ++ * We want to do dc stream updates that do not require a ++ * full modeset below. ++ */ ++ if (!enable || !aconnector || modereset_required(new_crtc_state)) ++ continue; ++ /* ++ * Given above conditions, the dc state cannot be NULL because: ++ * 1. We're attempting to enable a CRTC. Which has a... ++ * 2. Valid connector attached, and ++ * 3. User does not want to reset it (disable or mark inactive, ++ * which can happen on a CRTC that's already disabled). ++ * => It currently exists. ++ */ ++ BUG_ON(dm_new_crtc_state->stream == NULL); ++ ++ /* Color managment settings */ ++ if (dm_new_crtc_state->base.color_mgmt_changed) { ++ ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state); ++ if (ret) ++ goto fail; ++ amdgpu_dm_set_ctm(dm_new_crtc_state); ++ } + } + + return ret; +@@ -4860,7 +4862,6 @@ static int dm_update_planes_state(struct dc *dc, + if (ret) + return ret; + +- + if (!dc_add_plane_to_context( + dc, + dm_new_crtc_state->stream, +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +index 9c556d8..7e5d5cd 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +@@ -269,6 +269,7 @@ void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc); + #define amdgpu_dm_crtc_handle_crc_irq(x) + #endif + ++void amdgpu_dm_init_color_mod(void); + int amdgpu_dm_set_degamma_lut(struct drm_crtc_state *crtc_state, + struct dc_plane_state *dc_plane_state); + void amdgpu_dm_set_ctm(struct dm_crtc_state *crtc); +-- +2.7.4 + |