[PATCH v2 08/60] drm/omap: dss: Remove omapdss_atv_ops get_wss and set_wss operations

[Sebastian Reichel]

Hi,

On Sat, May 26, 2018 at 08:24:26PM +0300, Laurent Pinchart wrote:
> The operations are never used, remove them. If the need to set wide
> screen signaling data arises later, it should be implemented by
> extending the DRM bridge API.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel at collabora.co.uk>

-- Sebastian

>  .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 19 ----------
>  drivers/gpu/drm/omapdrm/dss/omapdss.h              |  6 ----
>  drivers/gpu/drm/omapdrm/dss/venc.c                 | 41 ----------------------
>  3 files changed, 66 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> index 9eabd7201a12..5fdecc12b608 100644
> --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> @@ -154,22 +154,6 @@ static int tvc_check_timings(struct omap_dss_device *dssdev,
>  	return in->ops.atv->check_timings(in, vm);
>  }
>  
> -static u32 tvc_get_wss(struct omap_dss_device *dssdev)
> -{
> -	struct panel_drv_data *ddata = to_panel_data(dssdev);
> -	struct omap_dss_device *in = ddata->in;
> -
> -	return in->ops.atv->get_wss(in);
> -}
> -
> -static int tvc_set_wss(struct omap_dss_device *dssdev, u32 wss)
> -{
> -	struct panel_drv_data *ddata = to_panel_data(dssdev);
> -	struct omap_dss_device *in = ddata->in;
> -
> -	return in->ops.atv->set_wss(in, wss);
> -}
> -
>  static struct omap_dss_driver tvc_driver = {
>  	.connect		= tvc_connect,
>  	.disconnect		= tvc_disconnect,
> @@ -180,9 +164,6 @@ static struct omap_dss_driver tvc_driver = {
>  	.set_timings		= tvc_set_timings,
>  	.get_timings		= tvc_get_timings,
>  	.check_timings		= tvc_check_timings,
> -
> -	.get_wss		= tvc_get_wss,
> -	.set_wss		= tvc_set_wss,
>  };
>  
>  static int tvc_probe(struct platform_device *pdev)
> diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> index 8d530057a4b9..67db0ea272f3 100644
> --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> @@ -362,9 +362,6 @@ struct omapdss_atv_ops {
>  			    struct videomode *vm);
>  	void (*get_timings)(struct omap_dss_device *dssdev,
>  			    struct videomode *vm);
> -
> -	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
> -	u32 (*get_wss)(struct omap_dss_device *dssdev);
>  };
>  
>  struct omapdss_hdmi_ops {
> @@ -554,9 +551,6 @@ struct omap_dss_driver {
>  	void (*get_size)(struct omap_dss_device *dssdev,
>  			 unsigned int *width, unsigned int *height);
>  
> -	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
> -	u32 (*get_wss)(struct omap_dss_device *dssdev);
> -
>  	int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
>  	bool (*detect)(struct omap_dss_device *dssdev);
>  
> diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
> index 24d1ced210bd..3f4b8a181d74 100644
> --- a/drivers/gpu/drm/omapdrm/dss/venc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/venc.c
> @@ -626,44 +626,6 @@ static void venc_get_timings(struct omap_dss_device *dssdev,
>  	mutex_unlock(&venc->venc_lock);
>  }
>  
> -static u32 venc_get_wss(struct omap_dss_device *dssdev)
> -{
> -	struct venc_device *venc = dssdev_to_venc(dssdev);
> -
> -	/* Invert due to VENC_L21_WC_CTL:INV=1 */
> -	return (venc->wss_data >> 8) ^ 0xfffff;
> -}
> -
> -static int venc_set_wss(struct omap_dss_device *dssdev, u32 wss)
> -{
> -	struct venc_device *venc = dssdev_to_venc(dssdev);
> -	const struct venc_config *config;
> -	int r;
> -
> -	DSSDBG("venc_set_wss\n");
> -
> -	mutex_lock(&venc->venc_lock);
> -
> -	config = venc_timings_to_config(&venc->vm);
> -
> -	/* Invert due to VENC_L21_WC_CTL:INV=1 */
> -	venc->wss_data = (wss ^ 0xfffff) << 8;
> -
> -	r = venc_runtime_get(venc);
> -	if (r)
> -		goto err;
> -
> -	venc_write_reg(venc, VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
> -		       venc->wss_data);
> -
> -	venc_runtime_put(venc);
> -
> -err:
> -	mutex_unlock(&venc->venc_lock);
> -
> -	return r;
> -}
> -
>  static int venc_init_regulator(struct venc_device *venc)
>  {
>  	struct regulator *vdda_dac;
> @@ -810,9 +772,6 @@ static const struct omapdss_atv_ops venc_ops = {
>  	.check_timings = venc_check_timings,
>  	.set_timings = venc_set_timings,
>  	.get_timings = venc_get_timings,
> -
> -	.set_wss = venc_set_wss,
> -	.get_wss = venc_get_wss,
>  };
>  
>  static void venc_init_output(struct venc_device *venc)
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20180610/e5b956cd/attachment-0001.sig>