Commit 18f39f2d authored by Roman Li's avatar Roman Li Committed by Alex Deucher

drm/amd/display: fix gamma for dpms usecase

For dpms usecase we need to set surface transfer function
regardless of gamma set flag.
Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7fc698a0
...@@ -515,7 +515,6 @@ static void fill_gamma_from_crtc( ...@@ -515,7 +515,6 @@ static void fill_gamma_from_crtc(
struct dc_gamma *gamma; struct dc_gamma *gamma;
struct drm_crtc_state *state = crtc->state; struct drm_crtc_state *state = crtc->state;
struct drm_color_lut *lut = (struct drm_color_lut *) state->gamma_lut->data; struct drm_color_lut *lut = (struct drm_color_lut *) state->gamma_lut->data;
struct dc_transfer_func *input_tf;
gamma = dc_create_gamma(); gamma = dc_create_gamma();
...@@ -529,16 +528,6 @@ static void fill_gamma_from_crtc( ...@@ -529,16 +528,6 @@ static void fill_gamma_from_crtc(
} }
dc_surface->gamma_correction = gamma; dc_surface->gamma_correction = gamma;
input_tf = dc_create_transfer_func();
if (input_tf == NULL)
return;
input_tf->type = TF_TYPE_PREDEFINED;
input_tf->tf = TRANSFER_FUNCTION_SRGB;
dc_surface->in_transfer_func = input_tf;
} }
static void fill_plane_attributes( static void fill_plane_attributes(
...@@ -549,6 +538,7 @@ static void fill_plane_attributes( ...@@ -549,6 +538,7 @@ static void fill_plane_attributes(
const struct amdgpu_framebuffer *amdgpu_fb = const struct amdgpu_framebuffer *amdgpu_fb =
to_amdgpu_framebuffer(state->fb); to_amdgpu_framebuffer(state->fb);
const struct drm_crtc *crtc = state->crtc; const struct drm_crtc *crtc = state->crtc;
struct dc_transfer_func *input_tf;
fill_rects_from_plane_state(state, surface); fill_rects_from_plane_state(state, surface);
fill_plane_attributes_from_fb( fill_plane_attributes_from_fb(
...@@ -557,6 +547,16 @@ static void fill_plane_attributes( ...@@ -557,6 +547,16 @@ static void fill_plane_attributes(
amdgpu_fb, amdgpu_fb,
addrReq); addrReq);
input_tf = dc_create_transfer_func();
if (input_tf == NULL)
return;
input_tf->type = TF_TYPE_PREDEFINED;
input_tf->tf = TRANSFER_FUNCTION_SRGB;
surface->in_transfer_func = input_tf;
/* In case of gamma set, update gamma value */ /* In case of gamma set, update gamma value */
if (state->crtc->state->gamma_lut) { if (state->crtc->state->gamma_lut) {
fill_gamma_from_crtc(crtc, surface); fill_gamma_from_crtc(crtc, surface);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment