Both functions are the same

Change-Id: Ic5b3aca8aab8f06531cfbab8acb53ff9c235ffaf
Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Reviewed-by: Tony Cheng <tony.ch...@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 .../amd/display/dc/dce100/dce100_hw_sequencer.c    |  2 +-
 .../amd/display/dc/dce100/dce100_hw_sequencer.h    |  4 +++
 .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c  | 38 +---------------------
 3 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c 
b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c
index 469af0587604..41f83ecd7469 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c
@@ -69,7 +69,7 @@ static const struct dce100_hw_seq_reg_offsets reg_offsets[] = 
{
  
******************************************************************************/
 /***************************PIPE_CONTROL***********************************/
 
-static bool dce100_enable_display_power_gating(
+bool dce100_enable_display_power_gating(
        struct dc *dc,
        uint8_t controller_id,
        struct dc_bios *dcb,
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h 
b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h
index cb5384ef46c3..c6ec0ed6ec3d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h
@@ -38,5 +38,9 @@ void dce100_set_bandwidth(
                struct dc_state *context,
                bool decrease_allowed);
 
+bool dce100_enable_display_power_gating(struct dc *dc, uint8_t controller_id,
+                                       struct dc_bios *dcb,
+                                       enum pipe_gating_control power_gating);
+
 #endif /* __DC_HWSS_DCE100_H__ */
 
diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c 
b/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c
index ccfcf1c0eeb3..6c6a1a16af19 100644
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c
@@ -70,47 +70,11 @@ static const struct dce80_hw_seq_reg_offsets reg_offsets[] 
= {
 
 /***************************PIPE_CONTROL***********************************/
 
-static bool dce80_enable_display_power_gating(
-       struct dc *dc,
-       uint8_t controller_id,
-       struct dc_bios *dcb,
-       enum pipe_gating_control power_gating)
-{
-       enum bp_result bp_result = BP_RESULT_OK;
-       enum bp_pipe_control_action cntl;
-       struct dc_context *ctx = dc->ctx;
-
-       if (power_gating == PIPE_GATING_CONTROL_INIT)
-               cntl = ASIC_PIPE_INIT;
-       else if (power_gating == PIPE_GATING_CONTROL_ENABLE)
-               cntl = ASIC_PIPE_ENABLE;
-       else
-               cntl = ASIC_PIPE_DISABLE;
-
-       if (!(power_gating == PIPE_GATING_CONTROL_INIT && controller_id != 0)){
-
-               bp_result = dcb->funcs->enable_disp_power_gating(
-                                               dcb, controller_id + 1, cntl);
-
-               /* Revert MASTER_UPDATE_MODE to 0 because bios sets it 2
-                * by default when command table is called
-                */
-               dm_write_reg(ctx,
-                       HW_REG_CRTC(mmMASTER_UPDATE_MODE, controller_id),
-                       0);
-       }
-
-       if (bp_result == BP_RESULT_OK)
-               return true;
-       else
-               return false;
-}
-
 void dce80_hw_sequencer_construct(struct dc *dc)
 {
        dce110_hw_sequencer_construct(dc);
 
-       dc->hwss.enable_display_power_gating = 
dce80_enable_display_power_gating;
+       dc->hwss.enable_display_power_gating = 
dce100_enable_display_power_gating;
        dc->hwss.pipe_control_lock = dce_pipe_control_lock;
        dc->hwss.set_bandwidth = dce100_set_bandwidth;
 }
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to