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

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

Pull drm fixes from Dave Airlie:
 "Was relatively quiet this week, but still a few pulls came in, pretty
  much small fixes across the board, a couple of regression fixes in the
  amdgpu/radeon code, msm has a few minor fixes across the board, a
  panel regression fix also.

  amdgpu:
   - DCN3 fix
   - Fix CAC setting regression for TOPAZ
   - Fix ttm regression

  radeon:
   - Fix ttm regression

  msm:
   - a5xx/a6xx timestamp fix
   - microcode version check
   - fail path fix
   - block programming fix
   - error removal fix

  i915:
   - Fix invalid access to ACPI _DSM objects

  xen:
   - Fix use-after-free in xen
   - minor duplicate defintion cleanup

  vc4:
   - Reduce fifo threshold on hvs4 to fix a fifo full error
   - minor redunantant assignment cleanup

  panel:
   - Disable TE support for Droid4 and N950"

* tag 'drm-fixes-2021-04-10' of git://anongit.freedesktop.org/drm/drm:
  drm/vc4: crtc: Reduce PV fifo threshold on hvs4
  drm/vc4: plane: Remove redundant assignment
  drm/amdgpu/smu7: fix CAC setting on TOPAZ
  drm/radeon: Fix size overflow
  drm/amdgpu: Fix size overflow
  drm/i915: Fix invalid access to ACPI _DSM objects
  drm/amd/display: Add missing mask for DCN3
  drm/panel: panel-dsi-cm: disable TE for now
  drm/msm/disp/dpu1: program 3d_merge only if block is attached
  drm/msm: a6xx: fix version check for the A650 SQE microcode
  drm/msm: Fix a5xx/a6xx timestamps
  drm/msm: Fix removal of valid error case when checking speed_bin
  drm/msm: Set drvdata to NULL when msm_drm_init() fails
  drivers: gpu: drm: xen_drm_front_drm_info is declared twice
  gpu/xen: Fix a use after free in xen_drm_drv_init
parents 60144b23 bd119f47

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

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, 


	/* Allocate an SG array and squash pages into it */

	r = sg_alloc_table_from_pages(ttm->sg, ttm->pages, ttm->num_pages, 0,

				      ttm->num_pages << PAGE_SHIFT,

				      (u64)ttm->num_pages << PAGE_SHIFT,

				      GFP_KERNEL);

	if (r)

		goto release_sg;

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_EN, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, SECONDARY_SURFACE_DCC_IND_BLK_C, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SURFACE_FLIP_INTERRUPT, SURFACE_FLIP_INT_MASK, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CB_B, mask_sh),\

	HUBP_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CR_R, mask_sh),\

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,8 @@ static int smu7_enable_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) 
		    (hwmgr->chip_id == CHIP_POLARIS10) ||

		    (hwmgr->chip_id == CHIP_POLARIS11) ||

		    (hwmgr->chip_id == CHIP_POLARIS12) ||

		    (hwmgr->chip_id == CHIP_TONGA))

		    (hwmgr->chip_id == CHIP_TONGA) ||

		    (hwmgr->chip_id == CHIP_TOPAZ))

			PHM_WRITE_FIELD(hwmgr->device, MC_SEQ_CNTL_3, CAC_EN, 0x1);

drivers/gpu/drm/i915/display/intel_acpi.c

+20 −2
Original line number Diff line number Diff line
@@ -84,13 +84,31 @@ static void intel_dsm_platform_mux_info(acpi_handle dhandle) 
		return;

	}



	if (!pkg->package.count) {

		DRM_DEBUG_DRIVER("no connection in _DSM\n");

		return;

	}



	connector_count = &pkg->package.elements[0];

	DRM_DEBUG_DRIVER("MUX info connectors: %lld\n",

		  (unsigned long long)connector_count->integer.value);

	for (i = 1; i < pkg->package.count; i++) {

		union acpi_object *obj = &pkg->package.elements[i];

		union acpi_object *connector_id = &obj->package.elements[0];

		union acpi_object *info = &obj->package.elements[1];

		union acpi_object *connector_id;

		union acpi_object *info;



		if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < 2) {

			DRM_DEBUG_DRIVER("Invalid object for MUX #%d\n", i);

			continue;

		}



		connector_id = &obj->package.elements[0];

		info = &obj->package.elements[1];

		if (info->type != ACPI_TYPE_BUFFER || info->buffer.length < 4) {

			DRM_DEBUG_DRIVER("Invalid info for MUX obj #%d\n", i);

			continue;

		}



		DRM_DEBUG_DRIVER("Connector id: 0x%016llx\n",

			  (unsigned long long)connector_id->integer.value);

		DRM_DEBUG_DRIVER("  port id: %s\n",

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1386,8 +1386,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu) 


static int a5xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)

{

	*value = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_CP_0_LO,

		REG_A5XX_RBBM_PERFCTR_CP_0_HI);

	*value = gpu_read64(gpu, REG_A5XX_RBBM_ALWAYSON_COUNTER_LO,

		REG_A5XX_RBBM_ALWAYSON_COUNTER_HI);



	return 0;

}