Commit 2eb29d59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2023-03-03-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "fbdev:
   - fix uninit var in error path

  shmem:
   - revert unGPLing an export

  i915:
   - Don't use stolen memory or BAR mappings for ring buffers with LLC
   - Add inverted backlight quirk for HP 14-r206nv
   - Fix GSI offset for MCR lookups
   - GVT fixes (memleak, debugfs attributes, kconfig, typos)

  amdgpu:
   - SMU 13 fixes
   - Enable TMZ for GC 10.3.6
   - Misc display fixes
   - Buddy allocator fixes
   - GC 11 fixes
   - S0ix fix
   - INFO IOCTL queries for GC 11
   - VCN harvest fixes for SR-IOV
   - UMC 8.10 RAS fixes
   - Don't restrict bpc to 8
   - NBIO 7.5 fix
   - Allow freesync on PCon for more devices

  amdkfd:
   - SDMA fix
   - Illegal memory access fix"

* tag 'drm-next-2023-03-03-1' of git://anongit.freedesktop.org/drm/drm: (45 commits)
  drm/amdgpu/vcn: fix compilation issue with legacy gcc
  drm/amd/display: Extend Freesync over PCon support for more devices
  Revert "drm/amd/display: Do not set DRR on pipe commit"
  drm/amd/display: fix shift-out-of-bounds in CalculateVMAndRowBytes
  drm/amd/display: Ext displays with dock can't recognized after resume
  drm/amdgpu: fix ttm_bo calltrace warning in psp_hw_fini
  drm/amdgpu: remove unused variable ring
  drm/amd/display: fix dm irq error message in gpu recover
  drm/amd: Fix initialization for nbio 7.5.1
  drm/amd/display: Don't restrict bpc to 8 bpc
  drm/amdgpu: Make umc_v8_10_convert_error_address static and remove unused variable
  drm/radeon: Fix eDP for single-display iMac11,2
  drm/shmem-helper: Revert accidental non-GPL export
  drm: omapdrm: Do not use helper unininitialized in omap_fbdev_init()
  drm/amd/pm: downgrade log level upon SMU IF version mismatch
  drm/amdgpu: Add ecc info query interface for umc v8_10
  drm/amdgpu: Add convert_error_address function for umc v8_10
  drm/amdgpu: add bad_page_threshold check in ras_eeprom_check_err
  drm/amdgpu: change default behavior of bad_page_threshold parameter
  drm/amdgpu: exclude duplicate pages from UMC RAS UE count
  ...
parents 39ce4395 54ceb927

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config DRM_AMDGPU 
	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,9 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) 
	    (pm_suspend_target_state != PM_SUSPEND_TO_IDLE))

		return false;



	if (adev->asic_type < CHIP_RAVEN)

		return false;



	/*

	 * If ACPI_FADT_LOW_POWER_S0 is not set in the FADT, it is generally

	 * risky to do any special firmware-related preparations for entering

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+11 −3
Original line number Diff line number Diff line
@@ -107,9 +107,12 @@ 
 * - 3.50.0 - Update AMDGPU_INFO_DEV_INFO IOCTL for minimum engine and memory clock

 *            Update AMDGPU_INFO_SENSOR IOCTL for PEAK_PSTATE engine and memory clock

 *   3.51.0 - Return the PCIe gen and lanes from the INFO ioctl

 *   3.52.0 - Add AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD, add device_info fields:

 *            tcp_cache_size, num_sqc_per_wgp, sqc_data_cache_size, sqc_inst_cache_size,

 *            gl1c_cache_size, gl2c_cache_size, mall_size, enabled_rb_pipes_mask_hi

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	51

#define KMS_DRIVER_MINOR	52

#define KMS_DRIVER_PATCHLEVEL	0



unsigned int amdgpu_vram_limit = UINT_MAX;
@@ -921,7 +924,7 @@ module_param_named(reset_method, amdgpu_reset_method, int, 0444); 
 * result in the GPU entering bad status when the number of total

 * faulty pages by ECC exceeds the threshold value.

 */

MODULE_PARM_DESC(bad_page_threshold, "Bad page threshold(-1 = auto(default value), 0 = disable bad page retirement, -2 = ignore bad page threshold)");

MODULE_PARM_DESC(bad_page_threshold, "Bad page threshold(-1 = ignore threshold (default value), 0 = disable bad page retirement, -2 = driver sets threshold)");

module_param_named(bad_page_threshold, amdgpu_bad_page_threshold, int, 0444);



MODULE_PARM_DESC(num_kcq, "number of kernel compute queue user want to setup (8 if set to greater than 8 or less than 0, only affect gfx 8+)");
@@ -2414,8 +2417,10 @@ static int amdgpu_pmops_suspend(struct device *dev) 


	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else

	else if (amdgpu_acpi_is_s3_active(adev))

		adev->in_s3 = true;

	if (!adev->in_s0ix && !adev->in_s3)

		return 0;

	return amdgpu_device_suspend(drm_dev, true);

}
@@ -2436,6 +2441,9 @@ static int amdgpu_pmops_resume(struct device *dev) 
	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	if (!adev->in_s0ix && !adev->in_s3)

		return 0;



	/* Avoids registers access if device is physically gone */

	if (!pci_device_is_present(adev->pdev))

		adev->no_hw_access = true;

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ struct amdgpu_gfx_config { 
	uint32_t num_sc_per_sh;

	uint32_t num_packer_per_sc;

	uint32_t pa_sc_tile_steering_override;

	/* Whether texture coordinate truncation is conformant. */

	bool ta_cntl2_truncate_coord_mode;

	uint64_t tcc_disabled_mask;

	uint32_t gc_num_tcp_per_sa;

	uint32_t gc_num_sdp_interface;

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev) 
	case IP_VERSION(10, 3, 2):

	case IP_VERSION(10, 3, 4):

	case IP_VERSION(10, 3, 5):

	case IP_VERSION(10, 3, 6):

	/* VANGOGH */

	case IP_VERSION(10, 3, 1):

	/* YELLOW_CARP*/