Commit 3a3c5ab3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-06-04-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Two big regression reverts in here, one for fbdev and one i915.
  Otherwise it's mostly amdgpu display fixes, and tegra fixes.

  fb:
   - revert broken fb_defio patch

  amdgpu:
   - Display fixes
   - FRU EEPROM error handling fix
   - RAS fix
   - PSP fix
   - Releasing pinned BO fix

  i915:
   - Revert conversion to io_mapping_map_user() which lead to BUG_ON()
   - Fix check for error valued returns in a selftest

  tegra:
   - SOR power domain race condition fix
   - build warning fix
   - runtime pm ref leak fix
   - modifier fix"

* tag 'drm-fixes-2021-06-04-1' of git://anongit.freedesktop.org/drm/drm:
  amd/display: convert DRM_DEBUG_ATOMIC to drm_dbg_atomic
  drm/amdgpu: make sure we unpin the UVD BO
  drm/amd/amdgpu:save psp ring wptr to avoid attack
  drm/amd/display: Fix potential memory leak in DMUB hw_init
  drm/amdgpu: Don't query CE and UE errors
  drm/amd/display: Fix overlay validation by considering cursors
  drm/amdgpu: refine amdgpu_fru_get_product_info
  drm/amdgpu: add judgement for dc support
  drm/amd/display: Fix GPU scaling regression by FS video support
  drm/amd/display: Allow bandwidth validation for 0 streams.
  Revert "i915: use io_mapping_map_user"
  drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest()
  Revert "fb_defio: Remove custom address_space_operations"
  drm/tegra: Correct DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT
  drm/tegra: sor: Fix AUX device reference leak
  drm/tegra: Get ref for DP AUX channel, not its ddc adapter
  drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update
  drm/tegra: sor: Fully initialize SOR before registration
  gpu: host1x: Split up client initalization and registration
  drm/tegra: sor: Do not leak runtime PM reference
parents f88cd3fb 37e2f2e8

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

