All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
@ 2016-10-21 13:44 ville.syrjala
  2016-10-21 15:46 ` Chris Wilson
  0 siblings, 1 reply; 6+ messages in thread
From: ville.syrjala @ 2016-10-21 13:44 UTC (permalink / raw)
  To: intel-gfx; +Cc: Kirill A . Shutemov, drm-intel-fixes, Rui Tiago Matos

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Once we've determined that the sink is MST capable we never end up
running through the full detect cycle again, despite getting HPDs.
Fix tht by ripping out the incorrect piece of code responsible.

This got broken when I moved the long HPD handling to the ->detect()
hook, but failed to remove the leftover code.

Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Cc: drm-intel-fixes@lists.freedesktop.org
Cc: Rui Tiago Matos <tiagomatos@gmail.com>
Tested-by: Rui Tiago Matos <tiagomatos@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98323
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98306
Fixes: 27d4efc5591a ("drm/i915: Move long hpd handling into the hotplug work")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f30db8f2425e..80db8a3ac38f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4492,21 +4492,11 @@ static enum drm_connector_status
 intel_dp_detect(struct drm_connector *connector, bool force)
 {
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	struct intel_encoder *intel_encoder = &intel_dig_port->base;
 	enum drm_connector_status status = connector->status;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
-	if (intel_dp->is_mst) {
-		/* MST devices are disconnected from a monitor POV */
-		intel_dp_unset_edid(intel_dp);
-		if (intel_encoder->type != INTEL_OUTPUT_EDP)
-			intel_encoder->type = INTEL_OUTPUT_DP;
-		return connector_status_disconnected;
-	}
-
 	/* If full detect is not performed yet, do a full detect */
 	if (!intel_dp->detect_done)
 		status = intel_dp_long_pulse(intel_dp->attached_connector);
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
  2016-10-21 13:44 ville.syrjala
@ 2016-10-21 15:46 ` Chris Wilson
  2016-10-21 15:56   ` Ville Syrjälä
  2016-10-26  8:57   ` Ville Syrjälä
  0 siblings, 2 replies; 6+ messages in thread
From: Chris Wilson @ 2016-10-21 15:46 UTC (permalink / raw)
  To: ville.syrjala
  Cc: Kirill A . Shutemov, intel-gfx, drm-intel-fixes, Rui Tiago Matos

On Fri, Oct 21, 2016 at 04:44:38PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Once we've determined that the sink is MST capable we never end up
> running through the full detect cycle again, despite getting HPDs.
> Fix tht by ripping out the incorrect piece of code responsible.

Ah, the missing magic is the call to intel_dp_configure_mst() right?

With that understood,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
  2016-10-21 15:46 ` Chris Wilson
@ 2016-10-21 15:56   ` Ville Syrjälä
  2016-10-26  8:57   ` Ville Syrjälä
  1 sibling, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2016-10-21 15:56 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx, Kirill A . Shutemov, drm-intel-fixes,
	Rui Tiago Matos

On Fri, Oct 21, 2016 at 04:46:38PM +0100, Chris Wilson wrote:
> On Fri, Oct 21, 2016 at 04:44:38PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Once we've determined that the sink is MST capable we never end up
> > running through the full detect cycle again, despite getting HPDs.
> > Fix tht by ripping out the incorrect piece of code responsible.
> 
> Ah, the missing magic is the call to intel_dp_configure_mst() right?

Yeah, if the cable is still physically connected we do that. And if not
we'll take the earlier way out to inform the topology manager that
we're no longer doing MST.

> 
> With that understood,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
  2016-10-21 15:46 ` Chris Wilson
  2016-10-21 15:56   ` Ville Syrjälä
@ 2016-10-26  8:57   ` Ville Syrjälä
  1 sibling, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2016-10-26  8:57 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx, Kirill A . Shutemov, drm-intel-fixes,
	Rui Tiago Matos

On Fri, Oct 21, 2016 at 04:46:38PM +0100, Chris Wilson wrote:
> On Fri, Oct 21, 2016 at 04:44:38PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Once we've determined that the sink is MST capable we never end up
> > running through the full detect cycle again, despite getting HPDs.
> > Fix tht by ripping out the incorrect piece of code responsible.
> 
> Ah, the missing magic is the call to intel_dp_configure_mst() right?
> 
> With that understood,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Pushed to dinq. Thanks for the review.

> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
       [not found] <CAFbkSA0mG4ex69ng-dXYrCCvF8a9gnjmCz53Fo5kA2+AUWP9Uw@mail.gmail.com>
@ 2016-11-10 21:18 ` Lyude
  2016-11-10 22:18   ` Lyude Paul
  0 siblings, 1 reply; 6+ messages in thread
From: Lyude @ 2016-11-10 21:18 UTC (permalink / raw)
  To: stable; +Cc: Justin Forbes, Hans de Goede

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Commit 1aab956c7b8872fb6976328316bfad62c6e67cf8 upstream.

