All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Really ignore long HPD pulses on eDP
@ 2015-02-10 12:11 ville.syrjala
  2015-02-10 12:29 ` Jani Nikula
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ville.syrjala @ 2015-02-10 12:11 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter

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

Return IRQ_HANDLED from intel_dp_hpd_pulse() to properly
ignore the long HPD pulse on eDP to avoid the never ending
VDD off->HPD->VDD on->VDD off->HPD... cycle.

This fixes a regression intoduced by
 commit b2c5c181ed18490648a02f8c7d562a3b9e8b96de
 Author: Daniel Vetter <daniel.vetter@ffwll.ch>
 Date:   Fri Jan 23 06:00:31 2015 +0100

    drm/i915: Use symbolic irqreturn for ->hpd_pulse

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
Jani, I decided against the goto out solution because it would have looked like
 ret = IRQ_HANDLED;
 goto out;
which seemed a bit silly.

 drivers/gpu/drm/i915/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 33b1b82..cc711ac 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4499,7 +4499,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 		 */
 		DRM_DEBUG_KMS("ignoring long hpd on eDP port %c\n",
 			      port_name(intel_dig_port->port));
-		return false;
+		return IRQ_HANDLED;
 	}
 
 	DRM_DEBUG_KMS("got hpd irq on port %c - %s\n",
-- 
2.0.5

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Really ignore long HPD pulses on eDP
  2015-02-10 12:11 [PATCH] drm/i915: Really ignore long HPD pulses on eDP ville.syrjala
@ 2015-02-10 12:29 ` Jani Nikula
  2015-02-10 21:43 ` shuang.he
  2015-02-11  8:28 ` Jani Nikula
  2 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-02-10 12:29 UTC (permalink / raw)
  To: ville.syrjala, intel-gfx; +Cc: Daniel Vetter

On Tue, 10 Feb 2015, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Return IRQ_HANDLED from intel_dp_hpd_pulse() to properly
> ignore the long HPD pulse on eDP to avoid the never ending
> VDD off->HPD->VDD on->VDD off->HPD... cycle.
>
> This fixes a regression intoduced by
>  commit b2c5c181ed18490648a02f8c7d562a3b9e8b96de
>  Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>  Date:   Fri Jan 23 06:00:31 2015 +0100
>
>     drm/i915: Use symbolic irqreturn for ->hpd_pulse
>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> Jani, I decided against the goto out solution because it would have looked like
>  ret = IRQ_HANDLED;
>  goto out;
> which seemed a bit silly.

Ack.

Jani.

