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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4562C25B6B for ; Wed, 25 Oct 2023 19:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4+ouTuP4AfQzaxFBijcizurwIol2Ri5an9SSg51Ghz4=; b=AoDEoXow4CJ3TN M257qyMEYEmsqBTZpnx0KYlC9I1aSHifzalG5ecfWhkdD68PqI5XQ2FH62VP+KSgMIQzqZ2AwR59q SNbdBqbX3EOcYYFVmqXEwsnXX0wH3sB2wjCpJqHzLI4NlvXSZYEtRbnfZvJRit5ltiwIVe44dwG2f WVvaB+eevHcgZmHOQZxNyWr/+9kIHvq6q2zFNJ7MHGoDpICtzCDp7+1VuQf7zTB9KkhxA7TcaCUSs 344heWVSOj/fFMU/pV2cK7ixj30krybuwE7sREPvSTV7BnhZdjPel+EQ0WsxPYCiydcr2TWHhzf51 xtFAJI4UJ3TuCjq+v3Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvjtC-00CzEj-2J; Wed, 25 Oct 2023 19:50:02 +0000 Received: from mgamail.intel.com ([134.134.136.20]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvjt8-00CzD5-2s for linux-riscv@lists.infradead.org; Wed, 25 Oct 2023 19:50:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698263398; x=1729799398; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=6bjyCn+5RGDR80Oxqpw3WAaYkuJ8eyFL07jKhBVi4rA=; b=Wy78YRogSK4DC8lnQVzgwOFFfZxmJK0x4vWcaUWA8J7/wU6KFlcNuTZW Wr0UgCug1JZlEDp4sa6Q1hlUoK+Jw9wCUiUO3p2id1pNi9LPX2ljVu1zL PXR9t5PEOiY+qA4BQR4xVX4qDG6R6wOod+yrq5+T+MKUZsvqF7Yg1MOyA DYnL/pCJVDlwtpQOG8ab1+/kIssd8I0nyO2uTUKlbUDhHrHDqxwXwvhhs EjWxzMDLVHMGV5Wtc/5y9xRMHbViW+3mLjSFu4vrDlT2tnGE4dtW4h4lK CfbVKXU9ELJmEVM2COIGb4oHJ2JQ9nlp3sjTZgK2Nix1BGrXNDR59ONne A==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="377752958" X-IronPort-AV: E=Sophos;i="6.03,250,1694761200"; d="scan'208";a="377752958" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 12:49:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="735494248" X-IronPort-AV: E=Sophos;i="6.03,250,1694761200"; d="scan'208";a="735494248" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga006.jf.intel.com with SMTP; 25 Oct 2023 12:49:47 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 25 Oct 2023 22:49:46 +0300 Date: Wed, 25 Oct 2023 22:49:46 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Dmitry Baryshkov Cc: Keith Zhao , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Conor Dooley , Albert Ou , Emil Renner Berthing , christian.koenig@amd.com, Thomas Zimmermann , Bjorn Andersson , Chris Morgan , Maxime Ripard , Jagan Teki , Jack Zhu , Rob Herring , Palmer Dabbelt , Krzysztof Kozlowski , Paul Walmsley , Shengyang Chen , Changhuang Liang , Shawn Guo , Sumit Semwal Subject: Re: [PATCH v2 5/6] drm/vs: Add KMS crtc&plane Message-ID: References: <20231025103957.3776-1-keith.zhao@starfivetech.com> <20231025103957.3776-6-keith.zhao@starfivetech.com> <6db09f77-31e8-4f2e-a987-e3745d0e8c24@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6db09f77-31e8-4f2e-a987-e3745d0e8c24@linaro.org> X-Patchwork-Hint: comment X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231025_124958_992402_DBB14C2F X-CRM114-Status: GOOD ( 33.40 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Wed, Oct 25, 2023 at 10:28:56PM +0300, Dmitry Baryshkov wrote: > On 25/10/2023 13:39, Keith Zhao wrote: > > add 2 crtcs and 8 planes in vs-drm > > = > > Signed-off-by: Keith Zhao > > --- > > drivers/gpu/drm/verisilicon/Makefile | 8 +- > > drivers/gpu/drm/verisilicon/vs_crtc.c | 257 ++++ > > drivers/gpu/drm/verisilicon/vs_crtc.h | 43 + > > drivers/gpu/drm/verisilicon/vs_dc.c | 1002 ++++++++++++ > > drivers/gpu/drm/verisilicon/vs_dc.h | 80 + > > drivers/gpu/drm/verisilicon/vs_dc_hw.c | 1959 ++++++++++++++++++++++++ > > drivers/gpu/drm/verisilicon/vs_dc_hw.h | 492 ++++++ > > drivers/gpu/drm/verisilicon/vs_drv.c | 2 + > > drivers/gpu/drm/verisilicon/vs_plane.c | 526 +++++++ > > drivers/gpu/drm/verisilicon/vs_plane.h | 58 + > > drivers/gpu/drm/verisilicon/vs_type.h | 69 + > > 11 files changed, 4494 insertions(+), 2 deletions(-) > > create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.c > > create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h > > create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.c > > create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.h > > create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.c > > create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_hw.h > > create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.c > > create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.h > > create mode 100644 drivers/gpu/drm/verisilicon/vs_type.h > > = > > diff --git a/drivers/gpu/drm/verisilicon/Makefile b/drivers/gpu/drm/ver= isilicon/Makefile > > index 7d3be305b..1d48016ca 100644 > > --- a/drivers/gpu/drm/verisilicon/Makefile > > +++ b/drivers/gpu/drm/verisilicon/Makefile > > @@ -1,7 +1,11 @@ > > # SPDX-License-Identifier: GPL-2.0 > > = > > -vs_drm-objs :=3D vs_drv.o \ > > - vs_modeset.o > > +vs_drm-objs :=3D vs_dc_hw.o \ > > + vs_dc.o \ > > + vs_crtc.o \ > > + vs_drv.o \ > > + vs_modeset.o \ > > + vs_plane.o > > = > > obj-$(CONFIG_DRM_VERISILICON) +=3D vs_drm.o > > = > > diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.c b/drivers/gpu/drm/ve= risilicon/vs_crtc.c > > new file mode 100644 > > index 000000000..8a658ea77 > > --- /dev/null > > +++ b/drivers/gpu/drm/verisilicon/vs_crtc.c > > @@ -0,0 +1,257 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. > > + * > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "vs_crtc.h" > > +#include "vs_dc.h" > > +#include "vs_drv.h" > > + > > +static void vs_crtc_reset(struct drm_crtc *crtc) > > +{ > > + struct vs_crtc_state *state; > > + > > + if (crtc->state) { > > + __drm_atomic_helper_crtc_destroy_state(crtc->state); > > + > > + state =3D to_vs_crtc_state(crtc->state); > > + kfree(state); > > + crtc->state =3D NULL; > > + } > = > You can call your crtc_destroy_state function directly here. > = > > + > > + state =3D kzalloc(sizeof(*state), GFP_KERNEL); > > + if (!state) > > + return; > > + > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > +} > > + > > +static struct drm_crtc_state * > > +vs_crtc_atomic_duplicate_state(struct drm_crtc *crtc) > > +{ > > + struct vs_crtc_state *ori_state; > = > It might be a matter of taste, but it is usually old_state. > = > > + struct vs_crtc_state *state; > > + > > + if (!crtc->state) > > + return NULL; > > + > > + ori_state =3D to_vs_crtc_state(crtc->state); > > + state =3D kzalloc(sizeof(*state), GFP_KERNEL); > > + if (!state) > > + return NULL; > > + > > + __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base); > > + > > + state->output_fmt =3D ori_state->output_fmt; > > + state->encoder_type =3D ori_state->encoder_type; > > + state->bpp =3D ori_state->bpp; > > + state->underflow =3D ori_state->underflow; > = > Can you use kmemdup instead? > = > > + > > + return &state->base; > > +} > > + > > +static void vs_crtc_atomic_destroy_state(struct drm_crtc *crtc, > > + struct drm_crtc_state *state) > > +{ > > + __drm_atomic_helper_crtc_destroy_state(state); > > + kfree(to_vs_crtc_state(state)); > > +} > > + > > +static int vs_crtc_enable_vblank(struct drm_crtc *crtc) > > +{ > > + struct vs_crtc *vs_crtc =3D to_vs_crtc(crtc); > > + struct vs_dc *dc =3D dev_get_drvdata(vs_crtc->dev); > > + > > + vs_dc_enable_vblank(dc, true); > > + > > + return 0; > > +} > > + > > +static void vs_crtc_disable_vblank(struct drm_crtc *crtc) > > +{ > > + struct vs_crtc *vs_crtc =3D to_vs_crtc(crtc); > > + struct vs_dc *dc =3D dev_get_drvdata(vs_crtc->dev); > > + > > + vs_dc_enable_vblank(dc, false); > > +} > > + > > +static const struct drm_crtc_funcs vs_crtc_funcs =3D { > > + .set_config =3D drm_atomic_helper_set_config, > > + .page_flip =3D drm_atomic_helper_page_flip, > = > destroy is required, see drm_mode_config_cleanup() > = > > + .reset =3D vs_crtc_reset, > > + .atomic_duplicate_state =3D vs_crtc_atomic_duplicate_state, > > + .atomic_destroy_state =3D vs_crtc_atomic_destroy_state, > = > please consider adding atomic_print_state to output driver-specific bits. > = > > + .enable_vblank =3D vs_crtc_enable_vblank, > > + .disable_vblank =3D vs_crtc_disable_vblank, > > +}; > > + > > +static u8 cal_pixel_bits(u32 bus_format) > = > This looks like a generic helper code, which can go to a common place. > = > > +{ > > + u8 bpp; > > + > > + switch (bus_format) { > > + case MEDIA_BUS_FMT_RGB565_1X16: > > + case MEDIA_BUS_FMT_UYVY8_1X16: > > + bpp =3D 16; > > + break; > > + case MEDIA_BUS_FMT_RGB666_1X18: > > + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: > > + bpp =3D 18; > > + break; > > + case MEDIA_BUS_FMT_UYVY10_1X20: > > + bpp =3D 20; > > + break; > > + case MEDIA_BUS_FMT_BGR888_1X24: > > + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: > > + case MEDIA_BUS_FMT_YUV8_1X24: > > + bpp =3D 24; > > + break; > > + case MEDIA_BUS_FMT_RGB101010_1X30: > > + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: > > + case MEDIA_BUS_FMT_YUV10_1X30: > > + bpp =3D 30; > > + break; > > + default: > > + bpp =3D 24; > > + break; > > + } > > + > > + return bpp; > > +} > > + > > +static void vs_crtc_atomic_enable(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct vs_crtc *vs_crtc =3D to_vs_crtc(crtc); > > + struct vs_dc *dc =3D dev_get_drvdata(vs_crtc->dev); > > + struct vs_crtc_state *vs_crtc_state =3D to_vs_crtc_state(crtc->state); > > + > > + vs_crtc_state->bpp =3D cal_pixel_bits(vs_crtc_state->output_fmt); > > + > > + vs_dc_enable(dc, crtc); > > + drm_crtc_vblank_on(crtc); > > +} > > + > > +static void vs_crtc_atomic_disable(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct vs_crtc *vs_crtc =3D to_vs_crtc(crtc); > > + struct vs_dc *dc =3D dev_get_drvdata(vs_crtc->dev); > > + > > + drm_crtc_vblank_off(crtc); > > + > > + vs_dc_disable(dc, crtc); > > + > > + if (crtc->state->event && !crtc->state->active) { > > + spin_lock_irq(&crtc->dev->event_lock); > > + drm_crtc_send_vblank_event(crtc, crtc->state->event); > > + spin_unlock_irq(&crtc->dev->event_lock); > > + > > + crtc->state->event =3D NULL; > = > I think even should be cleared within the lock. event_lock doesn't protect anything in the crtc state. But the bigger problem in this code is the prevalent crtc->state usage. That should pretty much never be done, especially in anything that can get called from the actual commit phase where you no longer have the locks held. Instead one should almost always use the get_{new,old}_state() stuff, or the old/new/oldnew state iterators. > = > > + } > > +} > > + > > +static void vs_crtc_atomic_begin(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(s= tate, > > + crtc); > > + > > + struct vs_crtc *vs_crtc =3D to_vs_crtc(crtc); > > + struct device *dev =3D vs_crtc->dev; > > + struct drm_property_blob *blob =3D crtc->state->gamma_lut; Eg. here you are using drm_atomic_get_new_crtc_state() correctly, but then proceed to directly access crtc->state anyway. > > + struct drm_color_lut *lut; > > + struct vs_dc *dc =3D dev_get_drvdata(dev); > > + > > + if (crtc_state->color_mgmt_changed) { > > + if (blob && blob->length) { > > + lut =3D blob->data; > > + vs_dc_set_gamma(dc, crtc, lut, > > + blob->length / sizeof(*lut)); > > + vs_dc_enable_gamma(dc, crtc, true); > > + } else { > > + vs_dc_enable_gamma(dc, crtc, false); > > + } > > + } > > +} -- = Ville Syrj=E4l=E4 Intel _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv