diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
index 2fd0ec3cc7b0..1b63546fbb91 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
@@ -2479,8 +2479,9 @@ static int gfx_v12_1_xcc_cp_resume(struct amdgpu_device *adev, uint16_t xcc_mask
 				return r;
 		}
 
-		if (!(adev->flags & AMD_IS_APU))
-			gfx_v12_1_xcc_enable_gui_idle_interrupt(adev, false, xcc_id);
+		/* GFX CGCG and LS is set by default */
+		if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
+			gfx_v12_1_xcc_enable_gui_idle_interrupt(adev, true, xcc_id);
 
 		gfx_v12_1_xcc_cp_set_doorbell_range(adev, xcc_id);