>
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 33b1b82..cc711ac 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4499,7 +4499,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
>  		 */
>  		DRM_DEBUG_KMS("ignoring long hpd on eDP port %c\n",
>  			      port_name(intel_dig_port->port));
> -		return false;
> +		return IRQ_HANDLED;
>  	}
>  
>  	DRM_DEBUG_KMS("got hpd irq on port %c - %s\n",
> -- 
> 2.0.5
>

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Really ignore long HPD pulses on eDP
  2015-02-10 12:11 [PATCH] drm/i915: Really ignore long HPD pulses on eDP ville.syrjala
  2015-02-10 12:29 ` Jani Nikula
@ 2015-02-10 21:43 ` shuang.he
  2015-02-11  8:28 ` Jani Nikula
  2 siblings, 0 replies; 4+ messages in thread
From: shuang.he @ 2015-02-10 21:43 UTC (permalink / raw)
  To: shuang.he, ethan.gao, intel-gfx, ville.syrjala

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5747
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV              +5-4              275/283              276/283
ILK              +1                 310/315              311/315
SNB              +2                 320/346              322/346
IVB                 -1              380/384              379/384
BYT                                  296/296              296/296
HSW              +3                 422/428              425/428
BDW                                  318/333              318/333
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt_gem_fence_thrash_bo-write-verify-none      PASS(2, M7)      FAIL(1, M7)
*PNV  igt_gem_fence_thrash_bo-write-verify-x      PASS(2, M7)      FAIL(1, M7)
*PNV  igt_gem_fence_thrash_bo-write-verify-y      PASS(3, M7)      FAIL(1, M7)
 PNV  igt_gem_userptr_blits_coherency-unsync      CRASH(2, M7)PASS(3, M7)      PASS(1, M7)
 PNV  igt_gem_userptr_blits_create-destroy-sync      NRUN(1, M7)PASS(4, M7)      PASS(1, M7)
 PNV  igt_gen3_render_linear_blits      FAIL(1, M7)PASS(2, M7)      PASS(1, M7)
 PNV  igt_gen3_render_mixed_blits      FAIL(2, M7)PASS(1, M7)      PASS(1, M7)
 PNV  igt_gen3_render_tiledx_blits      FAIL(1, M7)TIMEOUT(1, M7)PASS(3, M7)      PASS(1, M7)
*PNV  igt_gem_tiled_pread_pwrite      PASS(3, M7)      FAIL(1, M7)
*ILK  igt_drv_suspend_forcewake      DMESG_WARN(3, M26)      PASS(1, M26)
*SNB  igt_kms_flip_bo-too-big      BLACKLIST(1, M35)      PASS(1, M35)
*SNB  igt_kms_flip_bo-too-big-interruptible      BLACKLIST(1, M35)      PASS(1, M35)
 IVB  igt_gem_storedw_batches_loop_normal      DMESG_WARN(1, M4)PASS(3, M4)      DMESG_WARN(1, M4)
*HSW  igt_kms_flip_bo-too-big      BLACKLIST(1, M40)      PASS(1, M40)
*HSW  igt_kms_flip_bo-too-big-interruptible      BLACKLIST(1, M40)      PASS(1, M40)
 HSW  igt_kms_flip_plain-flip-fb-recreate-interruptible      TIMEOUT(4, M40)PASS(2, M40)      PASS(1, M40)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Really ignore long HPD pulses on eDP
  2015-02-10 12:11 [PATCH] drm/i915: Really ignore long HPD pulses on eDP ville.syrjala
  2015-02-10 12:29 ` Jani Nikula
  2015-02-10 21:43 ` shuang.he
@ 2015-02-11  8:28 ` Jani Nikula
  2 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-02-11  8:28 UTC (permalink / raw)
  To: ville.syrjala, intel-gfx; +Cc: Daniel Vetter

On Tue, 10 Feb 2015, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Return IRQ_HANDLED from intel_dp_hpd_pulse() to properly
> ignore the long HPD pulse on eDP to avoid the never ending
> VDD off->HPD->VDD on->VDD off->HPD... cycle.
>
> This fixes a regression intoduced by
>  commit b2c5c181ed18490648a02f8c7d562a3b9e8b96de
>  Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>  Date:   Fri Jan 23 06:00:31 2015 +0100
>
>     drm/i915: Use symbolic irqreturn for ->hpd_pulse
>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Pushed to drm-intel-next-fixes, thanks for the patch and review.

BR,
Jani.


> ---
> Jani, I decided against the goto out solution because it would have looked like
>  ret = IRQ_HANDLED;
>  goto out;
> which seemed a bit silly.
>
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 33b1b82..cc711ac 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4499,7 +4499,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
>  		 */
>  		DRM_DEBUG_KMS("ignoring long hpd on eDP port %c\n",
>  			      port_name(intel_dig_port->port));
> -		return false;
> +		return IRQ_HANDLED;
>  	}
>  
>  	DRM_DEBUG_KMS("got hpd irq on port %c - %s\n",
> -- 
> 2.0.5
>

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-11  8:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-10 12:11 [PATCH] drm/i915: Really ignore long HPD pulses on eDP ville.syrjala
2015-02-10 12:29 ` Jani Nikula
2015-02-10 21:43 ` shuang.he
2015-02-11  8:28 ` Jani Nikula

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.