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

Merge tag 'drm-next-5.5-2019-11-15' of git://people.freedesktop.org/~agd5f/linux into drm-next 



drm-next-5.5-2019-11-15:

amdgpu:
- Fix AVFS handling on SMU7 parts with custom power tables
- Enable Overdrive sysfs interface for Navi parts
- Fix power limit handling on smu11 parts
- Fix pcie link sysfs output for Navi
- Probably cancel MM worker threads on shutdown

radeon:
- Cleanup for ppc change

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191115163516.3714-1-alexander.deucher@amd.com
parents 17cc5139 622b2a0a

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

+3 −0
Original line number Diff line number Diff line
@@ -3110,6 +3110,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


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

	adev->shutdown = true;



	flush_delayed_work(&adev->delayed_init_work);



	/* disable all interrupts */

	amdgpu_irq_disable_all(adev);

	if (adev->mode_info.mode_config_initialized){

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

+21 −1
Original line number Diff line number Diff line
@@ -567,7 +567,9 @@ static int psp_xgmi_initialize(struct psp_context *psp) 
	struct ta_xgmi_shared_memory *xgmi_cmd;

	int ret;



	if (!psp->adev->psp.ta_fw)

	if (!psp->adev->psp.ta_fw ||

	    !psp->adev->psp.ta_xgmi_ucode_size ||

	    !psp->adev->psp.ta_xgmi_start_addr)

		return -ENOENT;



	if (!psp->xgmi_context.initialized) {
@@ -777,6 +779,12 @@ static int psp_ras_initialize(struct psp_context *psp) 
{

	int ret;



	if (!psp->adev->psp.ta_ras_ucode_size ||

	    !psp->adev->psp.ta_ras_start_addr) {

		dev_warn(psp->adev->dev, "RAS: ras ta ucode is not available\n");

		return 0;

	}



	if (!psp->ras.ras_initialized) {

		ret = psp_ras_init_shared_buf(psp);

		if (ret)
@@ -866,6 +874,12 @@ static int psp_hdcp_initialize(struct psp_context *psp) 
{

	int ret;



	if (!psp->adev->psp.ta_hdcp_ucode_size ||

	    !psp->adev->psp.ta_hdcp_start_addr) {

		dev_warn(psp->adev->dev, "HDCP: hdcp ta ucode is not available\n");

		return 0;

	}



	if (!psp->hdcp_context.hdcp_initialized) {

		ret = psp_hdcp_init_shared_buf(psp);

		if (ret)
@@ -1039,6 +1053,12 @@ static int psp_dtm_initialize(struct psp_context *psp) 
{

	int ret;



	if (!psp->adev->psp.ta_dtm_ucode_size ||

	    !psp->adev->psp.ta_dtm_start_addr) {

		dev_warn(psp->adev->dev, "DTM: dtm ta ucode is not available\n");

		return 0;

	}



	if (!psp->dtm_context.dtm_initialized) {

		ret = psp_dtm_init_shared_buf(psp);

		if (ret)

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

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) 
{

	int i, j;



	cancel_delayed_work_sync(&adev->uvd.idle_work);

	drm_sched_entity_destroy(&adev->uvd.entity);



	for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {

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

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev) 
	if (adev->vce.vcpu_bo == NULL)

		return 0;



	cancel_delayed_work_sync(&adev->vce.idle_work);

	drm_sched_entity_destroy(&adev->vce.entity);



	amdgpu_bo_free_kernel(&adev->vce.vcpu_bo, &adev->vce.gpu_addr,

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

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev) 
{

	int i, j;



	cancel_delayed_work_sync(&adev->vcn.idle_work);



	if (adev->vcn.indirect_sram) {

		amdgpu_bo_free_kernel(&adev->vcn.dpg_sram_bo,

				      &adev->vcn.dpg_sram_gpu_addr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE