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

Commit b86f9faa authored by Dave Airlie's avatar Dave Airlie
Browse files

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

two amd fixes.

* 'drm-fixes-4.8' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/si/dpm: add workaround for for Jet parts
  drm/amdgpu: disable CRTCs before teardown
parents 08895a8b 670bb4fd

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

+1 −1
Original line number Diff line number Diff line
@@ -1708,11 +1708,11 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


	DRM_INFO("amdgpu: finishing device.\n");

	adev->shutdown = true;

	drm_crtc_force_disable_all(adev->ddev);

	/* evict vram memory */

	amdgpu_bo_evict_vram(adev);

	amdgpu_ib_pool_fini(adev);

	amdgpu_fence_driver_fini(adev);

	drm_crtc_force_disable_all(adev->ddev);

	amdgpu_fbdev_fini(adev);

	r = amdgpu_fini(adev);

	kfree(adev->ip_block_status);

drivers/gpu/drm/radeon/si_dpm.c

+6 −0
Original line number Diff line number Diff line
@@ -3015,6 +3015,12 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, 
	if (rdev->pdev->device == 0x6811 &&

	    rdev->pdev->revision == 0x81)

		max_mclk = 120000;

	/* limit sclk/mclk on Jet parts for stability */

	if (rdev->pdev->device == 0x6665 &&

	    rdev->pdev->revision == 0xc3) {

		max_sclk = 75000;

		max_mclk = 80000;

	}



	if (rps->vce_active) {

		rps->evclk = rdev->pm.dpm.vce_states[rdev->pm.dpm.vce_level].evclk;