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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 356C1CE7A88 for ; Sun, 24 Sep 2023 10:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbjIXK3O (ORCPT ); Sun, 24 Sep 2023 06:29:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbjIXK3N (ORCPT ); Sun, 24 Sep 2023 06:29:13 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38E69E7 for ; Sun, 24 Sep 2023 03:29:07 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5310a63cf7bso5399617a12.1 for ; Sun, 24 Sep 2023 03:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695551345; x=1696156145; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Nbc4SBJzI3SAAZeeJhZ6/5GW5H6amKESEP+VIUjBVso=; b=QvYxtZ2OfXrZTeOvsQr2vL05UeM1mbQtHC6ika4nNtous7CoHYGumOc9hXKxm3KCW/ u4ATcVOGV0WX6bmKM0Y7/e9kx0FXsZdzh4CPwbbNP1+TVydpCQ/ckkFe0SMIF3r2GMz+ 3t95JZpypzaLuhgYPONUtgJ5GdX6kULi+LQrmP7hHbLPERzWg6F8LYPjn0G2/lFkT92/ Kj5MDPL7iEWYmkwyLoxKa6yZRGckWifjP7/pwAJxH1Hwl1MFM1/sm1MoiwrhPxE0qKph eYDjyLjsZH6tIBso1bKDW9p8/EGHpFxJ3COVYzHyvR98GuvYPnAkb2kX8QM1J6D6O0BH ldnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695551345; x=1696156145; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Nbc4SBJzI3SAAZeeJhZ6/5GW5H6amKESEP+VIUjBVso=; b=wp/wmL+y/sYhYYUG1XOWb7Jw/No8Te89jEnPiw9cloZaB/D4VjGrnW0+aCjru4aQf3 4Tyjxd6TQU7JOHN5mhWnZ2HJ6IizNHGO62B+pGw/iyIEZFgy2yOkxPsyWQhmVRz99pGO 6i732ll13GRhqHPr80Yqbbo/pkEgrL4YjUS9CJv8J5vyFFIYPaAEJdm4h19YuQRVYEJQ y0ngIMH6fsfiw4QAkPnNWIhLVKbMAqiHgQWeIC35VxcligcLH1SO+pUsAlOXbBz/GW6j wmw+0ZtCMbZPsTDMqcBOrgwEaFPzOWDvtdx2b8ARsk7Jm4mKJDEiqhSp3Y2rt582oXhn WMzA== X-Gm-Message-State: AOJu0Yw5bRj4x870m0Iei7cSU5s+SkV1Otaf23r4NsFz1b39wpaaDwNa ruoxLEPXkb6XALRw+zJgE0JP7g== X-Google-Smtp-Source: AGHT+IF6bAns8yGi5kzdcAwLnOHgRn70eXm2R80TU2tam3x1oqVlcLZLihzPzFGSyzauBV4H3GJ8ew== X-Received: by 2002:aa7:db99:0:b0:525:680a:6b89 with SMTP id u25-20020aa7db99000000b00525680a6b89mr3206467edt.12.1695551345403; Sun, 24 Sep 2023 03:29:05 -0700 (PDT) Received: from [10.73.151.44] ([188.111.42.10]) by smtp.gmail.com with ESMTPSA id q3-20020aa7d443000000b0052576969ef8sm4182115edr.14.2023.09.24.03.29.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 24 Sep 2023 03:29:04 -0700 (PDT) Message-ID: <494ede51-46bf-437b-98b8-2460f4c40285@linaro.org> Date: Sun, 24 Sep 2023 13:29:03 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v6 08/10] drm/msm/dpu: Allow NULL FBs in atomic commit Content-Language: en-GB To: Jessica Zhang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rob Clark , Sean Paul , Marijn Suijten Cc: quic_abhinavk@quicinc.com, ppaalanen@gmail.com, contact@emersion.fr, laurent.pinchart@ideasonboard.com, sebastian.wick@redhat.com, ville.syrjala@linux.intel.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, wayland-devel@lists.freedesktop.org References: <20230828-solid-fill-v6-0-a820efcce852@quicinc.com> <20230828-solid-fill-v6-8-a820efcce852@quicinc.com> From: Dmitry Baryshkov In-Reply-To: <20230828-solid-fill-v6-8-a820efcce852@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 29/08/2023 03:05, Jessica Zhang wrote: > Since solid fill planes allow for a NULL framebuffer in a valid commit, > add NULL framebuffer checks to atomic commit calls within DPU. > > Reviewed-by: Dmitry Baryshkov > Signed-off-by: Jessica Zhang > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 9 ++++++- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 41 ++++++++++++++++++++----------- > 2 files changed, 34 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 8ce7586e2ddf..5e845510e8c1 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -451,6 +451,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, > struct drm_plane_state *state; > struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state); > struct dpu_plane_state *pstate = NULL; > + const struct msm_format *fmt; > struct dpu_format *format; > struct dpu_hw_ctl *ctl = mixer->lm_ctl; > > @@ -470,7 +471,13 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, > pstate = to_dpu_plane_state(state); > fb = state->fb; > > - format = to_dpu_format(msm_framebuffer_format(pstate->base.fb)); > + if (drm_plane_solid_fill_enabled(state)) > + fmt = dpu_get_msm_format(&_dpu_crtc_get_kms(crtc)->base, > + DRM_FORMAT_ABGR8888, 0); > + else > + fmt = msm_framebuffer_format(pstate->base.fb); > + > + format = to_dpu_format(fmt); > > if (pstate->stage == DPU_STAGE_BASE && format->alpha_enable) > bg_alpha_enable = true; > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > index c2aaaded07ed..114c803ff99b 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -837,8 +837,13 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, > > pipe_cfg->dst_rect = new_plane_state->dst; > > - fb_rect.x2 = new_plane_state->fb->width; > - fb_rect.y2 = new_plane_state->fb->height; > + if (drm_plane_solid_fill_enabled(new_plane_state)) > + return 0; This would skip all the width checks, dpu_plane_atomic_check_pipe(), etc. Could you please confirm that all of those checks are irrelevant for solid fill? > + > + if (new_plane_state->pixel_source == DRM_PLANE_PIXEL_SOURCE_FB && new_plane_state->fb) { > + fb_rect.x2 = new_plane_state->fb->width; > + fb_rect.y2 = new_plane_state->fb->height; > + } > > /* Ensure fb size is supported */ > if (drm_rect_width(&fb_rect) > MAX_IMG_WIDTH || > @@ -1082,21 +1087,32 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) > struct drm_crtc *crtc = state->crtc; > struct drm_framebuffer *fb = state->fb; > bool is_rt_pipe; > - const struct dpu_format *fmt = > - to_dpu_format(msm_framebuffer_format(fb)); > + const struct dpu_format *fmt; > struct dpu_sw_pipe_cfg *pipe_cfg = &pstate->pipe_cfg; > struct dpu_sw_pipe_cfg *r_pipe_cfg = &pstate->r_pipe_cfg; > struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base); > struct msm_gem_address_space *aspace = kms->base.aspace; > struct dpu_hw_fmt_layout layout; > bool layout_valid = false; > - int ret; > > - ret = dpu_format_populate_layout(aspace, fb, &layout); > - if (ret) > - DPU_ERROR_PLANE(pdpu, "failed to get format layout, %d\n", ret); > - else > - layout_valid = true; > + if (state->pixel_source == DRM_PLANE_PIXEL_SOURCE_FB && fb) { > + int ret; > + > + fmt = to_dpu_format(msm_framebuffer_format(fb)); > + > + ret = dpu_format_populate_layout(aspace, fb, &layout); > + if (ret) > + DPU_ERROR_PLANE(pdpu, "failed to get format layout, %d\n", ret); > + else > + layout_valid = true; > + > + DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT > + ", %4.4s ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src), > + crtc->base.id, DRM_RECT_ARG(&state->dst), > + (char *)&fmt->base.pixel_format, DPU_FORMAT_IS_UBWC(fmt)); > + } else { > + fmt = dpu_get_dpu_format(DRM_FORMAT_ABGR8888); #define DPU_SOLID_FILL_FORMAT ? Also, I don't think that solid_fill planes consume bandwidth, so this likely needs to be fixed too. > + } > > pstate->pending = true; > > @@ -1104,11 +1120,6 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) > pstate->needs_qos_remap |= (is_rt_pipe != pdpu->is_rt_pipe); > pdpu->is_rt_pipe = is_rt_pipe; > > - DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT > - ", %4.4s ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src), > - crtc->base.id, DRM_RECT_ARG(&state->dst), > - (char *)&fmt->base.pixel_format, DPU_FORMAT_IS_UBWC(fmt)); > - > dpu_plane_sspp_update_pipe(plane, pipe, pipe_cfg, fmt, > drm_mode_vrefresh(&crtc->mode), > layout_valid ? &layout : NULL); > -- With best wishes Dmitry