From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.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 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 13E79C4743E for ; Fri, 4 Jun 2021 17:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7C0F61402 for ; Fri, 4 Jun 2021 17:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230398AbhFDRc7 (ORCPT ); Fri, 4 Jun 2021 13:32:59 -0400 Received: from mga04.intel.com ([192.55.52.120]:23716 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229878AbhFDRc6 (ORCPT ); Fri, 4 Jun 2021 13:32:58 -0400 IronPort-SDR: 4wgV+ITYdVda5LkbSNsCZPB7A6U7LIgRq3T94y+AQqphsZew3w/pn4DBf+sM09m8oLvLsM5+0l DvVI7y1q+GFg== X-IronPort-AV: E=McAfee;i="6200,9189,10005"; a="202476723" X-IronPort-AV: E=Sophos;i="5.83,248,1616482800"; d="scan'208";a="202476723" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2021 10:30:59 -0700 IronPort-SDR: E6f8vel3p5Bo3KoNnpIKKX3N7n331JqiLdiBnwP8qXAgkaOWsthLpEHPipQE1fQ/cLpudqh2py spnGTxfVCyjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,248,1616482800"; d="scan'208";a="412432857" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga007.fm.intel.com with SMTP; 04 Jun 2021 10:30:53 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 04 Jun 2021 20:30:52 +0300 Date: Fri, 4 Jun 2021 20:30:52 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Werner Sembach Cc: harry.wentland@amd.com, sunpeng.li@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@linux.ie, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: Re: [PATCH 4/4] drm/i915/display: Add handling for new "active bpc" property Message-ID: References: <20210604171723.10276-1-wse@tuxedocomputers.com> <20210604171723.10276-5-wse@tuxedocomputers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210604171723.10276-5-wse@tuxedocomputers.com> X-Patchwork-Hint: comment Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 04, 2021 at 07:17:23PM +0200, Werner Sembach wrote: > This commits implements the "active bpc" drm property for the Intel GPU driver. > > Signed-off-by: Werner Sembach > --- > drivers/gpu/drm/i915/display/intel_display.c | 13 +++++++++++++ > drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++++-- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +++- > drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +++- > 4 files changed, 25 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 64e9107d70f7..f7898d9d7438 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -10164,6 +10164,8 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) > struct drm_i915_private *dev_priv = to_i915(dev); > struct intel_crtc_state *new_crtc_state, *old_crtc_state; > struct intel_crtc *crtc; > + struct drm_connector *connector; > + struct drm_connector_state *new_conn_state; > u64 put_domains[I915_MAX_PIPES] = {}; > intel_wakeref_t wakeref = 0; > int i; > @@ -10324,6 +10326,17 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) > } > intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref); > > + /* Extract information from crtc to communicate it to userspace as connector properties */ > + for_each_new_connector_in_state(&state->base, connector, new_conn_state, i) { > + struct drm_crtc *crtc = new_conn_state->crtc; > + if (crtc) { > + new_crtc_state = to_intel_crtc_state(drm_atomic_get_new_crtc_state(&state->base, crtc)); intel_atomic_get_new_crtc_state() > + new_conn_state->active_bpc = new_crtc_state->pipe_bpp / 3; > + } > + else > + new_conn_state->active_bpc = 0; > + } This also seems too late. I think the whole thing should be done somewhere around the normal swap_state() stuff. > + > /* > * Defer the cleanup of the old state to a separate worker to not > * impede the current task (userspace for blocking modesets) that > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 642c60f3d9b1..67826ba976ed 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4671,10 +4671,14 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect > intel_attach_force_audio_property(connector); > > intel_attach_broadcast_rgb_property(connector); > - if (HAS_GMCH(dev_priv)) > + if (HAS_GMCH(dev_priv)) { > drm_connector_attach_max_bpc_property(connector, 6, 10); > - else if (DISPLAY_VER(dev_priv) >= 5) > + drm_connector_attach_active_bpc_property(connector, 6, 10); > + } > + else if (DISPLAY_VER(dev_priv) >= 5) { > drm_connector_attach_max_bpc_property(connector, 6, 12); > + drm_connector_attach_active_bpc_property(connector, 6, 12); > + } > > /* Register HDMI colorspace for case of lspcon */ > if (intel_bios_is_lspcon_present(dev_priv, port)) { > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 2daa3f67791e..5a1869dc2210 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -844,8 +844,10 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > */ > connector->max_bpc_property = > intel_dp->attached_connector->base.max_bpc_property; > - if (connector->max_bpc_property) > + if (connector->max_bpc_property) { > drm_connector_attach_max_bpc_property(connector, 6, 12); > + drm_connector_attach_active_bpc_property(connector, 6, 12); > + } > > return connector; > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index d69f0a6dc26d..8af78b27b6ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -2463,8 +2463,10 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c > drm_object_attach_property(&connector->base, > connector->dev->mode_config.hdr_output_metadata_property, 0); > > - if (!HAS_GMCH(dev_priv)) > + if (!HAS_GMCH(dev_priv)) { > drm_connector_attach_max_bpc_property(connector, 8, 12); > + drm_connector_attach_active_bpc_property(connector, 8, 12); > + } > } > > /* > -- > 2.25.1 -- Ville Syrjälä Intel