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

Merge tag 'drm-fixes-5.4-2019-11-06' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



drm-fixes-5.4-2019-11-06:

amdgpu:
- Fix navi14 display issue root cause and revert workaround
- GPU reset scheduler interaction fix
- Fix fan boost on multi-GPU
- Gfx10 and sdma5 fixes for navi
- GFXOFF fix for renoir
- Add navi14 PCI ID
- GPUVM fix for arcturus

radeon:
- Port an SI power fix from amdgpu

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191107032241.1021217-1-alexander.deucher@amd.com
parents 67322bec 2c409ba8

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

+4 −1
Original line number Diff line number Diff line
@@ -604,8 +604,11 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr) 
			continue;

		}



		for (i = 0; i < num_entities; i++)

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

			mutex_lock(&ctx->adev->lock_reset);

			drm_sched_entity_fini(&ctx->entities[0][i].entity);

			mutex_unlock(&ctx->adev->lock_reset);

		}

	}

}

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

+7 −0
Original line number Diff line number Diff line
@@ -2885,6 +2885,13 @@ fence_driver_init: 
			DRM_INFO("amdgpu: acceleration disabled, skipping benchmarks\n");

	}



	/*

	 * Register gpu instance before amdgpu_device_enable_mgpu_fan_boost.

	 * Otherwise the mgpu fan boost feature will be skipped due to the

	 * gpu instance is counted less.

	 */

	amdgpu_register_gpu_instance(adev);



	/* enable clockgating, etc. after ib tests, etc. since some blocks require

	 * explicit gating rather than handling it automatically.

	 */

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

+1 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x7340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7347, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x734F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14|AMD_EXP_HW_SUPPORT},



	/* Renoir */

	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU|AMD_EXP_HW_SUPPORT},

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

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ struct amdgpu_gfx { 
	uint32_t			mec2_feature_version;

	bool				mec_fw_write_wait;

	bool				me_fw_write_wait;

	bool				cp_fw_write_wait;

	struct amdgpu_ring		gfx_ring[AMDGPU_MAX_GFX_RINGS];

	unsigned			num_gfx_rings;

	struct amdgpu_ring		compute_ring[AMDGPU_MAX_COMPUTE_RINGS];

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

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
		pm_runtime_put_autosuspend(dev->dev);

	}



	amdgpu_register_gpu_instance(adev);

out:

	if (r) {

		/* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */

CRA Git | Maintained and supported by SUSTech CRA and CCSE