+0 −16
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ static int amdgpu_ctx_query2(struct amdgpu_device *adev, 
{

	struct amdgpu_ctx *ctx;

	struct amdgpu_ctx_mgr *mgr;

	unsigned long ras_counter;



	if (!fpriv)

		return -EINVAL;
@@ -362,21 +361,6 @@ static int amdgpu_ctx_query2(struct amdgpu_device *adev, 
	if (atomic_read(&ctx->guilty))

		out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_GUILTY;



	/*query ue count*/

	ras_counter = amdgpu_ras_query_error_count(adev, false);

	/*ras counter is monotonic increasing*/

	if (ras_counter != ctx->ras_counter_ue) {

		out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RAS_UE;

		ctx->ras_counter_ue = ras_counter;

	}



	/*query ce count*/

	ras_counter = amdgpu_ras_query_error_count(adev, true);

	if (ras_counter != ctx->ras_counter_ce) {

		out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RAS_CE;

		ctx->ras_counter_ce = ras_counter;

	}



	mutex_unlock(&mgr->lock);

	return 0;

}

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

+3 −1
Original line number Diff line number Diff line
@@ -3118,7 +3118,9 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) 
 */

bool amdgpu_device_has_dc_support(struct amdgpu_device *adev)

{

	if (amdgpu_sriov_vf(adev) || adev->enable_virtual_display)

	if (amdgpu_sriov_vf(adev) || 

	    adev->enable_virtual_display ||

	    (adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK))

		return false;



	return amdgpu_device_asic_has_dc_support(adev->asic_type);

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

+23 −19
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr, 
int amdgpu_fru_get_product_info(struct amdgpu_device *adev)

{

	unsigned char buff[34];

	int addrptr = 0, size = 0;

	int addrptr, size;

	int len;



	if (!is_fru_eeprom_supported(adev))

		return 0;
@@ -109,7 +110,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	/* If algo exists, it means that the i2c_adapter's initialized */

	if (!adev->pm.smu_i2c.algo) {

		DRM_WARN("Cannot access FRU, EEPROM accessor not initialized");

		return 0;

		return -ENODEV;

	}



	/* There's a lot of repetition here. This is due to the FRU having
@@ -128,7 +129,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	size = amdgpu_fru_read_eeprom(adev, addrptr, buff);

	if (size < 1) {

		DRM_ERROR("Failed to read FRU Manufacturer, ret:%d", size);

		return size;

		return -EINVAL;

	}



	/* Increment the addrptr by the size of the field, and 1 due to the
@@ -138,43 +139,45 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	size = amdgpu_fru_read_eeprom(adev, addrptr, buff);

	if (size < 1) {

		DRM_ERROR("Failed to read FRU product name, ret:%d", size);

		return size;

		return -EINVAL;

	}



	len = size;

	/* Product name should only be 32 characters. Any more,

	 * and something could be wrong. Cap it at 32 to be safe

	 */

	if (size > 32) {

	if (len >= sizeof(adev->product_name)) {

		DRM_WARN("FRU Product Number is larger than 32 characters. This is likely a mistake");

		size = 32;

		len = sizeof(adev->product_name) - 1;

	}

	/* Start at 2 due to buff using fields 0 and 1 for the address */

	memcpy(adev->product_name, &buff[2], size);

	adev->product_name[size] = '\0';

	memcpy(adev->product_name, &buff[2], len);

	adev->product_name[len] = '\0';



	addrptr += size + 1;

	size = amdgpu_fru_read_eeprom(adev, addrptr, buff);

	if (size < 1) {

		DRM_ERROR("Failed to read FRU product number, ret:%d", size);

		return size;

		return -EINVAL;

	}



	len = size;

	/* Product number should only be 16 characters. Any more,

	 * and something could be wrong. Cap it at 16 to be safe

	 */

	if (size > 16) {

	if (len >= sizeof(adev->product_number)) {

		DRM_WARN("FRU Product Number is larger than 16 characters. This is likely a mistake");

		size = 16;

		len = sizeof(adev->product_number) - 1;

	}

	memcpy(adev->product_number, &buff[2], size);

	adev->product_number[size] = '\0';

	memcpy(adev->product_number, &buff[2], len);

	adev->product_number[len] = '\0';



	addrptr += size + 1;

	size = amdgpu_fru_read_eeprom(adev, addrptr, buff);



	if (size < 1) {

		DRM_ERROR("Failed to read FRU product version, ret:%d", size);

		return size;

		return -EINVAL;

	}



	addrptr += size + 1;
@@ -182,18 +185,19 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 


	if (size < 1) {

		DRM_ERROR("Failed to read FRU serial number, ret:%d", size);

		return size;

		return -EINVAL;

	}



	len = size;

	/* Serial number should only be 16 characters. Any more,

	 * and something could be wrong. Cap it at 16 to be safe

	 */

	if (size > 16) {

	if (len >= sizeof(adev->serial)) {

		DRM_WARN("FRU Serial Number is larger than 16 characters. This is likely a mistake");

		size = 16;

		len = sizeof(adev->serial) - 1;

	}

	memcpy(adev->serial, &buff[2], size);

	adev->serial[size] = '\0';

	memcpy(adev->serial, &buff[2], len);

	adev->serial[len] = '\0';



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct psp_ring 
	uint64_t			ring_mem_mc_addr;

	void				*ring_mem_handle;

	uint32_t			ring_size;

	uint32_t			ring_wptr;

};



/* More registers may will be supported */

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

+2 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static uint32_t psp_v11_0_ring_get_wptr(struct psp_context *psp) 
	struct amdgpu_device *adev = psp->adev;



	if (amdgpu_sriov_vf(adev))

		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);

		data = psp->km_ring.ring_wptr;

	else

		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
@@ -734,6 +734,7 @@ static void psp_v11_0_ring_set_wptr(struct psp_context *psp, uint32_t value) 
	if (amdgpu_sriov_vf(adev)) {

		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);

		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);

		psp->km_ring.ring_wptr = value;

	} else

		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value);

}