Commit 18f0817d authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

drm/amd/display: Initial support for SmartMux 



SmartMux is a mechanism to switch the GPU being used for scanout in a
hybrid configuration. This is used for devices with an eDP and two GPUs.
This is only valid when the system has a physical switch (Multiplexer)
in the board to switch between the two GPUs.

When a graphically intensive workload like a game is being run, the
system can be switch the active display to the dGPU, so that we can
avoid copying the buffer from dGPU to APU for scanout. This helps with
latency and FPS. When power consumption is preferred, the system can be
switched to the APU.

Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarIvan Lipski <ivan.lipski@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fa699acb

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN21) 
###############################################################################

# DCN30

###############################################################################

CLK_MGR_DCN30 = dcn30_clk_mgr.o dcn30_clk_mgr_smu_msg.o

CLK_MGR_DCN30 = dcn30_clk_mgr.o dcn30_clk_mgr_smu_msg.o dcn30m_clk_mgr.o dcn30m_clk_mgr_smu_msg.o



AMD_DAL_CLK_MGR_DCN30 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn30/,$(CLK_MGR_DCN30))

drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int clk_mgr_helper_get_active_display_cnt( 
		if (dc_state_get_stream_subvp_type(context, stream) == SUBVP_PHANTOM)

			continue;



		if (!stream->dpms_off || (stream_status && stream_status->plane_count))

		if (!stream->dpms_off || dc->is_switch_in_progress_dest || (stream_status && stream_status->plane_count))

			display_count++;

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define DALSMC_MSG_SetDisplayRefreshFromMall      0xF

#define DALSMC_MSG_SetExternalClientDfCstateAllow 0x10

#define DALSMC_MSG_BacoAudioD3PME                 0x11

#define DALSMC_Message_Count                      0x12

#define DALSMC_MSG_SmartAccess                    0x12

#define DALSMC_Message_Count                      0x13



#endif

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "dce100/dce_clk_mgr.h"

#include "dcn30/dcn30_clk_mgr.h"

#include "dml/dcn30/dcn30_fpu.h"

#include "dcn30/dcn30m_clk_mgr.h"

#include "reg_helper.h"

#include "core_types.h"

#include "dm_helpers.h"
@@ -498,7 +499,8 @@ static struct clk_mgr_funcs dcn3_funcs = { 
		.are_clock_states_equal = dcn3_are_clock_states_equal,

		.enable_pme_wa = dcn3_enable_pme_wa,

		.notify_link_rate_change = dcn30_notify_link_rate_change,

		.is_smu_present = dcn3_is_smu_present

		.is_smu_present = dcn3_is_smu_present,

		.set_smartmux_switch = dcn30m_set_smartmux_switch

};



static void dcn3_init_clocks_fpga(struct clk_mgr *clk_mgr)

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.c

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: AMD

 *

 */



#include "clk_mgr_internal.h"

#include "dcn30/dcn30m_clk_mgr.h"

#include "dcn30m_clk_mgr_smu_msg.h"





uint32_t dcn30m_set_smartmux_switch(struct clk_mgr *clk_mgr_base, uint32_t pins_to_set)

{

	struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base);



	return dcn30m_smu_set_smart_mux_switch(clk_mgr, pins_to_set);

}