From patchwork Fri May 5 17:46:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puthikorn Voravootivat X-Patchwork-Id: 9713991 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 BADEF60362 for ; Fri, 5 May 2017 17:47:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF3DB285E7 for ; Fri, 5 May 2017 17:47:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A41DF28663; Fri, 5 May 2017 17:47:29 +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]) (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 13731285E7 for ; Fri, 5 May 2017 17:47:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B95326E709; Fri, 5 May 2017 17:47:28 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg0-x232.google.com (mail-pg0-x232.google.com [IPv6:2607:f8b0:400e:c05::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D8756E709 for ; Fri, 5 May 2017 17:47:27 +0000 (UTC) Received: by mail-pg0-x232.google.com with SMTP id q4so6236116pga.3 for ; Fri, 05 May 2017 10:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=UDXzCDMYNcDGyE7aqggq3PVKEVDT5qNV3Rggpe54+Ds=; b=v3iI8h7kFJXd/kVTaTn+H5VdCgwpt8aVfCJwDd+DqiBElJa4m1a2g8RTOlezU1q+rm pnruIYpPMtXTgz1QAG6/McZw7fLz5AQ0oLwNbmjTsiGVX3rk1riU/QmClkOlDgu/lpr3 I3tWgcnRqSdBt4GVsxZ7vmLOhZAN/qWByo/bA+ARYI0sZbS7A5XZxvwWUFTHU9QDq/6j qO6nun5BF3Smtnno2bs3mrQLJ+aPPH8PBiWcpugE20eDJaFO41wpubXGMiozTzeMQnmr UIzFsTB1jvzc7+4PlI2766sCXqv+Z5/cxFo8ofv/USafKsHG7eyLLvpdCbSKbaJmB6mY GkrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=UDXzCDMYNcDGyE7aqggq3PVKEVDT5qNV3Rggpe54+Ds=; b=TpdeFNOBbW8N9/L4IWUrJy9ipkkLO8Tcfi72MZ8L0ivAQuSPfwvzQuOrE7Q4pmt8xR mcnyqXZP4WpHg2eNv98cl2SmKMQKJcLwaKqBMcVKM1ZdpVvPP0GAH69lKzo/95+X0YFM inTnm/vNWYJBxCw2KVce9JUHp0tdeMtuUhe4hyW82pv/IpeE3gLM4kWmKfFNUlksrSFk w6RZ6pOPq7qMe578Y3E6N7xp+BCpNr/zh+qBr/wTer5mgiaNQ/bzaLt1ykGjLoGRA+c0 exvZGzhV46gD6fvOdbNfal/Vs5QnLstfXa1RdlW/TYzffGKkHO0+xp6aMvHilp964R/W UVRA== X-Gm-Message-State: AN3rC/6aNnDX18+cBQ8HVhcE1Mt2FVlk8Zqku/SNS6rbUaKs2WKOJ2DE 22qHnVN+WaKZtupTTkACknqN X-Received: by 10.84.224.200 with SMTP id k8mr44089906pln.49.1494006446870; Fri, 05 May 2017 10:47:26 -0700 (PDT) Received: from puthik2.mtv.corp.google.com ([2620:0:1000:1301:419f:ac09:768:254c]) by smtp.gmail.com with ESMTPSA id g7sm11005691pfe.6.2017.05.05.10.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 May 2017 10:47:26 -0700 (PDT) Received: by puthik2.mtv.corp.google.com (Postfix, from userid 218808) id 54CD111F885; Fri, 5 May 2017 10:47:25 -0700 (PDT) From: Puthikorn Voravootivat To: intel-gfx@lists.freedesktop.org, Jani Nikula Date: Fri, 5 May 2017 10:46:38 -0700 Message-Id: <20170505174638.150614-1-puthik@chromium.org> X-Mailer: git-send-email 2.13.0.rc1.294.g07d810a77f-goog Cc: Puthikorn Voravootivat Subject: [Intel-gfx] [PATCH v6 4/9] drm/i915: Allow choosing how to adjust brightness if both supported 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 Add option to allow choosing how to adjust brightness if panel supports both PWM pin and AUX channel. Signed-off-by: Puthikorn Voravootivat --- Fix compile error in v5 drivers/gpu/drm/i915/i915_params.c | 8 +++++--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index b6a7e363d076..13cf3f1572ab 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -63,7 +63,7 @@ struct i915_params i915 __read_mostly = { .huc_firmware_path = NULL, .enable_dp_mst = true, .inject_load_failure = 0, - .enable_dpcd_backlight = false, + .enable_dpcd_backlight = -1, .enable_gvt = false, }; @@ -246,9 +246,11 @@ MODULE_PARM_DESC(enable_dp_mst, module_param_named_unsafe(inject_load_failure, i915.inject_load_failure, uint, 0400); MODULE_PARM_DESC(inject_load_failure, "Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)"); -module_param_named(enable_dpcd_backlight, i915.enable_dpcd_backlight, bool, 0600); +module_param_named(enable_dpcd_backlight, i915.enable_dpcd_backlight, int, 0600); MODULE_PARM_DESC(enable_dpcd_backlight, - "Enable support for DPCD backlight control (default:false)"); + "Enable support for DPCD backlight control " + "(-1:disable (default), 0:Use PWM pin if both supported, " + "1:Use DPCD if both supported"); module_param_named(enable_gvt, i915.enable_gvt, bool, 0400); MODULE_PARM_DESC(enable_gvt, diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index 34148cc8637c..ac02efce6e22 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -66,7 +66,7 @@ func(bool, verbose_state_checks); \ func(bool, nuclear_pageflip); \ func(bool, enable_dp_mst); \ - func(bool, enable_dpcd_backlight); \ + func(int, enable_dpcd_backlight); \ func(bool, enable_gvt) #define MEMBER(T, member) T member diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c index 5b83c9737644..e82f7cb9a7af 100644 --- a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c @@ -175,11 +175,26 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector) return false; } +static bool +intel_dp_pwm_pin_display_control_capable(struct intel_connector *connector) +{ + struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base); + + /* Check the eDP Display control capabilities registers to determine if + * the panel can support backlight control via BL_PWM_DIM eDP pin + */ + return intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP; +} + int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) { struct intel_panel *panel = &intel_connector->panel; - if (!i915.enable_dpcd_backlight) + if (i915.enable_dpcd_backlight == -1) + return -ENODEV; + + if (i915.enable_dpcd_backlight == 0 && + intel_dp_pwm_pin_display_control_capable(intel_connector)) return -ENODEV; if (!intel_dp_aux_display_control_capable(intel_connector))