Once we've determined that the sink is MST capable we never end up
running through the full detect cycle again, despite getting HPDs.
Fix tht by ripping out the incorrect piece of code responsible.

This got broken when I moved the long HPD handling to the ->detect()
hook, but failed to remove the leftover code.

Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Cc: drm-intel-fixes@lists.freedesktop.org
Cc: Rui Tiago Matos <tiagomatos@gmail.com>
Tested-by: Rui Tiago Matos <tiagomatos@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98323
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Tested-by: Kirill A. Shutemov <kirill@shutemov.name>
References: https://bugs.freedesktop.org/show_bug.cgi?id=98306
Fixes: 27d4efc5591a ("drm/i915: Move long hpd handling into the hotplug work")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477057478-29328-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_dp.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3051182..b8aeb28 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4323,21 +4323,11 @@ static enum drm_connector_status
 intel_dp_detect(struct drm_connector *connector, bool force)
 {
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	struct intel_encoder *intel_encoder = &intel_dig_port->base;
 	enum drm_connector_status status = connector->status;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
-	if (intel_dp->is_mst) {
-		/* MST devices are disconnected from a monitor POV */
-		intel_dp_unset_edid(intel_dp);
-		if (intel_encoder->type != INTEL_OUTPUT_EDP)
-			intel_encoder->type = INTEL_OUTPUT_DP;
-		return connector_status_disconnected;
-	}
-
 	/* If full detect is not performed yet, do a full detect */
 	if (!intel_dp->detect_done)
 		status = intel_dp_long_pulse(intel_dp->attached_connector);
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect()
  2016-11-10 21:18 ` [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect() Lyude
@ 2016-11-10 22:18   ` Lyude Paul
  0 siblings, 0 replies; 6+ messages in thread
From: Lyude Paul @ 2016-11-10 22:18 UTC (permalink / raw)
  To: stable; +Cc: Justin Forbes, Hans de Goede

whoops, didn't realize this wasn't in linus's branch. Feel free to
ignore for now greg

On Thu, 2016-11-10 at 16:18 -0500, Lyude wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Commit 1aab956c7b8872fb6976328316bfad62c6e67cf8 upstream.
> 
> Once we've determined that the sink is MST capable we never end up
> running through the full detect cycle again, despite getting HPDs.
> Fix tht by ripping out the incorrect piece of code responsible.
> 
> This got broken when I moved the long HPD handling to the ->detect()
> hook, but failed to remove the leftover code.
> 
> Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
> Cc: drm-intel-fixes@lists.freedesktop.org
> Cc: Rui Tiago Matos <tiagomatos@gmail.com>
> Tested-by: Rui Tiago Matos <tiagomatos@gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98323
> Cc: Kirill A. Shutemov <kirill@shutemov.name>
> Tested-by: Kirill A. Shutemov <kirill@shutemov.name>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=98306
> Fixes: 27d4efc5591a ("drm/i915: Move long hpd handling into the
> hotplug work")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Link: http://patchwork.freedesktop.org/patch/msgid/1477057478-29328-1
> -git-send-email-ville.syrjala@linux.intel.com
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c
> b/drivers/gpu/drm/i915/intel_dp.c
> index 3051182..b8aeb28 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4323,21 +4323,11 @@ static enum drm_connector_status
>  intel_dp_detect(struct drm_connector *connector, bool force)
>  {
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> -	struct intel_digital_port *intel_dig_port =
> dp_to_dig_port(intel_dp);
> -	struct intel_encoder *intel_encoder = &intel_dig_port->base;
>  	enum drm_connector_status status = connector->status;
>  
>  	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
>  		      connector->base.id, connector->name);
>  
> -	if (intel_dp->is_mst) {
> -		/* MST devices are disconnected from a monitor POV
> */
> -		intel_dp_unset_edid(intel_dp);
> -		if (intel_encoder->type != INTEL_OUTPUT_EDP)
> -			intel_encoder->type = INTEL_OUTPUT_DP;
> -		return connector_status_disconnected;
> -	}
> -
>  	/* If full detect is not performed yet, do a full detect */
>  	if (!intel_dp->detect_done)
>  		status = intel_dp_long_pulse(intel_dp-
> >attached_connector);

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-10 22:18 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <CAFbkSA0mG4ex69ng-dXYrCCvF8a9gnjmCz53Fo5kA2+AUWP9Uw@mail.gmail.com>
2016-11-10 21:18 ` [PATCH] drm/i915: Refresh that status of MST capable connectors in ->detect() Lyude
2016-11-10 22:18   ` Lyude Paul
2016-10-21 13:44 ville.syrjala
2016-10-21 15:46 ` Chris Wilson
2016-10-21 15:56   ` Ville Syrjälä
2016-10-26  8:57   ` Ville Syrjälä

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.