Commit 4f56acde authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

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



There is no irq enabled in vcn 4.0.5 resume, causing wrong amdgpu_irq_src status.
Beside, current set function callbacks are empty with no real effect.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Acked-by: default avatarSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent de4a7338

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

+0 −17
Original line number Diff line number Diff line
@@ -2017,22 +2017,6 @@ static int vcn_v4_0_set_powergating_state(void *handle, enum amd_powergating_sta 
	return ret;

}



/**

 * vcn_v4_0_set_interrupt_state - set VCN block interrupt state

 *

 * @adev: amdgpu_device pointer

 * @source: interrupt sources

 * @type: interrupt types

 * @state: interrupt states

 *

 * Set VCN block interrupt state

 */

static int vcn_v4_0_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source,

      unsigned type, enum amdgpu_interrupt_state state)

{

	return 0;

}



/**

 * vcn_v4_0_set_ras_interrupt_state - set VCN block RAS interrupt state

 *
@@ -2097,7 +2081,6 @@ static int vcn_v4_0_process_interrupt(struct amdgpu_device *adev, struct amdgpu_ 
}



static const struct amdgpu_irq_src_funcs vcn_v4_0_irq_funcs = {

	.set = vcn_v4_0_set_interrupt_state,

	.process = vcn_v4_0_process_interrupt,

};

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

+0 −19
Original line number Diff line number Diff line
@@ -269,8 +269,6 @@ static int vcn_v4_0_5_hw_fini(void *handle) 
				vcn_v4_0_5_set_powergating_state(adev, AMD_PG_STATE_GATE);

			}

		}



		amdgpu_irq_put(adev, &adev->vcn.inst[i].irq, 0);

	}



	return 0;
@@ -1668,22 +1666,6 @@ static int vcn_v4_0_5_set_powergating_state(void *handle, enum amd_powergating_s 
	return ret;

}



/**

 * vcn_v4_0_5_set_interrupt_state - set VCN block interrupt state

 *

 * @adev: amdgpu_device pointer

 * @source: interrupt sources

 * @type: interrupt types

 * @state: interrupt states

 *

 * Set VCN block interrupt state

 */

static int vcn_v4_0_5_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source,

		unsigned type, enum amdgpu_interrupt_state state)

{

	return 0;

}



/**

 * vcn_v4_0_5_process_interrupt - process VCN block interrupt

 *
@@ -1726,7 +1708,6 @@ static int vcn_v4_0_5_process_interrupt(struct amdgpu_device *adev, struct amdgp 
}



static const struct amdgpu_irq_src_funcs vcn_v4_0_5_irq_funcs = {

	.set = vcn_v4_0_5_set_interrupt_state,

	.process = vcn_v4_0_5_process_interrupt,

};