mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 12:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/display: Fix Gamma Adjustment

Browse Source 
- Gamma correction is not properly copied to the surface after refactor
- Make sure gamma correction is copied with correct retain

Signed-off-by: Amy Zhang <Amy.Zhang@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Amy Zhang
2016-12-12 10:32:24 -05:00
committed by Alex Deucher
parent 9474980ac4
commit 89e8963036
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@@ -1302,8 +1302,8 @@ bool dc_commit_surfaces_to_target(
for (i = 0; i < new_surface_count; i++) {
updates[i].surface = new_surfaces[i];
updates[i].gamma = (struct dc_gamma *)new_surfaces[i]->gamma_correction;
updates[i].gamma =
(struct dc_gamma *)new_surfaces[i]->gamma_correction;
flip_addr[i].address = new_surfaces[i]->address;
flip_addr[i].flip_immediate = new_surfaces[i]->flip_immediate;
plane_info[i].color_space = new_surfaces[i]->color_space;
@@ -1444,6 +1444,16 @@ void dc_update_surfaces_for_target(struct dc *dc, struct dc_surface_update *upda
pipe_ctx->scl_data.recout.width -= 2;
}
}
if (updates[i].gamma) {
if (surface->public.gamma_correction != NULL)
dc_gamma_release(surface->public.
gamma_correction);
dc_gamma_retain(updates[i].gamma);
surface->public.gamma_correction =
updates[i].gamma;
}
}
}

3
drivers/gpu/drm/amd/display/dc/core/dc_surface.c
View File

@@ -64,7 +64,8 @@ static bool construct(struct dc_context *ctx, struct surface *surface)
static void destruct(struct surface *surface)
{
if (surface->protected.public.gamma_correction != NULL)
dc_gamma_release(surface->protected.public.gamma_correction);
}
/*******************************************************************************

1
drivers/gpu/drm/amd/display/dc/dc.h
View File

@@ -312,6 +312,7 @@ const struct dc_surface_status *dc_surface_get_status(
void dc_surface_retain(const struct dc_surface *dc_surface);
void dc_surface_release(const struct dc_surface *dc_surface);
void dc_gamma_retain(const struct dc_gamma *dc_gamma);
void dc_gamma_release(const struct dc_gamma *dc_gamma);
struct dc_gamma *dc_create_gamma(void);