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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 985A3C47094 for ; Mon, 7 Jun 2021 20:34:03 +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 1F90861139 for ; Mon, 7 Jun 2021 20:34:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F90861139 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tuxedocomputers.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42F966E9FD; Mon, 7 Jun 2021 20:34:02 +0000 (UTC) Received: from srv6.fidu.org (srv6.fidu.org [159.69.62.71]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AA4B6E9FC; Mon, 7 Jun 2021 20:34:01 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by srv6.fidu.org (Postfix) with ESMTP id ABF33C800EB; Mon, 7 Jun 2021 22:33:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at srv6.fidu.org Received: from srv6.fidu.org ([127.0.0.1]) by localhost (srv6.fidu.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id m8ADLpTJUMYx; Mon, 7 Jun 2021 22:33:59 +0200 (CEST) Received: from [IPv6:2003:e3:7f4f:6000:f5f4:4cdd:8015:9770] (p200300e37F4f6000F5F44cDd80159770.dip0.t-ipconnect.de [IPv6:2003:e3:7f4f:6000:f5f4:4cdd:8015:9770]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: wse@tuxedocomputers.com) by srv6.fidu.org (Postfix) with ESMTPSA id E768CC800E8; Mon, 7 Jun 2021 22:33:57 +0200 (CEST) From: Werner Sembach Subject: Re: [PATCH 4/4] drm/i915/display: Add handling for new "active bpc" property To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= References: <20210604171723.10276-1-wse@tuxedocomputers.com> <20210604171723.10276-5-wse@tuxedocomputers.com> Message-ID: <96d10ed0-f8a2-1d0b-62dd-9d6173722506@tuxedocomputers.com> Date: Mon, 7 Jun 2021 22:33:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: amd-gfx@lists.freedesktop.org, tzimmermann@suse.de, sunpeng.li@amd.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, rodrigo.vivi@intel.com, alexander.deucher@amd.com, christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Am 07.06.21 um 08:47 schrieb Werner Sembach: > > Am 04.06.21 um 19:30 schrieb Ville Syrjälä: >> 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() > Thanks, will use that. >> >>> + 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. > Ok, will look into it. So I tried to put it in intel_atomic_commit() after drm_atomic_helper_swap_state() and before INIT_WORK(&state->base.commit_work, intel_atomic_commit_work) (which creates a worker for intel_atomic_commit_tail), but somewhere in between, the connector_state seems to change: The bpc written with the for_each_new_connector_in_state() loop, gets discarded. >> >>> + >>>       /* >>>        * 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 > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx