diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-06-17 13:08:40 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-20 12:27:54 -0500 |
| commit | ecbc382c9fdf19b4e0e1ee4702923a39133b864e (patch) | |
| tree | 4820cb8242e3d094d0bdd824930933098a12f998 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | |
| parent | f94ec6f8b8857e5792328774fa47984f7d7df194 (diff) | |
Revert "drm/amd/display: Rework CRTC color management"
This reverts commit 7cd4b70091a5cfa1f58d3a529535304a116acc95.
Revert this to apply the version that includes DCN2 support.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 |
1 files changed, 4 insertions, 6 deletions
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 642defb5ea30..b0ce44422e90 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -271,9 +271,6 @@ struct dm_crtc_state { struct drm_crtc_state base; struct dc_stream_state *stream; - bool cm_has_degamma; - bool cm_is_degamma_srgb; - int active_planes; bool interrupts_enabled; @@ -363,9 +360,10 @@ void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc); #define MAX_COLOR_LEGACY_LUT_ENTRIES 256 void amdgpu_dm_init_color_mod(void); -int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state *crtc); -int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc, - struct dc_plane_state *dc_plane_state); +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); +int amdgpu_dm_set_regamma_lut(struct dm_crtc_state *crtc); extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs; |