Commit b7e00d6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-09-10' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "From a train in the Irish countryside, regular drm fixes for 6.0-rc5.

  This is mostly amdgpu/amdkfd and i915 fixes, then one panfrost, one
  ttm and one edid fix. Nothing too major going on. Hopefully a quiet
  week next week for LPC.

  edid:
   - Fix EDID 1.4 range-descriptor parsing

  ttm:
   - Fix ghost-object bulk moves

  i915:
   - Fix MIPI sequence block copy from BIOS' table
   - Fix PCODE min freq setup when GuC's SLPC is in use
   - Implement Workaround for eDP
   - Fix has_flat_ccs selection for DG1

  amdgpu:
   - Firmware header fix
   - SMU 13.x fix
   - Debugfs memory leak fix
   - NBIO 7.7 fix
   - Firmware memory leak fix

  amdkfd:
   - Debug output fix

  panfrost:
   - Fix devfreq OPP"

* tag 'drm-fixes-2022-09-10' of git://anongit.freedesktop.org/drm/drm:
  drm/panfrost: devfreq: set opp to the recommended one to configure regulator
  drm/ttm: cleanup the resource of ghost objects after locking them
  drm/amdgpu: prevent toc firmware memory leak
  drm/amdgpu: correct doorbell range/size value for CSDMA_DOORBELL_RANGE
  drm/amdkfd: print address in hex format rather than decimal
  drm/amd/display: fix memory leak when using debugfs_lookup()
  drm/amd/pm: add missing SetMGpuFanBoostLimitRpm mapping for SMU 13.0.7
  drm/amd/amdgpu: add rlc_firmware_header_v2_4 to amdgpu_firmware_header
  drm/i915: consider HAS_FLAT_CCS() in needs_ccs_pages
  drm/i915: Implement WaEdpLinkRateDataReload
  drm/i915/slpc: Let's fix the PCODE min freq table setup for SLPC
  drm/i915/bios: Copy the whole MIPI sequence block
  drm/ttm: update bulk move object of ghost BO
  drm/edid: Handle EDID 1.4 range descriptor h/vfreq offsets
parents e35ff25f 2edb79a5

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

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	add_kgd_mem_to_kfd_bo_list(*mem, avm->process_info, user_addr);



	if (user_addr) {

		pr_debug("creating userptr BO for user_addr = %llu\n", user_addr);

		pr_debug("creating userptr BO for user_addr = %llx\n", user_addr);

		ret = init_user_pages(*mem, user_addr, criu_resume);

		if (ret)

			goto allocate_init_user_pages_failed;

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

+5 −2
Original line number Diff line number Diff line
@@ -486,11 +486,14 @@ static int psp_sw_fini(void *handle) 
		release_firmware(psp->ta_fw);

		psp->ta_fw = NULL;

	}

	if (adev->psp.cap_fw) {

	if (psp->cap_fw) {

		release_firmware(psp->cap_fw);

		psp->cap_fw = NULL;

	}



	if (psp->toc_fw) {

		release_firmware(psp->toc_fw);

		psp->toc_fw = NULL;

	}

	if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) ||

	    adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7))

		psp_sysfs_fini(adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ union amdgpu_firmware_header { 
	struct rlc_firmware_header_v2_1 rlc_v2_1;

	struct rlc_firmware_header_v2_2 rlc_v2_2;

	struct rlc_firmware_header_v2_3 rlc_v2_3;

	struct rlc_firmware_header_v2_4 rlc_v2_4;

	struct sdma_firmware_header_v1_0 sdma;

	struct sdma_firmware_header_v1_1 sdma_v1_1;

	struct sdma_firmware_header_v2_0 sdma_v2_0;

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

+0 −6
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ static void nbio_v7_7_sdma_doorbell_range(struct amdgpu_device *adev, int instan 
		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_CSDMA_DOORBELL_RANGE,

					       SIZE, doorbell_size);

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

					       OFFSET, doorbell_index);

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

					       SIZE, doorbell_size);

	} else {

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -3288,6 +3288,7 @@ void crtc_debugfs_init(struct drm_crtc *crtc) 
				   &crc_win_y_end_fops);

	debugfs_create_file_unsafe("crc_win_update", 0644, dir, crtc,

				   &crc_win_update_fops);

	dput(dir);

#endif

	debugfs_create_file("amdgpu_current_bpc", 0644, crtc->debugfs_entry,

			    crtc, &amdgpu_current_bpc_fops);