drm/amd/display: Rename pitch_alignment to linear_pitch_alignment

Also initialize this to 64 for all ASICs.

Signed-off-by: Andrew Jiang <Andrew.Jiang@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 03d8cea7400ae9ba9531c6a466ac171f3e22a034..369a5e7af47e8e5169c0a99b3f0580aa698a3b99 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -702,6 +702,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)
 
        dc->caps.max_links = dc->link_count;
        dc->caps.max_audios = dc->res_pool->audio_count;
+       dc->caps.linear_pitch_alignment = 64;
 
        dc->config = init_params->flags;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index f6d431a942a19bfe711bf03994c96c7550fbba20..fb45e1170f42ba4548bf00d32eb2dca5a142715c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -58,7 +58,7 @@ struct dc_caps {
        uint32_t i2c_speed_in_khz;
        unsigned int max_cursor_size;
        unsigned int max_video_width;
-       int pitch_alignment;
+       int linear_pitch_alignment;
        bool dcc_const_color;
        bool dynamic_audio;
        bool is_apu;

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 209499e5f53b16477fdafd2ac64cb681b81ebd5a..9ea1002230202100227be50e0daf0d55ff688d23 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1270,7 +1270,6 @@ static bool construct(
        dc->caps.max_downscale_ratio = 200;
        dc->caps.i2c_speed_in_khz = 100;
        dc->caps.max_cursor_size = 256;
-       dc->caps.pitch_alignment = 64; /* Alignment is 64 on DCN1 */
        dc->caps.max_slave_planes = 1;
        dc->caps.is_apu = true;