Re: [PATCH 06/13] drm/omap: venc: remove set_type & invert_vid_out_polarity

2017-05-12 Thread Laurent Pinchart
Hi Tomi,

Thank you for the patch.

On Friday 12 May 2017 13:41:35 Tomi Valkeinen wrote:
> Non-DT booting is no longer supported, so remove legacy code.
> 
> Signed-off-by: Tomi Valkeinen 

Reviewed-by: Laurent Pinchart 

> ---
>  drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 10 --
>  drivers/gpu/drm/omapdrm/dss/omapdss.h | 10 --
>  drivers/gpu/drm/omapdrm/dss/venc.c| 23 ---
>  3 files changed, 43 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index
> f7a5731492d0..b1f6aa09f699 100644
> --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> @@ -157,14 +157,6 @@ static int opa362_check_timings(struct omap_dss_device
> *dssdev, return in->ops.atv->check_timings(in, vm);
>  }
> 
> -static void opa362_set_type(struct omap_dss_device *dssdev,
> - enum omap_dss_venc_type type)
> -{
> - /* we can only drive a COMPOSITE output */
> - WARN_ON(type != OMAP_DSS_VENC_TYPE_COMPOSITE);
> -
> -}
> -
>  static const struct omapdss_atv_ops opa362_atv_ops = {
>   .connect= opa362_connect,
>   .disconnect = opa362_disconnect,
> @@ -175,8 +167,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = {
>   .check_timings  = opa362_check_timings,
>   .set_timings= opa362_set_timings,
>   .get_timings= opa362_get_timings,
> -
> - .set_type   = opa362_set_type,
>  };
> 
>  static int opa362_probe(struct platform_device *pdev)
> diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 1ce53b072b16..abdb332019e9
> 100644
> --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> @@ -525,11 +525,6 @@ struct omapdss_atv_ops {
>   void (*get_timings)(struct omap_dss_device *dssdev,
>   struct videomode *vm);
> 
> - void (*set_type)(struct omap_dss_device *dssdev,
> - enum omap_dss_venc_type type);
> - void (*invert_vid_out_polarity)(struct omap_dss_device *dssdev,
> - bool invert_polarity);
> -
>   int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
>   u32 (*get_wss)(struct omap_dss_device *dssdev);
>  };
> @@ -642,11 +637,6 @@ struct omap_dss_device {
>   struct {
>   int module;
>   } dsi;
> -
> - struct {
> - enum omap_dss_venc_type type;
> - bool invert_polarity;
> - } venc;
>   } phy;
> 
>   struct {
> diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c
> b/drivers/gpu/drm/omapdrm/dss/venc.c index 8e836fddc390..a6bfb3918b8d
> 100644
> --- a/drivers/gpu/drm/omapdrm/dss/venc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/venc.c
> @@ -616,26 +616,6 @@ static int venc_set_wss(struct omap_dss_device *dssdev,
> u32 wss) return r;
>  }
> 
> -static void venc_set_type(struct omap_dss_device *dssdev,
> - enum omap_dss_venc_type type)
> -{
> - mutex_lock(_lock);
> -
> - venc.type = type;
> -
> - mutex_unlock(_lock);
> -}
> -
> -static void venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
> - bool invert_polarity)
> -{
> - mutex_lock(_lock);
> -
> - venc.invert_polarity = invert_polarity;
> -
> - mutex_unlock(_lock);
> -}
> -
>  static int venc_init_regulator(void)
>  {
>   struct regulator *vdda_dac;
> @@ -779,9 +759,6 @@ static const struct omapdss_atv_ops venc_ops = {
>   .set_timings = venc_set_timings,
>   .get_timings = venc_get_timings,
> 
> - .set_type = venc_set_type,
> - .invert_vid_out_polarity = venc_invert_vid_out_polarity,
> -
>   .set_wss = venc_set_wss,
>   .get_wss = venc_get_wss,
>  };

-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCH 06/13] drm/omap: venc: remove set_type & invert_vid_out_polarity

2017-05-12 Thread Tomi Valkeinen
Non-DT booting is no longer supported, so remove legacy code.

Signed-off-by: Tomi Valkeinen 
---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 10 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 10 --
 drivers/gpu/drm/omapdrm/dss/venc.c| 23 ---
 3 files changed, 43 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index f7a5731492d0..b1f6aa09f699 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -157,14 +157,6 @@ static int opa362_check_timings(struct omap_dss_device 
*dssdev,
return in->ops.atv->check_timings(in, vm);
 }
 
-static void opa362_set_type(struct omap_dss_device *dssdev,
-   enum omap_dss_venc_type type)
-{
-   /* we can only drive a COMPOSITE output */
-   WARN_ON(type != OMAP_DSS_VENC_TYPE_COMPOSITE);
-
-}
-
 static const struct omapdss_atv_ops opa362_atv_ops = {
.connect= opa362_connect,
.disconnect = opa362_disconnect,
@@ -175,8 +167,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = {
.check_timings  = opa362_check_timings,
.set_timings= opa362_set_timings,
.get_timings= opa362_get_timings,
-
-   .set_type   = opa362_set_type,
 };
 
 static int opa362_probe(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 1ce53b072b16..abdb332019e9 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -525,11 +525,6 @@ struct omapdss_atv_ops {
void (*get_timings)(struct omap_dss_device *dssdev,
struct videomode *vm);
 
-   void (*set_type)(struct omap_dss_device *dssdev,
-   enum omap_dss_venc_type type);
-   void (*invert_vid_out_polarity)(struct omap_dss_device *dssdev,
-   bool invert_polarity);
-
int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
u32 (*get_wss)(struct omap_dss_device *dssdev);
 };
@@ -642,11 +637,6 @@ struct omap_dss_device {
struct {
int module;
} dsi;
-
-   struct {
-   enum omap_dss_venc_type type;
-   bool invert_polarity;
-   } venc;
} phy;
 
struct {
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c 
b/drivers/gpu/drm/omapdrm/dss/venc.c
index 8e836fddc390..a6bfb3918b8d 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -616,26 +616,6 @@ static int venc_set_wss(struct omap_dss_device *dssdev, 
u32 wss)
return r;
 }
 
-static void venc_set_type(struct omap_dss_device *dssdev,
-   enum omap_dss_venc_type type)
-{
-   mutex_lock(_lock);
-
-   venc.type = type;
-
-   mutex_unlock(_lock);
-}
-
-static void venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
-   bool invert_polarity)
-{
-   mutex_lock(_lock);
-
-   venc.invert_polarity = invert_polarity;
-
-   mutex_unlock(_lock);
-}
-
 static int venc_init_regulator(void)
 {
struct regulator *vdda_dac;
@@ -779,9 +759,6 @@ static const struct omapdss_atv_ops venc_ops = {
.set_timings = venc_set_timings,
.get_timings = venc_get_timings,
 
-   .set_type = venc_set_type,
-   .invert_vid_out_polarity = venc_invert_vid_out_polarity,
-
.set_wss = venc_set_wss,
.get_wss = venc_get_wss,
 };
-- 
2.7.4

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel