Commit 6305d15e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-01-29' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Weekly fixes for graphics, nothing too major, nouveau has a few
  regression fixes for various fallout from header changes previously,
  vc4 has two fixes, two amdgpu, and a smattering of i915 fixes.

  All seems on course for a quieter rc7, fingers crossed.

  nouveau:
   - fix svm init conditions
   - fix nv50 modesetting regression
   - fix cursor plane modifiers
   - fix > 64x64 cursor regression

  vc4:
   - Fix LBM size calculation
   - Fix high resolutions for hvs5

  i915:
   - Fix ICL MG PHY vswing
   - Fix subplatform handling
   - Fix selftest memleak
   - Clear CACHE_MODE prior to clearing residuals
   - Always flush the active worker before returning from the wait
   - Always try to reserve GGTT address 0x0

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

* tag 'drm-fixes-2021-01-29' of git://anongit.freedesktop.org/drm/drm:
  drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors
  drm/nouveau/kms/nv50-: Report max cursor size to userspace
  drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes
  drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices
  drm/nouveau/dispnv50: Restore pushing of all data.
  amdgpu: fix clang build warning
  Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"
  drm/i915/gt: Always try to reserve GGTT address 0x0
  drm/i915: Always flush the active worker before returning from the wait
  drm/i915/selftest: Fix potential memory leak
  drm/i915: Check for all subplatform bits
  drm/i915: Fix ICL MG PHY vswing handling
  drm/i915/gt: Clear CACHE_MODE prior to clearing residuals
  drm/vc4: Correct POS1_SCL for hvs5
  drm/vc4: Correct lbm size and calculation
  drm/nouveau/nvif: fix method count when pushing an array
parents a9cbbb80 e0ecafed

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);