From patchwork Wed Jun 15 12:18:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9178379 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 135206021C for ; Wed, 15 Jun 2016 12:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0492827C26 for ; Wed, 15 Jun 2016 12:19:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDD2727D4A; Wed, 15 Jun 2016 12:19:11 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFFB927C26 for ; Wed, 15 Jun 2016 12:19:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 844E86E92C; Wed, 15 Jun 2016 12:19:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 643506E921 for ; Wed, 15 Jun 2016 12:18:58 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id k184so5531807wme.2 for ; Wed, 15 Jun 2016 05:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UOejE680fyhNLj/WBUn5KdqKInoTEGyovLcaf9MFRYU=; b=pTqKMomqJ6I5Ylqu/pERL8E4z1Kj1iYSMYjY1+hZcaQ8Ebs2M10GDiJnSyYerKGQZP piqs3bWxYqoYnrWygms5p74OJP5vFxa26kmZs+ERAGhbp2E4444yKCOthY558pmU5ZCb zdDrOfujsb+vW2CL4DSWDJSIrQGE7WakG2Om20y7TtcMdTHMX355GUfJ5VAy4NGYJbat cMBQafVyrnQ2abT660mJ895vfVCqkgRQ6wHUqVP69M5U0jC5IxylCnCUK/lesY+ThyWv 52EtW0HCFVNYFoVRjLC41lT4ahnbO18YJ/tdyHY6ykDYox7nASGZibjQeFQbHTGjhB7I Ikcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UOejE680fyhNLj/WBUn5KdqKInoTEGyovLcaf9MFRYU=; b=GSgqZJsYtlS759lNBWE52OQY/UmtAmtR4Fu2W9J1KrUSe4uDl3a0kPEigJqy740Vsb be+TyTdSF6mzrwv2LlQgfi2huI/4M8FnXjfFQsBrfrVV6XOkPrNYD1DgspH5nM5T3a3L ksxb1ekuH8jTtdYEzl9iyeJLV35ZhrZ/s2FNle4jDkh1sKoEeB3Zzulf6noMTYHKs971 GDTEBS7YSbEVTqWcexOWd/xQCxb/Ga6u1cqdQzc9TLI99CV/CDL79e1boQZseKWJe4Dn CB8+2ecKp4Hjlr0LYsboWrL9cy9UR56oS/4i1FbEyNR8vQRozrnFq6M9pRH29LU+mwBr 5olQ== X-Gm-Message-State: ALyK8tLnJmwBCXAed1hbLeaV8Q2rDKSl/WSoNIkOnIo6HjDTNw6A1/i+RxLSpRiqC1yMTw== X-Received: by 10.28.97.4 with SMTP id v4mr11452483wmb.71.1465993136291; Wed, 15 Jun 2016 05:18:56 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id jf3sm7450242wjb.41.2016.06.15.05.18.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 05:18:55 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 15 Jun 2016 13:18:00 +0100 Message-Id: <1465993109-19523-16-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 15/44] drm/i915: Make panel/backlight safe to setup/cleanup multiple times X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Allow everyone to call intel_panel_setup_backlight() (i.e. only take effect if we have previously been initialised for use as a panel) and, for paranoia, allow intel_panel_cleanup_backlight() to be called multiple times. Signed-off-by: Chris Wilson Cc: Jani Nikula --- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_panel.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 8dc67adace6b..111038e29ec3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -201,6 +201,7 @@ struct intel_panel { struct drm_display_mode *fixed_mode; struct drm_display_mode *downclock_mode; int fitting_mode; + bool is_panel; /* backlight */ struct { diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index f0b1602c3258..8bd076b11af1 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -1670,6 +1670,9 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe) struct intel_panel *panel = &intel_connector->panel; int ret; + if (!panel->is_panel) + return 0; + if (!dev_priv->vbt.backlight.present) { if (dev_priv->quirks & QUIRK_BACKLIGHT_PRESENT) { DRM_DEBUG_KMS("no backlight present per VBT, but present per quirk\n"); @@ -1709,6 +1712,9 @@ void intel_panel_destroy_backlight(struct drm_connector *connector) struct intel_connector *intel_connector = to_intel_connector(connector); struct intel_panel *panel = &intel_connector->panel; + if (!panel->backlight.present) + return; + /* dispose of the pwm */ if (panel->backlight.pwm) pwm_put(panel->backlight.pwm); @@ -1796,6 +1802,7 @@ int intel_panel_init(struct intel_panel *panel, panel->fixed_mode = fixed_mode; panel->downclock_mode = downclock_mode; + panel->is_panel = true; return 0; }