From patchwork Wed Oct 10 12:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10634519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AADBF679F for ; Wed, 10 Oct 2018 12:39:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A2D729E7C for ; Wed, 10 Oct 2018 12:39:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E5C029E93; Wed, 10 Oct 2018 12:39:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 14D1E29E7C for ; Wed, 10 Oct 2018 12:39:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5DC689C9A; Wed, 10 Oct 2018 12:39:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id D25CB89C9A for ; Wed, 10 Oct 2018 12:38:56 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 14055868-1500050 for multiple; Wed, 10 Oct 2018 13:38:33 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Oct 2018 13:38:33 +0100 Message-Id: <20181010123833.16797-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Intel-gfx] [CI] drm/i915: Inject a failure point when registering a connector X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Check we can handle a late display load failure where the final act of registering the connector fails. Signed-off-by: Chris Wilson Cc: Jani Nikula Cc: Ville Syrjala Cc: Daniel Vetter Cc: Maarten Lankhorst Reviewed-by: Maarten Lankhorst Acked-by: Jani Nikula --- drivers/gpu/drm/i915/intel_connector.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c index d56f50a6f5a0..598d5cb9b657 100644 --- a/drivers/gpu/drm/i915/intel_connector.c +++ b/drivers/gpu/drm/i915/intel_connector.c @@ -107,8 +107,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; }