OSDN Git Service

drm/amd/display: pass compat_level to hubp
authorCharlene Liu <charlene.liu@amd.com>
Mon, 16 Jul 2018 18:05:11 +0000 (14:05 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Aug 2018 16:09:48 +0000 (11:09 -0500)
Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h

index 2138cd3..fa1bacd 100644 (file)
@@ -485,7 +485,8 @@ void hubp1_program_surface_config(
        union plane_size *plane_size,
        enum dc_rotation_angle rotation,
        struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror)
+       bool horizontal_mirror,
+       unsigned int compat_level)
 {
        hubp1_dcc_control(hubp, dcc->enable, dcc->grph.independent_64b_blks);
        hubp1_program_tiling(hubp, tiling_info, format);
index f689fea..48c1907 100644 (file)
@@ -664,7 +664,8 @@ void hubp1_program_surface_config(
        union plane_size *plane_size,
        enum dc_rotation_angle rotation,
        struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror);
+       bool horizontal_mirror,
+       unsigned int compat_level);
 
 void hubp1_program_deadline(
                struct hubp *hubp,
index cfcc54f..41f6595 100644 (file)
@@ -2004,6 +2004,7 @@ static void update_dchubp_dpp(
        struct dpp *dpp = pipe_ctx->plane_res.dpp;
        struct dc_plane_state *plane_state = pipe_ctx->plane_state;
        union plane_size size = plane_state->plane_size;
+       unsigned int compat_level = 0;
 
        /* depends on DML calculation, DPP clock value may change dynamically */
        /* If request max dpp clk is lower than current dispclk, no need to
@@ -2095,7 +2096,8 @@ static void update_dchubp_dpp(
                        &size,
                        plane_state->rotation,
                        &plane_state->dcc,
-                       plane_state->horizontal_mirror);
+                       plane_state->horizontal_mirror,
+                       compat_level);
        }
 
        hubp->power_gated = false;
index 4f3f9e6..334c48c 100644 (file)
@@ -96,7 +96,8 @@ struct hubp_funcs {
                union plane_size *plane_size,
                enum dc_rotation_angle rotation,
                struct dc_plane_dcc_param *dcc,
-               bool horizontal_mirror);
+               bool horizontal_mirror,
+               unsigned int compa_level);
 
        bool (*hubp_is_flip_pending)(struct hubp *hubp);