FAILED: patch "[PATCH] drm/radeon: Unbreak HPD handling for r600+" failed to apply to 4.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
e12fcff79974a32eef523b80e5f485a4bbe102bbMon Sep 17 00:00:00 2001
From: Lyude <[email protected]>
Date: Thu, 11 May 2017 19:31:12 -0400
Subject: [PATCH] drm/radeon: Unbreak HPD handling for r600+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We end up reading the interrupt register for HPD5, and then writing it to HPD6 which on systems without anything using HPD5 results in permanently disabling hotplug on one of the display outputs after the first time we acknowledge a hotplug interrupt from the GPU.
This code is really bad. But for now, let's just fix this. I will hopefully have a large patch series to refactor all of this soon.
drivers/gpu/drm/radeon/cik.c +2 -2
@@ -7401,7 +7401,7 @@ static inline void cik_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.cik.disp_int_cont5 &DC_HPD6_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
@@ -7431,7 +7431,7 @@ static inline void cik_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.cik.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_RX_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
drivers/gpu/drm/radeon/evergreen.c +2 -2
@@ -4927,7 +4927,7 @@ static void evergreen_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
@@ -4958,7 +4958,7 @@ static void evergreen_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_RX_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
drivers/gpu/drm/radeon/r600.c +1 -1
@@ -3988,7 +3988,7 @@ static void r600_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.r600.disp_int_cont2 &DC_HPD6_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
drivers/gpu/drm/radeon/si.c +2 -2
@@ -6317,7 +6317,7 @@ static inline void si_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }
@@ -6348,7 +6348,7 @@ static inline void si_irq_ack(struct radeon_device *rdev)WREG32 (DC_HPD5_INT_CONTROL , tmp); }if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_RX_INTERRUPT ) { - tmp =RREG32 (DC_HPD5_INT_CONTROL ); + tmp =RREG32 (DC_HPD6_INT_CONTROL ); tmp |= DC_HPDx_RX_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp); }