[PATCH] drm/i915: Inject a failure point when registering a connector

[PATCH] drm/i915: Inject a failure point when registering a connector

[Chris Wilson]

Check we can handle a late display load failure where the final act of
registering the connector fails.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fd27b9b0b4d8..c24314da741b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15867,8 +15867,15 @@ int intel_connector_register(struct drm_connector *connector)
 	if (ret)
 		goto err;
 
+	if (i915_inject_load_failure()) {
+		ret = -EFAULT;
+		goto err_backlight;
+	}
+
 	return 0;
 
+err_backlight:
+	intel_backlight_device_unregister(intel_connector);
 err:
 	return ret;
 }
-- 
2.19.1

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

Re: [PATCH] drm/i915: Inject a failure point when registering a connector

[Maarten Lankhorst]

Op 10-10-18 om 13:50 schreef Chris Wilson:
> Check we can handle a late display load failure where the final act of
> registering the connector fails.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fd27b9b0b4d8..c24314da741b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15867,8 +15867,15 @@ int intel_connector_register(struct drm_connector *connector)
>  	if (ret)
>  		goto err;
>  
> +	if (i915_inject_load_failure()) {
> +		ret = -EFAULT;
> +		goto err_backlight;
> +	}
> +
>  	return 0;
>  
> +err_backlight:
> +	intel_backlight_device_unregister(intel_connector);
>  err:
>  	return ret;
>  }

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

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

Re: [PATCH] drm/i915: Inject a failure point when registering a connector

[Jani Nikula]

On Wed, 10 Oct 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Check we can handle a late display load failure where the final act of
> registering the connector fails.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Acked-by: Jani Nikula <jani.nikula@intel.com>

Though this'll need to be rebased as soon as I get CI results and merge
[1].

BR,
Jani.



[1] http://patchwork.freedesktop.org/patch/msgid/20181010075205.7713-2-jani.nikula@intel.com


> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fd27b9b0b4d8..c24314da741b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15867,8 +15867,15 @@ int intel_connector_register(struct drm_connector *connector)
>  	if (ret)
>  		goto err;
>  
> +	if (i915_inject_load_failure()) {
> +		ret = -EFAULT;
> +		goto err_backlight;
> +	}
> +
>  	return 0;
>  
> +err_backlight:
> +	intel_backlight_device_unregister(intel_connector);
>  err:
>  	return ret;
>  }

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

Re: [PATCH] drm/i915: Inject a failure point when registering a connector

[Chris Wilson]

Quoting Jani Nikula (2018-10-10 13:10:51)
> On Wed, 10 Oct 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Check we can handle a late display load failure where the final act of
> > registering the connector fails.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Cc: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> 
> Acked-by: Jani Nikula <jani.nikula@intel.com>
> 
> Though this'll need to be rebased as soon as I get CI results and merge
> [1].

Yup, and that's being optimistic the error paths are foolproof :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Inject a failure point when registering a connector

[Patchwork]

== Series Details ==

Series: drm/i915: Inject a failure point when registering a connector
URL   : https://patchwork.freedesktop.org/series/50797/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4960 -> Patchwork_10410 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/50797/revisions/1/mbox/

== Known issues ==

  Here are the changes found in Patchwork_10410 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_frontbuffer_tracking@basic:
      fi-byt-clapper:     PASS -> FAIL (fdo#103167)

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362)

    
    ==== Possible fixes ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
      fi-byt-clapper:     FAIL (fdo#107362, fdo#103191) -> PASS

    
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362


== Participating hosts (46 -> 42) ==

  Additional (1): fi-pnv-d510 
  Missing    (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-icl-u2 fi-hsw-4200u 


== Build changes ==

    * Linux: CI_DRM_4960 -> Patchwork_10410

  CI_DRM_4960: 7ae91656412c0a8f7987eb6478dc03cc0486bc59 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4673: 54cb1aeb4e50dea9f3abae632e317875d147c4ab @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10410: 99ac75c0b2af76357a37ed691e22de5e40f3da9c @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

99ac75c0b2af drm/i915: Inject a failure point when registering a connector

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10410/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx