Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb1680c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of fixes for radeon, intel, omap and one amdkfd fix.

  Radeon fixes are all over, but it does fix some cursor corruption
  across suspend/resume.  i915 should fix the second warn you were
  seeing, so let us know if not.  omap is a bunch of small fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (28 commits)
  drm/radeon: disable vce init on cayman (v2)
  drm/amdgpu: fix timeout calculation
  drm/radeon: check if BO_VA is set before adding it to the invalidation list
  drm/radeon: allways add the VM clear duplicate
  Revert "Revert "drm/radeon: dont switch vt on suspend""
  drm/radeon: Fold radeon_set_cursor() into radeon_show_cursor()
  drm/radeon: unpin cursor BOs on suspend and pin them again on resume (v2)
  drm/radeon: Clean up reference counting and pinning of the cursor BOs
  drm/amdkfd: validate pdd where it acquired first
  Revert "drm/i915: Allocate context objects from stolen"
  drm/i915: Declare the swizzling unknown for L-shaped configurations
  drm/radeon: fix underflow in r600_cp_dispatch_texture()
  drm/radeon: default to 2048 MB GART size on SI+
  drm/radeon: fix HDP flushing
  drm/radeon: use RCU query for GEM_BUSY syscall
  drm/amdgpu: Handle irqs only based on irq ring, not irq status regs.
  drm/radeon: Handle irqs only based on irq ring, not irq status regs.
  drm/i915: Use crtc_state->active in primary check_plane func
  drm/i915: Check crtc->active in intel_crtc_disable_planes
  drm/i915: Restore all GGTT VMAs on resume
  ...
parents 2278cb0b 2d28b633

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

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ unsigned long amdgpu_gem_timeout(uint64_t timeout_ns) 
	if (((int64_t)timeout_ns) < 0)

		return MAX_SCHEDULE_TIMEOUT;



	timeout = ktime_sub_ns(ktime_get(), timeout_ns);

	timeout = ktime_sub(ns_to_ktime(timeout_ns), ktime_get());

	if (ktime_to_ns(timeout) < 0)

		return 0;

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

+14 −8
Original line number Diff line number Diff line
@@ -3403,19 +3403,25 @@ static int dce_v10_0_crtc_irq(struct amdgpu_device *adev, 


	switch (entry->src_data) {

	case 0: /* vblank */

		if (disp_int & interrupt_status_offsets[crtc].vblank) {

		if (disp_int & interrupt_status_offsets[crtc].vblank)

			dce_v10_0_crtc_vblank_int_ack(adev, crtc);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		if (amdgpu_irq_enabled(adev, source, irq_type)) {

			drm_handle_vblank(adev->ddev, crtc);

		}

		DRM_DEBUG("IH: D%d vblank\n", crtc + 1);

		}



		break;

	case 1: /* vline */

		if (disp_int & interrupt_status_offsets[crtc].vline) {

		if (disp_int & interrupt_status_offsets[crtc].vline)

			dce_v10_0_crtc_vline_int_ack(adev, crtc);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		DRM_DEBUG("IH: D%d vline\n", crtc + 1);

		}



		break;

	default:

		DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);

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

+14 −8
Original line number Diff line number Diff line
@@ -3402,19 +3402,25 @@ static int dce_v11_0_crtc_irq(struct amdgpu_device *adev, 


	switch (entry->src_data) {

	case 0: /* vblank */

		if (disp_int & interrupt_status_offsets[crtc].vblank) {

		if (disp_int & interrupt_status_offsets[crtc].vblank)

			dce_v11_0_crtc_vblank_int_ack(adev, crtc);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		if (amdgpu_irq_enabled(adev, source, irq_type)) {

			drm_handle_vblank(adev->ddev, crtc);

		}

		DRM_DEBUG("IH: D%d vblank\n", crtc + 1);

		}



		break;

	case 1: /* vline */

		if (disp_int & interrupt_status_offsets[crtc].vline) {

		if (disp_int & interrupt_status_offsets[crtc].vline)

			dce_v11_0_crtc_vline_int_ack(adev, crtc);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		DRM_DEBUG("IH: D%d vline\n", crtc + 1);

		}



		break;

	default:

		DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);

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

+14 −8
Original line number Diff line number Diff line
@@ -3237,19 +3237,25 @@ static int dce_v8_0_crtc_irq(struct amdgpu_device *adev, 


	switch (entry->src_data) {

	case 0: /* vblank */

		if (disp_int & interrupt_status_offsets[crtc].vblank) {

		if (disp_int & interrupt_status_offsets[crtc].vblank)

			WREG32(mmLB_VBLANK_STATUS + crtc_offsets[crtc], LB_VBLANK_STATUS__VBLANK_ACK_MASK);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		if (amdgpu_irq_enabled(adev, source, irq_type)) {

			drm_handle_vblank(adev->ddev, crtc);

		}

		DRM_DEBUG("IH: D%d vblank\n", crtc + 1);

		}



		break;

	case 1: /* vline */

		if (disp_int & interrupt_status_offsets[crtc].vline) {

		if (disp_int & interrupt_status_offsets[crtc].vline)

			WREG32(mmLB_VLINE_STATUS + crtc_offsets[crtc], LB_VLINE_STATUS__VLINE_ACK_MASK);

		else

			DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



		DRM_DEBUG("IH: D%d vline\n", crtc + 1);

		}



		break;

	default:

		DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);

drivers/gpu/drm/amd/amdkfd/kfd_process.c

+7 −2
Original line number Diff line number Diff line
@@ -420,6 +420,12 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid) 
	pqm_uninit(&p->pqm);



	pdd = kfd_get_process_device_data(dev, p);



	if (!pdd) {

		mutex_unlock(&p->mutex);

		return;

	}



	if (pdd->reset_wavefronts) {

		dbgdev_wave_reset_wavefronts(pdd->dev, p);

		pdd->reset_wavefronts = false;
@@ -431,7 +437,6 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid) 
	 * We don't call amd_iommu_unbind_pasid() here

	 * because the IOMMU called us.

	 */

	if (pdd)

	pdd->bound = false;



	mutex_unlock(&p->mutex);