From patchwork Mon May 30 08:38:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9140449 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 BC92160759 for ; Mon, 30 May 2016 08:39:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B32C527D17 for ; Mon, 30 May 2016 08:39:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A80512821C; Mon, 30 May 2016 08:39:26 +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 6C5EC27D17 for ; Mon, 30 May 2016 08:39:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F03356E6C9; Mon, 30 May 2016 08:39:02 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24CD76E6CE for ; Mon, 30 May 2016 08:38:59 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n129so20274744wmn.1 for ; Mon, 30 May 2016 01:38:59 -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=XMmi4VZrGBfTJqaoYg4r5Wk5RnXIVTM/o3Uvt96FvAI=; b=b26sWrntM2f8aNk8vdrKuAQ0g9b2H81Y5e/r3jOCxWPQfps1V4F4Cqm+mx0PQDVt7h M8UzaPIZIVbDdVivl3OTImjO0pzoSbhkDpNwXhijIrNH3mJrNSsrRzAaon4Vs6bNuBcp KLQ34RlMvj+r8zvOEmTOWz+bblwZn8kpplZAPLXyvDkFY8r5xUUmN6EKjuvMdTKQhaO4 9Atm0VgfI/daf7PUXTXkFzPDk7k8zjbMMUzy/OXtjc7k3oEeyaZ9H7J+lyLDd1s5tI35 S2kq5LcZ7RWhTfaSBrSJG7hgAvku/oIRqakpXlN0vGaCJsAu/T2h+rQfQAdwssLVCSLz enxg== 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=XMmi4VZrGBfTJqaoYg4r5Wk5RnXIVTM/o3Uvt96FvAI=; b=jc6HFQg3h6vHdwvtJv8IfXkdEiW+r/+qI2wGFI+prdwChslw3u+I0oO1qHT2bDjfXx CKc2cczDGc0I4YqqQ0kbjsvblBh9O2GRl3nMwNhVHzFiQbOmmju5fkZn0AjI1IKIvfcB wkZ/RjOfN3uuaL43QlSKG1ZR9bvt0wcWYmFa3klqd7SyqagN3BmFutG0fLQY78wUpUK3 W/vbZpP/gOGJZJjE4CC0nTb3uGpmJL/jTodnLOjxPdo0O22uDnjEdwTxPS7TPropKYAc K28hNZj9iXzBKfMP5Z9FjSA5RAEOoDyrmwCS2DO320aPiWJA7jdJrwjzrPTx9g+ShWe9 74Ow== X-Gm-Message-State: ALyK8tI+MvcT0SZ500PPRQw0o1MqUuFndm6XXBZRdU3R04Ll8EhfArP9RLKgsUaIDrbzGA== X-Received: by 10.28.35.67 with SMTP id j64mr10373247wmj.77.1464597537051; Mon, 30 May 2016 01:38:57 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id l9sm6945376wjm.0.2016.05.30.01.38.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 May 2016 01:38:56 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 30 May 2016 09:38:25 +0100 Message-Id: <1464597519-16659-8-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464597519-16659-1-git-send-email-chris@chris-wilson.co.uk> References: <1464597519-16659-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 07/21] 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 --- 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 9b5f6634c558..8dc22d0afafc 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 efaee7a7f933..0c4111880605 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -1664,6 +1664,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"); @@ -1703,6 +1706,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); @@ -1790,6 +1796,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; }