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

Commit 9cae7751 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next 

more misc amdgpu fixes.

* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: fix rmmod KCQ disable failed error
  drm/amdgpu: fix kernel hang when starting VNC server
  drm/amdgpu: don't skip attributes when powerplay is enabled
  drm/amd/pp: fix typecast error in powerplay.
  Revert "drm/radeon: dont switch vt on suspend"
  drm/amd/amdgpu: fix over-bound accessing in amdgpu_cs_wait_any_fence
  drm/amd/powerplay: fix unfreeze level smc message for smu7
  drm/amdgpu:fix memleak
  drm/amdgpu:fix memleak in takedown
parents af5ecb53 446947b4

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

+1 −1
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ static int amdgpu_cs_wait_any_fence(struct amdgpu_device *adev, 
	wait->out.status = (r > 0);

	wait->out.first_signaled = first;



	if (array[first])

	if (first < fence_count && array[first])

		r = array[first]->error;

	else

		r = 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -1836,6 +1836,9 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_blocks[i].status.sw)

			continue;

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

+1 −4
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
		r = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm,

						 bo->tbo.ttm->pages);

		if (r)

			goto unlock_mmap_sem;

			goto release_object;



		r = amdgpu_bo_reserve(bo, true);

		if (r)
@@ -353,9 +353,6 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
free_pages:

	release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages, false);



unlock_mmap_sem:

	up_read(&current->mm->mmap_sem);



release_object:

	drm_gem_object_put_unlocked(gobj);

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

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man) 
{

	struct amdgpu_gtt_mgr *mgr = man->priv;



	spin_lock(&mgr->lock);

	if (!drm_mm_clean(&mgr->mm)) {

		spin_unlock(&mgr->lock);

		return -EBUSY;

	}



	drm_mm_takedown(&mgr->mm);

	spin_unlock(&mgr->lock);

	kfree(mgr);

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

+4 −0
Original line number Diff line number Diff line
@@ -946,6 +946,10 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	struct amdgpu_device *adev = dev_get_drvdata(dev);

	umode_t effective_mode = attr->mode;



	/* no skipping for powerplay */

	if (adev->powerplay.cgs_device)

		return effective_mode;



	/* Skip limit attributes if DPM is not enabled */

	if (!adev->pm.dpm_enabled &&

	    (attr == &sensor_dev_attr_temp1_crit.dev_attr.attr ||