mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-24 03:15:59 +00:00
drm/amd/display: Fix warning in disabling vblank irq
[Why] During gpu-reset, we toggle vblank irq by calling dc_interrupt_set() instead of amdgpu_irq_get/put() because we don't want to change the irq source's refcount. However, we see the warning when vblank irq is enabled by dc_interrupt_set() during gpu-reset but disabled by amdgpu_irq_put() after gpu-reset. [How] Only in dm_gpureset_toggle_interrupts() we toggle vblank interrupts by calling dc_interrupt_set(). Apart from this we call dm_set_vblank() which uses amdgpu_irq_get/put() to operate vblank irq. Reviewed-by: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com> Acked-by: Tom Chung <chiahsuan.chung@amd.com> Signed-off-by: Alan Liu <haoping.liu@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
40baba5693
commit
137f9cee11
2 changed files with 16 additions and 21 deletions
|
@ -2479,20 +2479,25 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,
|
||||||
if (acrtc && state->stream_status[i].plane_count != 0) {
|
if (acrtc && state->stream_status[i].plane_count != 0) {
|
||||||
irq_source = IRQ_TYPE_PFLIP + acrtc->otg_inst;
|
irq_source = IRQ_TYPE_PFLIP + acrtc->otg_inst;
|
||||||
rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
|
rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
|
||||||
DRM_DEBUG_VBL("crtc %d - vupdate irq %sabling: r=%d\n",
|
|
||||||
acrtc->crtc_id, enable ? "en" : "dis", rc);
|
|
||||||
if (rc)
|
if (rc)
|
||||||
DRM_WARN("Failed to %s pflip interrupts\n",
|
DRM_WARN("Failed to %s pflip interrupts\n",
|
||||||
enable ? "enable" : "disable");
|
enable ? "enable" : "disable");
|
||||||
|
|
||||||
if (enable) {
|
if (enable) {
|
||||||
rc = amdgpu_dm_crtc_enable_vblank(&acrtc->base);
|
if (amdgpu_dm_crtc_vrr_active(to_dm_crtc_state(acrtc->base.state)))
|
||||||
if (rc)
|
rc = amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, true);
|
||||||
DRM_WARN("Failed to enable vblank interrupts\n");
|
} else
|
||||||
} else {
|
rc = amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, false);
|
||||||
amdgpu_dm_crtc_disable_vblank(&acrtc->base);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (rc)
|
||||||
|
DRM_WARN("Failed to %sable vupdate interrupt\n", enable ? "en" : "dis");
|
||||||
|
|
||||||
|
irq_source = IRQ_TYPE_VBLANK + acrtc->otg_inst;
|
||||||
|
/* During gpu-reset we disable and then enable vblank irq, so
|
||||||
|
* don't use amdgpu_irq_get/put() to avoid refcount change.
|
||||||
|
*/
|
||||||
|
if (!dc_interrupt_set(adev->dm.dc, irq_source, enable))
|
||||||
|
DRM_WARN("Failed to %sable vblank interrupt\n", enable ? "en" : "dis");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,6 @@ static void vblank_control_worker(struct work_struct *work)
|
||||||
|
|
||||||
static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
|
static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
|
||||||
{
|
{
|
||||||
enum dc_irq_source irq_source;
|
|
||||||
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
|
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
|
||||||
struct amdgpu_device *adev = drm_to_adev(crtc->dev);
|
struct amdgpu_device *adev = drm_to_adev(crtc->dev);
|
||||||
struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state);
|
struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state);
|
||||||
|
@ -169,18 +168,9 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
if (amdgpu_in_reset(adev)) {
|
|
||||||
irq_source = IRQ_TYPE_VBLANK + acrtc->otg_inst;
|
|
||||||
/* During gpu-reset we disable and then enable vblank irq, so
|
|
||||||
* don't use amdgpu_irq_get/put() to avoid refcount change.
|
|
||||||
*/
|
|
||||||
if (!dc_interrupt_set(adev->dm.dc, irq_source, enable))
|
|
||||||
rc = -EBUSY;
|
|
||||||
} else {
|
|
||||||
rc = (enable)
|
rc = (enable)
|
||||||
? amdgpu_irq_get(adev, &adev->crtc_irq, acrtc->crtc_id)
|
? amdgpu_irq_get(adev, &adev->crtc_irq, acrtc->crtc_id)
|
||||||
: amdgpu_irq_put(adev, &adev->crtc_irq, acrtc->crtc_id);
|
: amdgpu_irq_put(adev, &adev->crtc_irq, acrtc->crtc_id);
|
||||||
}
|
|
||||||
|
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
Loading…
Reference in a new issue