Commit e0ecafed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.11-2021-01-28' of... 

Merge tag 'amd-drm-fixes-5.11-2021-01-28' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.11-2021-01-28:

amdgpu:
- Fix a fan control regression on some boards
- Fix clang warning

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210128191558.3821-1-alexander.deucher@amd.com
parents 9a1054c3 00190bc0

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

+4 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ DCN30 = dcn30_init.o dcn30_hubbub.o dcn30_hubp.o dcn30_dpp.o dcn30_optc.o \ 




ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -mhard-float -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -mhard-float -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -msse

endif



ifdef CONFIG_PPC64
@@ -45,6 +45,8 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -mhard-float

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -mhard-float

endif



ifdef CONFIG_X86

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

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ DCN301 = dcn301_init.o dcn301_resource.o dcn301_dccg.o \ 
		dcn301_dio_link_encoder.o dcn301_hwseq.o dcn301_panel_cntl.o dcn301_hubbub.o



ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o := -mhard-float -msse

CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o := -msse

endif



ifdef CONFIG_PPC64
@@ -25,6 +25,7 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn301/dcn301_resource.o += -mhard-float

endif



ifdef CONFIG_X86

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

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
DCN3_02 = dcn302_init.o dcn302_hwseq.o dcn302_resource.o



ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -msse

CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -msse

endif



ifdef CONFIG_PPC64
@@ -24,6 +24,7 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o += -mhard-float

endif



ifdef CONFIG_X86

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ struct pptable_funcs { 
					     *clock_req);

	uint32_t (*get_fan_control_mode)(struct smu_context *smu);

	int (*set_fan_control_mode)(struct smu_context *smu, uint32_t mode);

	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);

	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);

	int (*set_xgmi_pstate)(struct smu_context *smu, uint32_t pstate);

	int (*gfx_off_control)(struct smu_context *smu, bool enable);

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ int 
smu_v11_0_set_fan_control_mode(struct smu_context *smu,

			       uint32_t mode);



int

smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed);



int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,

				       uint32_t speed);