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>

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 78b8e0c..959c3f3 100644 (file)
--- 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 a17e7bc..5c1b2f8 100644 (file)
--- 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;
 };