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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 6EAA5C31E5E for ; Tue, 18 Jun 2019 12:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3974720873 for ; Tue, 18 Jun 2019 12:35:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=fpond.eu header.i=@fpond.eu header.b="FAQZYC3W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbfFRMfb (ORCPT ); Tue, 18 Jun 2019 08:35:31 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.221]:29187 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725955AbfFRMfa (ORCPT ); Tue, 18 Jun 2019 08:35:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1560861324; s=strato-dkim-0002; d=fpond.eu; h=Subject:References:In-Reply-To:Message-ID:Cc:To:From:Date: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=5ifz35ZTzC6yEZuKkMBojgi9/W7w6JT04MmezhbKlLs=; b=FAQZYC3WBdwzlTq3KlW7upf+KzzSlAwdE/uS3wNwtta3/dcxgARwWtGCQ2/ElqR5Dn ZWoqqNOOVxZ3C8UbgykYghjXk4WvWsW+wHsPgvCiWosgxJhnsJW99GEZRLwj5gfrJXQ8 18FrRSN8dHbv6DOgkW0hCR/2sr7cMW3uv81sJGPgktNro1OAnyeWj2e+P31PNApu6bds 8yZCOTjbcqFhwtBgP8RPvt2x1vxrkFvVaHouSP8hTFQqZzquVrDvznP8/8D8J93IoHWk QOl0f20rYCUiDTm3pz6jm17pwPqWLpzJ/hqkT0BWFNdCvbFYkWJ5QP/S2uq+3SiruiPh qPhA== X-RZG-AUTH: ":OWANVUa4dPFUgKR/3dpvnYP0Np73amq+g13rqGzmt2bYDnKIKaws6YXTsc4=" X-RZG-CLASS-ID: mo00 Received: from oxapp03-03.back.ox.d0m.de by smtp-ox.front (RZmta 44.24 AUTH) with ESMTPSA id h0a328v5ICWD0mV (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Tue, 18 Jun 2019 14:32:13 +0200 (CEST) Date: Tue, 18 Jun 2019 14:32:13 +0200 (CEST) From: Ulrich Hecht To: Laurent Pinchart , dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham Message-ID: <55043232.787113.1560861133484@webmail.strato.com> In-Reply-To: <20190617210930.6054-2-laurent.pinchart+renesas@ideasonboard.com> References: <20190617210930.6054-1-laurent.pinchart+renesas@ideasonboard.com> <20190617210930.6054-2-laurent.pinchart+renesas@ideasonboard.com> Subject: Re: [PATCH v3 01/10] media: vsp1: drm: Split vsp1_du_setup_lif() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.8.4-Rev58 X-Originating-IP: 85.212.220.45 X-Originating-Client: open-xchange-appsuite Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Thank you for your patch. > On June 17, 2019 at 11:09 PM Laurent Pinchart wrote: > > > From: Kieran Bingham > > Break vsp1_du_setup_lif() into components more suited to the DRM Atomic > API. The existing vsp1_du_setup_lif() API call is maintained as it is > still used from the DU. > > Signed-off-by: Kieran Bingham > Signed-off-by: Laurent Pinchart > --- > Changes since v2: > > - Minor formatting changes > - Fix NULL pointer dereference in vsp1_du_setup_lif() > --- > drivers/media/platform/vsp1/vsp1_drm.c | 220 ++++++++++++++++++------- > include/media/vsp1.h | 32 +++- > 2 files changed, 189 insertions(+), 63 deletions(-) > > diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c > index a4a45d68a6ef..7957e1439de0 100644 > --- a/drivers/media/platform/vsp1/vsp1_drm.c > +++ b/drivers/media/platform/vsp1/vsp1_drm.c > @@ -616,10 +616,10 @@ int vsp1_du_init(struct device *dev) > EXPORT_SYMBOL_GPL(vsp1_du_init); > > /** > - * vsp1_du_setup_lif - Setup the output part of the VSP pipeline > + * vsp1_du_atomic_modeset - Configure the mode as part of an atomic update > * @dev: the VSP device > * @pipe_index: the DRM pipeline index > - * @cfg: the LIF configuration > + * @cfg: the mode configuration > * > * Configure the output part of VSP DRM pipeline for the given frame @cfg.width > * and @cfg.height. This sets up formats on the BRx source pad, the WPF sink and > @@ -636,14 +636,12 @@ EXPORT_SYMBOL_GPL(vsp1_du_init); > * > * Return 0 on success or a negative error code on failure. > */ > -int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > - const struct vsp1_du_lif_config *cfg) > +int vsp1_du_atomic_modeset(struct device *dev, unsigned int pipe_index, > + const struct vsp1_du_modeset_config *cfg) > { > struct vsp1_device *vsp1 = dev_get_drvdata(dev); > struct vsp1_drm_pipeline *drm_pipe; > struct vsp1_pipeline *pipe; > - unsigned long flags; > - unsigned int i; > int ret; > > if (pipe_index >= vsp1->info->lif_count) > @@ -652,60 +650,6 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > drm_pipe = &vsp1->drm->pipe[pipe_index]; > pipe = &drm_pipe->pipe; > > - if (!cfg) { > - struct vsp1_brx *brx; > - > - mutex_lock(&vsp1->drm->lock); > - > - brx = to_brx(&pipe->brx->subdev); > - > - /* > - * NULL configuration means the CRTC is being disabled, stop > - * the pipeline and turn the light off. > - */ > - ret = vsp1_pipeline_stop(pipe); > - if (ret == -ETIMEDOUT) > - dev_err(vsp1->dev, "DRM pipeline stop timeout\n"); > - > - for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) { > - struct vsp1_rwpf *rpf = pipe->inputs[i]; > - > - if (!rpf) > - continue; > - > - /* > - * Remove the RPF from the pipe and the list of BRx > - * inputs. > - */ > - WARN_ON(!rpf->entity.pipe); > - rpf->entity.pipe = NULL; > - list_del(&rpf->entity.list_pipe); > - pipe->inputs[i] = NULL; > - > - brx->inputs[rpf->brx_input].rpf = NULL; > - } > - > - drm_pipe->du_complete = NULL; > - pipe->num_inputs = 0; > - > - dev_dbg(vsp1->dev, "%s: pipe %u: releasing %s\n", > - __func__, pipe->lif->index, > - BRX_NAME(pipe->brx)); > - > - list_del(&pipe->brx->list_pipe); > - pipe->brx->pipe = NULL; > - pipe->brx = NULL; > - > - mutex_unlock(&vsp1->drm->lock); > - > - vsp1_dlm_reset(pipe->output->dlm); > - vsp1_device_put(vsp1); > - > - dev_dbg(vsp1->dev, "%s: pipeline disabled\n", __func__); > - > - return 0; > - } > - > drm_pipe->width = cfg->width; > drm_pipe->height = cfg->height; > pipe->interlaced = cfg->interlaced; > @@ -722,8 +666,43 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > goto unlock; > > ret = vsp1_du_pipeline_setup_output(vsp1, pipe); > - if (ret < 0) > - goto unlock; > + > +unlock: > + mutex_unlock(&vsp1->drm->lock); > + > + return ret; > +} > + > +/** > + * vsp1_du_atomic_enable - Enable and start a DU pipeline > + * @dev: the VSP device > + * @pipe_index: the DRM pipeline index > + * @cfg: the enablement configuration > + * > + * The @pipe_index argument selects which DRM pipeline to enable. The number of > + * available pipelines depend on the VSP instance. "depends". > + * > + * The configuration passes a callback function to register notification of > + * frame completion events. > + * > + * Return 0 on success or a negative error code on failure. > + */ > +int vsp1_du_atomic_enable(struct device *dev, unsigned int pipe_index, > + const struct vsp1_du_enable_config *cfg) > +{ > + struct vsp1_device *vsp1 = dev_get_drvdata(dev); > + struct vsp1_drm_pipeline *drm_pipe; > + struct vsp1_pipeline *pipe; > + unsigned long flags; > + int ret; > + > + if (pipe_index >= vsp1->info->lif_count) > + return -EINVAL; > + > + drm_pipe = &vsp1->drm->pipe[pipe_index]; > + pipe = &drm_pipe->pipe; > + > + mutex_lock(&vsp1->drm->lock); > > /* Enable the VSP1. */ > ret = vsp1_device_get(vsp1); > @@ -758,6 +737,123 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > dev_dbg(vsp1->dev, "%s: pipeline enabled\n", __func__); > > return 0; > + > +} > +EXPORT_SYMBOL_GPL(vsp1_du_atomic_enable); > + > +/** > + * vsp1_du_atomic_disable - Disable and stop a DU pipeline > + * @dev: the VSP device > + * @pipe_index: the DRM pipeline index > + * > + * The @pipe_index argument selects which DRM pipeline to disable. The number > + * of available pipelines depend on the VSP instance. > + * > + * Return 0 on success or a negative error code on failure. > + */ > +int vsp1_du_atomic_disable(struct device *dev, unsigned int pipe_index) > +{ > + struct vsp1_device *vsp1 = dev_get_drvdata(dev); > + struct vsp1_drm_pipeline *drm_pipe; > + struct vsp1_pipeline *pipe; > + struct vsp1_brx *brx; > + unsigned int i; > + int ret; > + > + if (pipe_index >= vsp1->info->lif_count) > + return -EINVAL; > + > + drm_pipe = &vsp1->drm->pipe[pipe_index]; > + pipe = &drm_pipe->pipe; > + > + mutex_lock(&vsp1->drm->lock); > + > + brx = to_brx(&pipe->brx->subdev); > + > + /* Stop the pipeline and turn the light off. */ I may have missed something, but it is not clear to me what "light" refers to here. > + ret = vsp1_pipeline_stop(pipe); > + if (ret == -ETIMEDOUT) > + dev_err(vsp1->dev, "DRM pipeline stop timeout\n"); > + > + for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) { > + struct vsp1_rwpf *rpf = pipe->inputs[i]; > + > + if (!rpf) > + continue; > + > + /* Remove the RPF from the pipe and the list of BRx inputs. */ > + WARN_ON(!rpf->entity.pipe); > + rpf->entity.pipe = NULL; > + list_del(&rpf->entity.list_pipe); > + pipe->inputs[i] = NULL; > + > + brx->inputs[rpf->brx_input].rpf = NULL; > + } > + > + drm_pipe->du_complete = NULL; > + pipe->num_inputs = 0; > + > + dev_dbg(vsp1->dev, "%s: pipe %u: releasing %s\n", __func__, > + pipe->lif->index, BRX_NAME(pipe->brx)); > + > + list_del(&pipe->brx->list_pipe); > + pipe->brx->pipe = NULL; > + pipe->brx = NULL; > + > + mutex_unlock(&vsp1->drm->lock); > + > + vsp1_dlm_reset(pipe->output->dlm); > + vsp1_device_put(vsp1); > + > + dev_dbg(vsp1->dev, "%s: pipeline disabled\n", __func__); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(vsp1_du_atomic_disable); > + > +/** > + * vsp1_du_setup_lif - Setup the output part of the VSP pipeline > + * @dev: the VSP device > + * @pipe_index: the DRM pipeline index > + * @cfg: the LIF configuration > + * > + * Configure the output part of VSP DRM pipeline for the given frame @cfg.width > + * and @cfg.height. This sets up formats on the BRx source pad, the WPF sink and > + * source pads, and the LIF sink pad. > + * > + * The @pipe_index argument selects which DRM pipeline to setup. The number of > + * available pipelines depend on the VSP instance. > + * > + * As the media bus code on the blend unit source pad is conditioned by the > + * configuration of its sink 0 pad, we also set up the formats on all blend unit > + * sinks, even if the configuration will be overwritten later by > + * vsp1_du_setup_rpf(). This ensures that the blend unit configuration is set to > + * a well defined state. > + * > + * Return 0 on success or a negative error code on failure. > + */ > +int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > + const struct vsp1_du_lif_config *cfg) > +{ > + struct vsp1_du_modeset_config modes; > + struct vsp1_du_enable_config enable; > + int ret; > + > + if (!cfg) > + return vsp1_du_atomic_disable(dev, pipe_index); > + > + modes.width = cfg->width; > + modes.height = cfg->height; > + modes.interlaced = cfg->interlaced; > + > + ret = vsp1_du_atomic_modeset(dev, pipe_index, &modes); > + if (ret) > + return ret; > + > + enable.callback = cfg->callback; > + enable.callback_data = cfg->callback_data; > + > + return vsp1_du_atomic_enable(dev, pipe_index, &enable); > } > EXPORT_SYMBOL_GPL(vsp1_du_setup_lif); > > diff --git a/include/media/vsp1.h b/include/media/vsp1.h > index cc1b0d42ce95..56643f97d4c9 100644 > --- a/include/media/vsp1.h > +++ b/include/media/vsp1.h > @@ -21,7 +21,7 @@ int vsp1_du_init(struct device *dev); > #define VSP1_DU_STATUS_WRITEBACK BIT(1) > > /** > - * struct vsp1_du_lif_config - VSP LIF configuration > + * struct vsp1_du_lif_config - VSP LIF configuration - Deprecated > * @width: output frame width > * @height: output frame height > * @interlaced: true for interlaced pipelines > @@ -42,6 +42,30 @@ struct vsp1_du_lif_config { > int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index, > const struct vsp1_du_lif_config *cfg); > > +/** > + * struct vsp1_du_modeset_config - VSP display mode configuration > + * @width: output frame width > + * @height: output frame height > + * @interlaced: true for interlaced pipelines > + */ > +struct vsp1_du_modeset_config { > + unsigned int width; > + unsigned int height; > + bool interlaced; > +}; > + > +/** > + * struct vsp1_du_enable_config - VSP enable configuration > + * @callback: frame completion callback function (optional). When a callback > + * is provided, the VSP driver guarantees that it will be called once > + * and only once for each vsp1_du_atomic_flush() call. > + * @callback_data: data to be passed to the frame completion callback > + */ > +struct vsp1_du_enable_config { > + void (*callback)(void *data, unsigned int status, u32 crc); > + void *callback_data; > +}; > + > /** > * struct vsp1_du_atomic_config - VSP atomic configuration parameters > * @pixelformat: plane pixel format (V4L2 4CC) > @@ -106,6 +130,12 @@ struct vsp1_du_atomic_pipe_config { > struct vsp1_du_writeback_config writeback; > }; > > + > +int vsp1_du_atomic_modeset(struct device *dev, unsigned int pipe_index, > + const struct vsp1_du_modeset_config *cfg); > +int vsp1_du_atomic_enable(struct device *dev, unsigned int pipe_index, > + const struct vsp1_du_enable_config *cfg); > +int vsp1_du_atomic_disable(struct device *dev, unsigned int pipe_index); > void vsp1_du_atomic_begin(struct device *dev, unsigned int pipe_index); > int vsp1_du_atomic_update(struct device *dev, unsigned int pipe_index, > unsigned int rpf, > -- > Regards, > > Laurent Pinchart > With those minor issues fixed: Reviewed-by: Ulrich Hecht CU Uli