summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>2017-01-17 11:18:55 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:10:57 -0400
commit031ec2764064d79b1e1d8c30a6785ed19184fb47 (patch)
tree996d45f8f3f321456463b519e5200524253dc72e
parentab7044d0d17a8226a8b51e235e16204e696ae42a (diff)
downloadlinux-stable-031ec2764064d79b1e1d8c30a6785ed19184fb47.tar.gz
linux-stable-031ec2764064d79b1e1d8c30a6785ed19184fb47.tar.bz2
linux-stable-031ec2764064d79b1e1d8c30a6785ed19184fb47.zip
drm/amd/display: Remove meta_pitch
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_debug.c8
-rw-r--r--drivers/gpu/drm/amd/display/dc/dc_hw_types.h4
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
index 78b8e0c5b4e7..959c3f372e73 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
@@ -94,14 +94,12 @@ void pre_surface_trace(
"surface->plane_size.grph.surface_size.y = %d;\n"
"surface->plane_size.grph.surface_size.width = %d;\n"
"surface->plane_size.grph.surface_size.height = %d;\n"
- "surface->plane_size.grph.surface_pitch = %d;\n"
- "surface->plane_size.grph.meta_pitch = %d;\n",
+ "surface->plane_size.grph.surface_pitch = %d;\n",
surface->plane_size.grph.surface_size.x,
surface->plane_size.grph.surface_size.y,
surface->plane_size.grph.surface_size.width,
surface->plane_size.grph.surface_size.height,
- surface->plane_size.grph.surface_pitch,
- surface->plane_size.grph.meta_pitch);
+ surface->plane_size.grph.surface_pitch);
SURFACE_TRACE(
@@ -176,7 +174,6 @@ void update_surface_trace(
SURFACE_TRACE(
"plane_info->color_space = %d;\n"
"plane_info->format = %d;\n"
- "plane_info->plane_size.grph.meta_pitch = %d;\n"
"plane_info->plane_size.grph.surface_pitch = %d;\n"
"plane_info->plane_size.grph.surface_size.height = %d;\n"
"plane_info->plane_size.grph.surface_size.width = %d;\n"
@@ -185,7 +182,6 @@ void update_surface_trace(
"plane_info->rotation = %d;\n",
update->plane_info->color_space,
update->plane_info->format,
- update->plane_info->plane_size.grph.meta_pitch,
update->plane_info->plane_size.grph.surface_pitch,
update->plane_info->plane_size.grph.surface_size.height,
update->plane_info->plane_size.grph.surface_size.width,
diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index a17e7bc96f9e..5c1b2f833fe2 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -123,8 +123,6 @@ union plane_size {
* is 32 pixel aligned.
*/
uint32_t surface_pitch;
-
- uint32_t meta_pitch;
} grph;
struct {
@@ -134,7 +132,6 @@ union plane_size {
* 32 pixel aligned.
*/
uint32_t luma_pitch;
- uint32_t meta_luma_pitch;
struct rect chroma_size;
/* Graphic surface pitch in pixels.
@@ -142,7 +139,6 @@ union plane_size {
* 32 pixel aligned.
*/
uint32_t chroma_pitch;
- uint32_t meta_chroma_pitch;
} video;
};