| Message ID | 20190617210930.6054-5-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | drm: rcar-du: Rework CRTC and groups for atomic commits | expand |
> On June 17, 2019 at 11:09 PM Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote: > > > From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > > The vsp1_du_setup_lif() function is deprecated, and the users have been > removed. Remove the implementation and the associated configuration > structure. > > Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/media/platform/vsp1/vsp1_drm.c | 46 -------------------------- > include/media/vsp1.h | 22 ------------ > 2 files changed, 68 deletions(-) > > diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c > index 900465caf1bf..3452d7a6dd89 100644 > --- a/drivers/media/platform/vsp1/vsp1_drm.c > +++ b/drivers/media/platform/vsp1/vsp1_drm.c > @@ -815,52 +815,6 @@ int vsp1_du_atomic_disable(struct device *dev, unsigned int pipe_index) > } > 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); > - > /** > * vsp1_du_atomic_begin - Prepare for an atomic update > * @dev: the VSP device > diff --git a/include/media/vsp1.h b/include/media/vsp1.h > index 56643f97d4c9..b8eadd62fd15 100644 > --- a/include/media/vsp1.h > +++ b/include/media/vsp1.h > @@ -20,28 +20,6 @@ int vsp1_du_init(struct device *dev); > #define VSP1_DU_STATUS_COMPLETE BIT(0) > #define VSP1_DU_STATUS_WRITEBACK BIT(1) > > -/** > - * struct vsp1_du_lif_config - VSP LIF configuration - Deprecated > - * @width: output frame width > - * @height: output frame height > - * @interlaced: true for interlaced pipelines > - * @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_lif_config { > - unsigned int width; > - unsigned int height; > - bool interlaced; > - > - void (*callback)(void *data, unsigned int status, u32 crc); > - void *callback_data; > -}; > - > -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 > -- > Regards, > > Laurent Pinchart > Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> CU Uli
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index 900465caf1bf..3452d7a6dd89 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -815,52 +815,6 @@ int vsp1_du_atomic_disable(struct device *dev, unsigned int pipe_index) } 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); - /** * vsp1_du_atomic_begin - Prepare for an atomic update * @dev: the VSP device diff --git a/include/media/vsp1.h b/include/media/vsp1.h index 56643f97d4c9..b8eadd62fd15 100644 --- a/include/media/vsp1.h +++ b/include/media/vsp1.h @@ -20,28 +20,6 @@ int vsp1_du_init(struct device *dev); #define VSP1_DU_STATUS_COMPLETE BIT(0) #define VSP1_DU_STATUS_WRITEBACK BIT(1) -/** - * struct vsp1_du_lif_config - VSP LIF configuration - Deprecated - * @width: output frame width - * @height: output frame height - * @interlaced: true for interlaced pipelines - * @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_lif_config { - unsigned int width; - unsigned int height; - bool interlaced; - - void (*callback)(void *data, unsigned int status, u32 crc); - void *callback_data; -}; - -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