Commit 42f82040 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-07-10' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "I've been off most of the week, but some fixes have piled up. Seems a
  bit busier than last week, but they are pretty spread out across a
  bunch of drivers, none of them seem that big or worried me too much.

  amdgpu:
   - Fix a suspend/resume issue with PSP
   - Backlight fix for Renoir
   - Fix for gpu recovery debugging

  radeon:
   - Fix a double free in error path

  i915:
   - fbc fencing fix
   - debugfs panic fix
   - gem vma constuction fix
   - gem pin under vm->nutex fix

  nouveau:
   - SVM fixes
   - display fixes

  meson:
   - OSD burst length fixes

  hibmc:
   - runtime warning fix

  mediatek:
   - cmdq, mmsys fixes
   - visibility check fixes"

* tag 'drm-fixes-2020-07-10' of git://anongit.freedesktop.org/drm/drm: (24 commits)
  drm/amdgpu: don't do soft recovery if gpu_recovery=0
  drm/radeon: fix double free
  drm/amd/display: add dmcub check on RENOIR
  drm/amdgpu: add TMR destory function for psp
  drm/amdgpu: asd function needs to be unloaded in suspend phase
  drm/hisilicon/hibmc: Move drm_fbdev_generic_setup() down to avoid the splat
  drm/nouveau/nouveau: fix page fault on device private memory
  drm/nouveau/svm: fix migrate page regression
  drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
  drm/nouveau/kms/nv50-: bail from nv50_audio_disable() early if audio not enabled
  drm/i915/gt: Pin the rings before marking active
  drm/i915: Also drop vm.ref along error paths for vma construction
  drm/i915: Drop vm.ref for duplicate vma on construction
  drm/i915/fbc: Fix fence_y_offset handling
  drm/i915: Skip stale object handle for debugfs per-file-stats
  drm/mediatek: mtk_hdmi: Remove debug messages for function calls
  drm/mediatek: mtk_mt8173_hdmi_phy: Remove unnused const variables
  drm/mediatek: Delete not used of_device_get_match_data
  drm/mediatek: Remove unnecessary conversion to bool
  drm/meson: viu: fix setting the OSD burst length in VIU_OSD1_FIFO_CTRL_STAT
  ...
parents d4e60453 38794a54

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

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) 


	memset(&ti, 0, sizeof(struct amdgpu_task_info));



	if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {

	if (amdgpu_gpu_recovery &&

	    amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {

		DRM_ERROR("ring %s timeout, but soft recovered\n",

			  s_job->sched->name);

		return;

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

+59 −4
Original line number Diff line number Diff line
@@ -372,6 +372,52 @@ static int psp_tmr_load(struct psp_context *psp) 
	return ret;

}



static void psp_prep_tmr_unload_cmd_buf(struct psp_context *psp,

					struct psp_gfx_cmd_resp *cmd)

{

	if (amdgpu_sriov_vf(psp->adev))

		cmd->cmd_id = GFX_CMD_ID_DESTROY_VMR;

	else

		cmd->cmd_id = GFX_CMD_ID_DESTROY_TMR;

}



static int psp_tmr_unload(struct psp_context *psp)

{

	int ret;

	struct psp_gfx_cmd_resp *cmd;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!cmd)

		return -ENOMEM;



	psp_prep_tmr_unload_cmd_buf(psp, cmd);

	DRM_INFO("free PSP TMR buffer\n");



	ret = psp_cmd_submit_buf(psp, NULL, cmd,

				 psp->fence_buf_mc_addr);



	kfree(cmd);



	return ret;

}



static int psp_tmr_terminate(struct psp_context *psp)

{

	int ret;

	void *tmr_buf;

	void **pptr;



	ret = psp_tmr_unload(psp);

	if (ret)

		return ret;



	/* free TMR memory buffer */

	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, pptr);



	return 0;

}



static void psp_prep_asd_load_cmd_buf(struct psp_gfx_cmd_resp *cmd,

				uint64_t asd_mc, uint32_t size)

{
@@ -1779,8 +1825,6 @@ static int psp_hw_fini(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;

	void *tmr_buf;

	void **pptr;



	if (psp->adev->psp.ta_fw) {

		psp_ras_terminate(psp);
@@ -1790,10 +1834,9 @@ static int psp_hw_fini(void *handle) 


	psp_asd_unload(psp);



	psp_tmr_terminate(psp);

	psp_ring_destroy(psp, PSP_RING_TYPE__KM);



	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, pptr);

	amdgpu_bo_free_kernel(&psp->fw_pri_bo,

			      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);

	amdgpu_bo_free_kernel(&psp->fence_buf_bo,
@@ -1840,6 +1883,18 @@ static int psp_suspend(void *handle) 
		}

	}



	ret = psp_asd_unload(psp);

	if (ret) {

		DRM_ERROR("Failed to unload asd\n");

		return ret;

	}



	ret = psp_tmr_terminate(psp);

	if (ret) {

		DRM_ERROR("Falied to terminate tmr\n");

		return ret;

	}



	ret = psp_ring_stop(psp, PSP_RING_TYPE__KM);

	if (ret) {

		DRM_ERROR("PSP ring stop failed\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ static int dm_late_init(void *handle) 
	struct dmcu *dmcu = NULL;

	bool ret;



	if (!adev->dm.fw_dmcu)

	if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)

		return detect_mst_link_for_all_connectors(adev->ddev);



	dmcu = adev->dm.dc->res_pool->dmcu;

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -307,8 +307,6 @@ static int hibmc_load(struct drm_device *dev) 
	/* reset all the states of crtc/plane/encoder/connector */

	drm_mode_config_reset(dev);



	drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth);



	return 0;



err:
@@ -355,6 +353,9 @@ static int hibmc_pci_probe(struct pci_dev *pdev, 
			  ret);

		goto err_unload;

	}



	drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth);



	return 0;



err_unload:

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

+11 −0
Original line number Diff line number Diff line
@@ -3822,6 +3822,17 @@ skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state, 
	return true;

}













unsigned int













intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)













{













	int x = 0, y = 0;

























	intel_plane_adjust_aligned_offset(&x, &y, plane_state, 0,













					  plane_state->color_plane[0].offset, 0);

























	return y;













}



























static int skl_check_main_surface(struct intel_plane_state *plane_state)















{















	struct drm_i915_private *dev_priv = to_i915(plane_state->uapi.plane->dev);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE