Commit 897925dc authored by Li Ma's avatar Li Ma Committed by Alex Deucher
Browse files

drm/amdgpu: remove asymmetrical irq disabling in jpeg 4.0.5 suspend 



A supplement to commit: 615dd56a
There is an irq warning of jpeg during resume in s2idle process. No irq enabled in jpeg 4.0.5 resume.

Fixes: 615dd56a ("drm/amdgpu: remove asymmetrical irq disabling in vcn 4.0.5 suspend")
Signed-off-by: default avatarLi Ma <li.ma@amd.com>
Acked-By: default avatarSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6ef82ac6

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

+0 −9
Original line number Diff line number Diff line
@@ -674,14 +674,6 @@ static int jpeg_v4_0_set_powergating_state(void *handle, 
	return ret;

}



static int jpeg_v4_0_set_interrupt_state(struct amdgpu_device *adev,

					struct amdgpu_irq_src *source,

					unsigned type,

					enum amdgpu_interrupt_state state)

{

	return 0;

}



static int jpeg_v4_0_set_ras_interrupt_state(struct amdgpu_device *adev,

					struct amdgpu_irq_src *source,

					unsigned int type,
@@ -765,7 +757,6 @@ static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev) 
}



static const struct amdgpu_irq_src_funcs jpeg_v4_0_irq_funcs = {

	.set = jpeg_v4_0_set_interrupt_state,

	.process = jpeg_v4_0_process_interrupt,

};

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

+0 −10
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ static int jpeg_v4_0_5_hw_fini(void *handle) 
			RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))

			jpeg_v4_0_5_set_powergating_state(adev, AMD_PG_STATE_GATE);

	}

	amdgpu_irq_put(adev, &adev->jpeg.inst->irq, 0);



	return 0;

}
@@ -516,14 +515,6 @@ static int jpeg_v4_0_5_set_powergating_state(void *handle, 
	return ret;

}



static int jpeg_v4_0_5_set_interrupt_state(struct amdgpu_device *adev,

					struct amdgpu_irq_src *source,

					unsigned type,

					enum amdgpu_interrupt_state state)

{

	return 0;

}



static int jpeg_v4_0_5_process_interrupt(struct amdgpu_device *adev,

				      struct amdgpu_irq_src *source,

				      struct amdgpu_iv_entry *entry)
@@ -603,7 +594,6 @@ static void jpeg_v4_0_5_set_dec_ring_funcs(struct amdgpu_device *adev) 
}



static const struct amdgpu_irq_src_funcs jpeg_v4_0_5_irq_funcs = {

	.set = jpeg_v4_0_5_set_interrupt_state,

	.process = jpeg_v4_0_5_process_interrupt,

};