From 0604b36c77e31a05b1bd18d53cac2c9350500bcb Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Thu, 22 Jun 2017 17:37:22 -0400 Subject: drm/amd/display: Create dm_plane_state. Hook up dc_surface creation/destruction to dm_plane_state. Rename amdgpu_drm_plane_state to dm_plane_state and do minor cleanups. Signed-off-by: Andrey Grodzovsky Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/drm/amd/amdgpu') diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index be51ac56552c..190905e08c38 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h @@ -59,6 +59,8 @@ struct amdgpu_hpd; #define to_amdgpu_framebuffer(x) container_of(x, struct amdgpu_framebuffer, base) #define to_amdgpu_plane(x) container_of(x, struct amdgpu_plane, base) +#define to_dm_plane_state(x) container_of(x, struct dm_plane_state, base); + #define AMDGPU_MAX_HPD_PINS 6 #define AMDGPU_MAX_CRTCS 6 #define AMDGPU_MAX_PLANES 6 @@ -440,16 +442,18 @@ struct amdgpu_crtc { struct drm_pending_vblank_event *event; }; -struct amdgpu_drm_plane_state { +/* TODO rename to dc_plane_state */ +struct dc_surface; + +struct dm_plane_state { struct drm_plane_state base; - unsigned int h_ratio; - unsigned int v_ratio; + struct dc_surface* dc_surface; }; -static inline struct amdgpu_drm_plane_state * +static inline struct dm_plane_state * to_amdgpu_plane_state(struct drm_plane_state *state) { - return container_of(state, struct amdgpu_drm_plane_state, base); + return container_of(state, struct dm_plane_state, base); } struct amdgpu_plane { -- cgit v1.2.3