aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>2017-06-28 11:03:11 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 18:08:16 -0400
commitcf5a4c11a1561db5c31a2783611aa6d5dbb67225 (patch)
tree74fa1f4110650f644f11d175f75feaa35a9ba083
parent2782488ae6c0b53d57435aa6dc358e61550393d2 (diff)
drm/amd/display: Move dm_plane_state definition to DAL header.
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h8
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h6
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 2d34f9bb5d47..2bb2fc2a6566 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -442,14 +442,6 @@ struct amdgpu_crtc {
442 struct drm_pending_vblank_event *event; 442 struct drm_pending_vblank_event *event;
443}; 443};
444 444
445/* TODO rename to dc_plane_state */
446struct dc_surface;
447
448struct dm_plane_state {
449 struct drm_plane_state base;
450 struct dc_surface* dc_surface;
451};
452
453struct amdgpu_plane { 445struct amdgpu_plane {
454 struct drm_plane base; 446 struct drm_plane base;
455 enum drm_plane_type plane_type; 447 enum drm_plane_type plane_type;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
index b69c86826b1a..6411dd1819dd 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
@@ -33,6 +33,12 @@ struct amdgpu_display_manager;
33struct dc_validation_set; 33struct dc_validation_set;
34struct dc_surface; 34struct dc_surface;
35 35
36struct dm_plane_state {
37 struct drm_plane_state base;
38 struct dc_surface *dc_surface;
39};
40
41
36/*TODO Jodan Hersen use the one in amdgpu_dm*/ 42/*TODO Jodan Hersen use the one in amdgpu_dm*/
37int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, 43int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
38 struct amdgpu_plane *aplane, 44 struct amdgpu_plane *aplane,