[SRU,T,U,V,W,X] Revert "drm/radeon: call hpd_irq_event on resume"

From: Linus Torvalds <torvalds@linux-foundation.org>

This reverts commit dbb17a21c131eca94eb31136eee9a7fe5aff00d9.

It turns out that commit can cause problems for systems with multiple
GPUs, and causes X to hang on at least a HP Pavilion dv7 with hybrid
graphics.

This got noticed originally in 4.4.4, where this patch had already
gotten back-ported, but 4.5-rc7 was verified to have the same problem.

Alexander Deucher says:
 "It looks like you have a muxed system so I suspect what's happening is
  that one of the display is being reported as connected for both the
  IGP and the dGPU and then the desktop environment gets confused or
  there some sort problem in the detect functions since the mux is not
  switched to the dGPU.  I don't see an easy fix unless Dave has any
  ideas.  I'd say just revert for now"

Reported-by: Jörg-Volker Peetz <jvpeetz@web.de>
Acked-by: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Dave Airlie <airlied@gmail.com>
Cc: stable@kernel.org  # wherever dbb17a21c131 got back-ported
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 256faedcfd646161477d47a1a78c32a562d2e845)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/gpu/drm/radeon/radeon_device.c | 1 -
 1 file changed, 1 deletion(-)

Doesn't this need a tracking bug ?

On Tue, 2016-03-08 at 09:21 -0700, Tim Gardner wrote:
> Doesn't this need a tracking bug ?
> 

Oops!  Insert when applying:

BugLink: http://bugs.launchpad.net/bugs/1554608

On Tue, Mar 08, 2016 at 08:19:25AM -0800, Kamal Mostafa wrote:
> From: Linus Torvalds <torvalds@linux-foundation.org>
> 
> This reverts commit dbb17a21c131eca94eb31136eee9a7fe5aff00d9.
> 
> It turns out that commit can cause problems for systems with multiple
> GPUs, and causes X to hang on at least a HP Pavilion dv7 with hybrid
> graphics.
> 
> This got noticed originally in 4.4.4, where this patch had already
> gotten back-ported, but 4.5-rc7 was verified to have the same problem.
> 
> Alexander Deucher says:
>  "It looks like you have a muxed system so I suspect what's happening is
>   that one of the display is being reported as connected for both the
>   IGP and the dGPU and then the desktop environment gets confused or
>   there some sort problem in the detect functions since the mux is not
>   switched to the dGPU.  I don't see an easy fix unless Dave has any
>   ideas.  I'd say just revert for now"
> 
> Reported-by: Jörg-Volker Peetz <jvpeetz@web.de>
> Acked-by: Alexander Deucher <Alexander.Deucher@amd.com>
> Cc: Dave Airlie <airlied@gmail.com>
> Cc: stable@kernel.org  # wherever dbb17a21c131 got back-ported
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> (cherry picked from commit 256faedcfd646161477d47a1a78c32a562d2e845)
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>  drivers/gpu/drm/radeon/radeon_device.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 0e390af..74996a3 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -1570,7 +1570,6 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
>  	}
>  
>  	drm_kms_helper_poll_enable(dev);
> -	drm_helper_hpd_irq_event(dev);
>  
>  	/* set the power state here in case we are a PX system or headless */
>  	if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
> -- 
> 2.7.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Applied to the appropriate master-next branches of the various git
repositories.

Applied to the appropriate master-next branches.