Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBBC5C4361B for ; Tue, 15 Dec 2020 14:05:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E4602250F for ; Tue, 15 Dec 2020 14:05:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E4602250F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DB9D89CBE; Tue, 15 Dec 2020 14:05:59 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8121F89CBE for ; Tue, 15 Dec 2020 14:05:57 +0000 (UTC) IronPort-SDR: wDUEOuUAgthuY/QXldSHDO7ObuLvLiTAPFuvm2KrmlksoIZDvdHOylAbQBcE1UueW1+bWEIeYZ ehxieC9MeJ9w== X-IronPort-AV: E=McAfee;i="6000,8403,9835"; a="175024385" X-IronPort-AV: E=Sophos;i="5.78,421,1599548400"; d="scan'208";a="175024385" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 06:05:55 -0800 IronPort-SDR: /wKPP0arCZrXxS8XQA6W63bk8RQzk6n0YTvzJyuORYFM4H3pwf9wSsTOv7P+d5zJzX4CaR8Xml lZMRav7bMu+g== X-IronPort-AV: E=Sophos;i="5.78,421,1599548400"; d="scan'208";a="390691237" Received: from genxfsim-desktop.iind.intel.com ([10.223.74.178]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2020 06:05:53 -0800 From: Anshuman Gupta To: intel-gfx@lists.freedesktop.org Date: Tue, 15 Dec 2020 19:22:26 +0530 Message-Id: <20201215135226.16776-1-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Intel-gfx] [RFC] drm/i915/backlight: RFC cache backlight power state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This is RFC proposal to cache the backlight power state in order to avoid accessing pps register every time while brightness or bl_power attributes of class intel_backlight is being changed. Signed-off-by: Anshuman Gupta --- .../gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++-------- drivers/gpu/drm/i915/display/intel_panel.c | 8 +++++++- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 5bc5bfbc4551..7c12b66c11af 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -263,6 +263,7 @@ struct intel_panel { struct backlight_device *device; const struct intel_panel_bl_funcs *funcs; + bool bl_powered; void (*power)(struct intel_connector *, bool enable); } backlight; }; diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index b2bc0c8c39c7..73536e377c20 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3398,6 +3398,8 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(conn_state->best_encoder)); + struct intel_connector *connector = to_intel_connector(conn_state->connector); + struct intel_panel *panel = &connector->panel; struct drm_i915_private *i915 = dp_to_i915(intel_dp); if (!intel_dp_is_edp(intel_dp)) @@ -3407,6 +3409,9 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, intel_panel_enable_backlight(crtc_state, conn_state); _intel_edp_backlight_on(intel_dp); + mutex_lock(&i915->backlight_lock); + panel->backlight.bl_powered = true; + mutex_unlock(&i915->backlight_lock); } /* Disable backlight in the panel power control. */ @@ -3437,6 +3442,8 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp) void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state) { struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)); + struct intel_connector *connector = to_intel_connector(old_conn_state->connector); + struct intel_panel *panel = &connector->panel; struct drm_i915_private *i915 = dp_to_i915(intel_dp); if (!intel_dp_is_edp(intel_dp)) @@ -3445,6 +3452,9 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state) drm_dbg_kms(&i915->drm, "\n"); _intel_edp_backlight_off(intel_dp); + mutex_lock(&i915->backlight_lock); + panel->backlight.bl_powered = false; + mutex_unlock(&i915->backlight_lock); intel_panel_disable_backlight(old_conn_state); } @@ -3457,14 +3467,6 @@ static void intel_edp_backlight_power(struct intel_connector *connector, { struct drm_i915_private *i915 = to_i915(connector->base.dev); struct intel_dp *intel_dp = intel_attached_dp(connector); - intel_wakeref_t wakeref; - bool is_enabled; - - is_enabled = false; - with_pps_lock(intel_dp, wakeref) - is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE; - if (is_enabled == enable) - return; drm_dbg_kms(&i915->drm, "panel power control backlight %s\n", enable ? "enable" : "disable"); diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c index 36b7693453ae..9f81edf25475 100644 --- a/drivers/gpu/drm/i915/display/intel_panel.c +++ b/drivers/gpu/drm/i915/display/intel_panel.c @@ -1282,6 +1282,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta static int intel_backlight_device_update_status(struct backlight_device *bd) { struct intel_connector *connector = bl_get_data(bd); + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct intel_panel *panel = &connector->panel; struct drm_device *dev = connector->base.dev; @@ -1301,7 +1302,12 @@ static int intel_backlight_device_update_status(struct backlight_device *bd) if (panel->backlight.power) { bool enable = bd->props.power == FB_BLANK_UNBLANK && bd->props.brightness != 0; - panel->backlight.power(connector, enable); + mutex_lock(&dev_priv->backlight_lock); + if (enable != panel->backlight.bl_powered) { + panel->backlight.power(connector, enable); + panel->backlight.bl_powered = enable; + } + mutex_unlock(&dev_priv->backlight_lock); } } else { bd->props.power = FB_BLANK_POWERDOWN; -- 2.26.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx