From patchwork Fri Jun 24 07:00:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9196779 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 0514460871 for ; Fri, 24 Jun 2016 07:00:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E952E28496 for ; Fri, 24 Jun 2016 07:00:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCB7228499; Fri, 24 Jun 2016 07:00:58 +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 19F1528496 for ; Fri, 24 Jun 2016 07:00:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 661216EA47; Fri, 24 Jun 2016 07:00:56 +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 F37BB6E2DA for ; Fri, 24 Jun 2016 07:00:53 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id 187so2586744wmz.1 for ; Fri, 24 Jun 2016 00:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=wmVR+hvJcKBSjtHnoOVHxXbqxkzTggLVkAFJSDGy8M4=; b=s9F1rEObgXLSi08vqt0E0lwAWTB9r6z58t9BjWIh7XKGfgiWJ2ZBvpK8QEB6NhuHOY U6iu613obTAWVupYfAlJTHw0+8I6e07UZMxkaGp/H4zzKVFD0GENbOmZeTz4HuXksSYA wECx2CaYPoGMFn1BU8l666m/a5Rz0CceZJ/lYEVx9BJUkjE9dHb8Kl3MkKM+UkA1GNeY 96IBhF80xqHSdPdTfXVPeZ4wZ6yKsBMvihwM/rb200N94OHRuvGQPk2jBE385bVJUkfL 5Eie5qEF3KtZ9JkMFzR2cv73jUhtyakK49pGMFYt4WCGcLiwcLb74H9PYw76hl3hxgLT 9PTQ== 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:subject:date:message-id :mime-version:content-transfer-encoding; bh=wmVR+hvJcKBSjtHnoOVHxXbqxkzTggLVkAFJSDGy8M4=; b=bVGLD9ZucT1ENG91k1wzPbkjHvIO3KYNq0kPnsTbN9eH9x9Th9TFH7h93hl8EMVAU8 AoHEGnHp84IeOqG1efI+RuvW+xXjcxgxw7VKv359+qXuVWGUB8oRNHwuEB2C/nGiRfqI FiHhHaPNmd9iC4Pk36nyRjMo1CToBVF9gXXELSu3hWrqc0sbAW6Mv1HXgvXuS79Vsa7n EyquOzud5PJgLN5HUGAHipp221isDY9tRSxlxPEkWNHFbTuAuJOED4pIt9K1n4xippMJ wAYemVlebihsqiV61wcmLRyj8DPxufrkANY0r8pHxz47xPO3LOdy2HAQN2inMtHZzAHt BKVA== X-Gm-Message-State: ALyK8tIiwVz6VAlNRXRxphFhLWIY3ZykNqXOfgP/VnONtmmv39uk0DlrmQSNdiQuuAsyPw== X-Received: by 10.28.54.147 with SMTP id y19mr4253930wmh.68.1466751652260; Fri, 24 Jun 2016 00:00:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t188sm1621708wma.8.2016.06.24.00.00.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jun 2016 00:00:51 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Jun 2016 08:00:32 +0100 Message-Id: <1466751645-6529-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Subject: [Intel-gfx] [CI 01/14] drm/i915: Move panel's backlight setup next to panel init 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Currently setting up the backlight for a panel is sometimes done together with initialising the panel, and sometimes after the connector is registered. The backlight setup does not depend upon connector registration (i.e. access to sysfs/debugfs and the kobject hierachy) so perform it consistently just after panel initialisation. Note the discrepancy here as destroying the panel is done during connector unregistration... Signed-off-by: Chris Wilson Cc: Jani Nikula Cc: Ville Syrjälä Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_dsi.c | 3 +-- drivers/gpu/drm/i915/intel_lvds.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1f82dccfcd58..ca2de043b9ce 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1496,7 +1496,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *crtc, int fitting_mode); void intel_panel_set_backlight_acpi(struct intel_connector *connector, u32 level, u32 max); -int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe); +int intel_panel_setup_backlight(struct drm_connector *connector, + enum pipe pipe); void intel_panel_enable_backlight(struct intel_connector *connector); void intel_panel_disable_backlight(struct intel_connector *connector); void intel_panel_destroy_backlight(struct drm_connector *connector); diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index b444d0e35a98..ae2dcaf1b52e 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -1587,13 +1587,12 @@ void intel_dsi_init(struct drm_device *dev) connector->display_info.height_mm = fixed_mode->height_mm; intel_panel_init(&intel_connector->panel, fixed_mode, NULL); + intel_panel_setup_backlight(connector, INVALID_PIPE); intel_dsi_add_properties(intel_connector); drm_connector_register(connector); - intel_panel_setup_backlight(connector, INVALID_PIPE); - return; err: diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 935b53642948..6306c5499587 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -1120,6 +1120,7 @@ out: mutex_unlock(&dev->mode_config.mutex); intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); + intel_panel_setup_backlight(connector, INVALID_PIPE); lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder); DRM_DEBUG_KMS("detected %s-link lvds configuration\n", @@ -1134,8 +1135,6 @@ out: } drm_connector_register(connector); - intel_panel_setup_backlight(connector, INVALID_PIPE); - return; failed: