Commit 876ca8f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.12-rc3' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Not a whole lot happening here, a set of amdgpu fixes and one core
  deadlock fix, and some misc drivers fixes"

* tag 'drm-fixes-for-v4.12-rc3' of git://people.freedesktop.org/~airlied/linux:
  drm/amdgpu: fix null point error when rmmod amdgpu.
  drm/amd/powerplay: fix a signedness bugs
  drm/amdgpu: fix NULL pointer panic of emit_gds_switch
  drm/radeon: Unbreak HPD handling for r600+
  drm/amd/powerplay/smu7: disable mclk switching for high refresh rates
  drm/amd/powerplay/smu7: add vblank check for mclk switching (v2)
  drm/radeon/ci: disable mclk switching for high refresh rates (v2)
  drm/amdgpu/ci: disable mclk switching for high refresh rates (v2)
  drm/amdgpu: fix fundamental suspend/resume issue
  drm/gma500/psb: Actually use VBT mode when it is found
  drm: Fix deadlock retry loop in page_flip_ioctl
  drm: qxl: Delay entering atomic context during cursor update
  drm/radeon: Fix oops upon driver load on PowerXpress laptops
parents 83b4605b bc1f0e04

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

+6 −1
Original line number Diff line number Diff line
@@ -425,10 +425,15 @@ bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj) 


void amdgpu_fbdev_restore_mode(struct amdgpu_device *adev)

{

	struct amdgpu_fbdev *afbdev = adev->mode_info.rfbdev;

	struct amdgpu_fbdev *afbdev;

	struct drm_fb_helper *fb_helper;

	int ret;



	if (!adev)

		return;



	afbdev = adev->mode_info.rfbdev;



	if (!afbdev)

		return;

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

+22 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) 
		mutex_unlock(&id_mgr->lock);

	}



	if (gds_switch_needed) {

	if (ring->funcs->emit_gds_switch && gds_switch_needed) {

		id->gds_base = job->gds_base;

		id->gds_size = job->gds_size;

		id->gws_base = job->gws_base;
@@ -672,6 +672,7 @@ void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vmhub, 
	struct amdgpu_vm_id_manager *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	struct amdgpu_vm_id *id = &id_mgr->ids[vmid];



	atomic64_set(&id->owner, 0);

	id->gds_base = 0;

	id->gds_size = 0;

	id->gws_base = 0;
@@ -680,6 +681,26 @@ void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vmhub, 
	id->oa_size = 0;

}



/**

 * amdgpu_vm_reset_all_id - reset VMID to zero

 *

 * @adev: amdgpu device structure

 *

 * Reset VMID to force flush on next use

 */

void amdgpu_vm_reset_all_ids(struct amdgpu_device *adev)

{

	unsigned i, j;



	for (i = 0; i < AMDGPU_MAX_VMHUBS; ++i) {

		struct amdgpu_vm_id_manager *id_mgr =

			&adev->vm_manager.id_mgr[i];



		for (j = 1; j < id_mgr->num_ids; ++j)

			amdgpu_vm_reset_id(adev, i, j);

	}

}



/**

 * amdgpu_vm_bo_find - find the bo_va for a specific vm & bo

 *
@@ -2270,7 +2291,6 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev) 
	for (i = 0; i < AMDGPU_MAX_RINGS; ++i)

		adev->vm_manager.seqno[i] = 0;





	atomic_set(&adev->vm_manager.vm_pte_next_ring, 0);

	atomic64_set(&adev->vm_manager.client_counter, 0);

	spin_lock_init(&adev->vm_manager.prt_lock);

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

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job);

void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vmhub,

			unsigned vmid);

void amdgpu_vm_reset_all_ids(struct amdgpu_device *adev);

int amdgpu_vm_update_directories(struct amdgpu_device *adev,

				 struct amdgpu_vm *vm);

int amdgpu_vm_clear_freed(struct amdgpu_device *adev,

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

+6 −0
Original line number Diff line number Diff line
@@ -906,6 +906,12 @@ static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev) 
	u32 vblank_time = amdgpu_dpm_get_vblank_time(adev);

	u32 switch_limit = adev->mc.vram_type == AMDGPU_VRAM_TYPE_GDDR5 ? 450 : 300;



	/* disable mclk switching if the refresh is >120Hz, even if the

	 * blanking period would allow it

	 */

	if (amdgpu_dpm_get_vrefresh(adev) > 120)

		return true;



	if (vblank_time < switch_limit)

		return true;

	else

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

+2 −13
Original line number Diff line number Diff line
@@ -950,10 +950,6 @@ static int gmc_v6_0_suspend(void *handle) 
{

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



	if (adev->vm_manager.enabled) {

		gmc_v6_0_vm_fini(adev);

		adev->vm_manager.enabled = false;

	}

	gmc_v6_0_hw_fini(adev);



	return 0;
@@ -968,16 +964,9 @@ static int gmc_v6_0_resume(void *handle) 
	if (r)

		return r;



	if (!adev->vm_manager.enabled) {

		r = gmc_v6_0_vm_init(adev);

		if (r) {

			dev_err(adev->dev, "vm manager initialization failed (%d).\n", r);

			return r;

		}

		adev->vm_manager.enabled = true;

	}

	amdgpu_vm_reset_all_ids(adev);



	return r;

	return 0;

}



static bool gmc_v6_0_is_idle(void *handle)

CRA Git | Maintained and supported by SUSTech CRA and CCSE