Re: [PATCH v2 46/60] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()
Hi,
On Mon, Jun 11, 2018 at 08:16:24PM +0300, Laurent Pinchart wrote:
> Hi Sebastian,
>
> On Monday, 11 June 2018 02:48:45 EEST Sebastian Reichel wrote:
> > On Sat, May 26, 2018 at 08:25:04PM +0300, Laurent Pinchart wrote:
> > > The dss_mgr_connect() and dss_mgr_disconnect() functions take two
> > > omap_dss_device pointers as parameters, which are always set to the same
> > > value by all callers. Remove the duplicated pointer.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > ---
> > >
> > > drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +++-
> > > drivers/gpu/drm/omapdrm/dss/dsi.c | 8 +++-
> > > drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +++-
> > > drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +++-
> > > drivers/gpu/drm/omapdrm/dss/omapdss.h | 6 ++
> > > drivers/gpu/drm/omapdrm/dss/output.c | 9 -
> > > drivers/gpu/drm/omapdrm/dss/sdi.c | 8 +++-
> > > drivers/gpu/drm/omapdrm/dss/venc.c| 8 +++-
> > > 8 files changed, 24 insertions(+), 39 deletions(-)
>
> [snip]
>
> > > diff --git a/drivers/gpu/drm/omapdrm/dss/output.c
> > > b/drivers/gpu/drm/omapdrm/dss/output.c index 191b2e801257..2f7a019d059e
> > > 100644
> > > --- a/drivers/gpu/drm/omapdrm/dss/output.c
> > > +++ b/drivers/gpu/drm/omapdrm/dss/output.c
> > > @@ -109,18 +109,17 @@ void dss_uninstall_mgr_ops(struct dss_device *dss)
> > > }
> > > EXPORT_SYMBOL(dss_uninstall_mgr_ops);
> > >
> > > -int dss_mgr_connect(struct omap_dss_device *dssdev, struct
> > > omap_dss_device *dst)
> > > +int dss_mgr_connect(struct omap_dss_device *dssdev)
> > > {
> > > return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
> > > - dssdev->dispc_channel, dst);
> > > + dssdev->dispc_channel, dssdev);
> >
> > Maybe also change mgr_ops->connect, so that it only takes dssdev
> > as a parameter? Otherwise
>
> It would make sense, but patch 60/60 in this series drops the
> mgr_ops->connect
> operation completely, so I don't think it's worth changing this.
Right. I only checked a few patches ahead:
Reviewed-by: Sebastian Reichel
-- Sebastian
signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 46/60] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()
Hi Sebastian,
On Monday, 11 June 2018 02:48:45 EEST Sebastian Reichel wrote:
> On Sat, May 26, 2018 at 08:25:04PM +0300, Laurent Pinchart wrote:
> > The dss_mgr_connect() and dss_mgr_disconnect() functions take two
> > omap_dss_device pointers as parameters, which are always set to the same
> > value by all callers. Remove the duplicated pointer.
> >
> > Signed-off-by: Laurent Pinchart
> > ---
> >
> > drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +++-
> > drivers/gpu/drm/omapdrm/dss/dsi.c | 8 +++-
> > drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +++-
> > drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +++-
> > drivers/gpu/drm/omapdrm/dss/omapdss.h | 6 ++
> > drivers/gpu/drm/omapdrm/dss/output.c | 9 -
> > drivers/gpu/drm/omapdrm/dss/sdi.c | 8 +++-
> > drivers/gpu/drm/omapdrm/dss/venc.c| 8 +++-
> > 8 files changed, 24 insertions(+), 39 deletions(-)
[snip]
> > diff --git a/drivers/gpu/drm/omapdrm/dss/output.c
> > b/drivers/gpu/drm/omapdrm/dss/output.c index 191b2e801257..2f7a019d059e
> > 100644
> > --- a/drivers/gpu/drm/omapdrm/dss/output.c
> > +++ b/drivers/gpu/drm/omapdrm/dss/output.c
> > @@ -109,18 +109,17 @@ void dss_uninstall_mgr_ops(struct dss_device *dss)
> > }
> > EXPORT_SYMBOL(dss_uninstall_mgr_ops);
> >
> > -int dss_mgr_connect(struct omap_dss_device *dssdev, struct
> > omap_dss_device *dst)
> > +int dss_mgr_connect(struct omap_dss_device *dssdev)
> > {
> > return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
> > -dssdev->dispc_channel, dst);
> > +dssdev->dispc_channel, dssdev);
>
> Maybe also change mgr_ops->connect, so that it only takes dssdev
> as a parameter? Otherwise
It would make sense, but patch 60/60 in this series drops the mgr_ops->connect
operation completely, so I don't think it's worth changing this.
> Reviewed-by: Sebastian Reichel
>
> > }
> > EXPORT_SYMBOL(dss_mgr_connect);
[snip]
--
Regards,
Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 46/60] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()
Hi,
On Sat, May 26, 2018 at 08:25:04PM +0300, Laurent Pinchart wrote:
> The dss_mgr_connect() and dss_mgr_disconnect() functions take two
> omap_dss_device pointers as parameters, which are always set to the same
> value by all callers. Remove the duplicated pointer.
>
> Signed-off-by: Laurent Pinchart
> ---
> drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +++-
> drivers/gpu/drm/omapdrm/dss/dsi.c | 8 +++-
> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +++-
> drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +++-
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 6 ++
> drivers/gpu/drm/omapdrm/dss/output.c | 9 -
> drivers/gpu/drm/omapdrm/dss/sdi.c | 8 +++-
> drivers/gpu/drm/omapdrm/dss/venc.c| 8 +++-
> 8 files changed, 24 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c
> b/drivers/gpu/drm/omapdrm/dss/dpi.c
> index 650becdf2763..68c8424a460d 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dpi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
> @@ -652,7 +652,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
>
> dpi_init_pll(dpi);
>
> - r = dss_mgr_connect(&dpi->output, dssdev);
> + r = dss_mgr_connect(dssdev);
> if (r)
> return r;
>
> @@ -660,7 +660,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
> if (r) {
> DSSERR("failed to connect output to new device: %s\n",
> dst->name);
> - dss_mgr_disconnect(&dpi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> return r;
> }
>
> @@ -670,11 +670,9 @@ static int dpi_connect(struct omap_dss_device *dssdev,
> static void dpi_disconnect(struct omap_dss_device *dssdev,
> struct omap_dss_device *dst)
> {
> - struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
> -
> omapdss_output_unset_device(dssdev);
>
> - dss_mgr_disconnect(&dpi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> }
>
> static const struct omap_dss_device_ops dpi_ops = {
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
> b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index b48ee792244b..2c2570e1ef2f 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -4915,7 +4915,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
> if (r)
> return r;
>
> - r = dss_mgr_connect(&dsi->output, dssdev);
> + r = dss_mgr_connect(dssdev);
> if (r)
> return r;
>
> @@ -4923,7 +4923,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
> if (r) {
> DSSERR("failed to connect output to new device: %s\n",
> dssdev->name);
> - dss_mgr_disconnect(&dsi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> return r;
> }
>
> @@ -4933,11 +4933,9 @@ static int dsi_connect(struct omap_dss_device *dssdev,
> static void dsi_disconnect(struct omap_dss_device *dssdev,
> struct omap_dss_device *dst)
> {
> - struct dsi_data *dsi = to_dsi_data(dssdev);
> -
> omapdss_output_unset_device(dssdev);
>
> - dss_mgr_disconnect(&dsi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> }
>
> static const struct omap_dss_device_ops dsi_ops = {
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> index 118c015624b9..5216c5554741 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> @@ -458,7 +458,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
> if (r)
> return r;
>
> - r = dss_mgr_connect(&hdmi->output, dssdev);
> + r = dss_mgr_connect(dssdev);
> if (r)
> return r;
>
> @@ -466,7 +466,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
> if (r) {
> DSSERR("failed to connect output to new device: %s\n",
> dst->name);
> - dss_mgr_disconnect(&hdmi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> return r;
> }
>
> @@ -476,11 +476,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
> static void hdmi_disconnect(struct omap_dss_device *dssdev,
> struct omap_dss_device *dst)
> {
> - struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
> -
> omapdss_output_unset_device(dssdev);
>
> - dss_mgr_disconnect(&hdmi->output, dssdev);
> + dss_mgr_disconnect(dssdev);
> }
>
> static int hdmi_read_edid(struct omap_dss_device *dssdev,
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> index 7af60ca4e7b2..363bc5843e0f 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> @@ -461,7 +461,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
> if (r)
> return r;
>
> - r = dss_mgr_
[PATCH v2 46/60] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()
The dss_mgr_connect() and dss_mgr_disconnect() functions take two
omap_dss_device pointers as parameters, which are always set to the same
value by all callers. Remove the duplicated pointer.
Signed-off-by: Laurent Pinchart
---
drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +++-
drivers/gpu/drm/omapdrm/dss/dsi.c | 8 +++-
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +++-
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +++-
drivers/gpu/drm/omapdrm/dss/omapdss.h | 6 ++
drivers/gpu/drm/omapdrm/dss/output.c | 9 -
drivers/gpu/drm/omapdrm/dss/sdi.c | 8 +++-
drivers/gpu/drm/omapdrm/dss/venc.c| 8 +++-
8 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 650becdf2763..68c8424a460d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -652,7 +652,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
dpi_init_pll(dpi);
- r = dss_mgr_connect(&dpi->output, dssdev);
+ r = dss_mgr_connect(dssdev);
if (r)
return r;
@@ -660,7 +660,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
- dss_mgr_disconnect(&dpi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
return r;
}
@@ -670,11 +670,9 @@ static int dpi_connect(struct omap_dss_device *dssdev,
static void dpi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
{
- struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
-
omapdss_output_unset_device(dssdev);
- dss_mgr_disconnect(&dpi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
}
static const struct omap_dss_device_ops dpi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index b48ee792244b..2c2570e1ef2f 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4915,7 +4915,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
- r = dss_mgr_connect(&dsi->output, dssdev);
+ r = dss_mgr_connect(dssdev);
if (r)
return r;
@@ -4923,7 +4923,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dssdev->name);
- dss_mgr_disconnect(&dsi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
return r;
}
@@ -4933,11 +4933,9 @@ static int dsi_connect(struct omap_dss_device *dssdev,
static void dsi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
{
- struct dsi_data *dsi = to_dsi_data(dssdev);
-
omapdss_output_unset_device(dssdev);
- dss_mgr_disconnect(&dsi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
}
static const struct omap_dss_device_ops dsi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 118c015624b9..5216c5554741 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -458,7 +458,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
- r = dss_mgr_connect(&hdmi->output, dssdev);
+ r = dss_mgr_connect(dssdev);
if (r)
return r;
@@ -466,7 +466,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
- dss_mgr_disconnect(&hdmi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
return r;
}
@@ -476,11 +476,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
static void hdmi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
{
- struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
omapdss_output_unset_device(dssdev);
- dss_mgr_disconnect(&hdmi->output, dssdev);
+ dss_mgr_disconnect(dssdev);
}
static int hdmi_read_edid(struct omap_dss_device *dssdev,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 7af60ca4e7b2..363bc5843e0f 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -461,7 +461,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
- r = dss_mgr_connect(&hdmi->output, dssdev);
+ r = dss_mgr_connect(dssdev);
if (r)
return r;
@@ -469,7 +469,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR
