| Message ID | 20201105120333.947408-46-tomi.valkeinen@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Convert DSI code to use drm_mipi_dsi and drm_panel | expand |
Hi Tomi and Sebastian, Thank you for the patch. On Thu, Nov 05, 2020 at 02:03:22PM +0200, Tomi Valkeinen wrote: > From: Sebastian Reichel <sebastian.reichel@collabora.com> > > Since all encoders and panels are using the bridge API now, > we next pointer is no longer useful and can be dropped. I would squash this with the previous patch. > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/omapdrm/dss/base.c | 2 +- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - > drivers/gpu/drm/omapdrm/dss/output.c | 13 +------------ > drivers/gpu/drm/omapdrm/omap_encoder.c | 4 ---- > 4 files changed, 2 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c > index c2791305c332..d62713b241d2 100644 > --- a/drivers/gpu/drm/omapdrm/dss/base.c > +++ b/drivers/gpu/drm/omapdrm/dss/base.c > @@ -135,7 +135,7 @@ struct omap_dss_device *omapdss_device_next_output(struct omap_dss_device *from) > goto done; > } > > - if (dssdev->id && (dssdev->next || dssdev->bridge)) > + if (dssdev->id && (dssdev->bridge)) No need for the inner parentheses. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > goto done; > } > > diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h > index 5d6edec5a427..1f02d3e406dc 100644 > --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h > +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h > @@ -293,7 +293,6 @@ struct omap_dss_device { > struct module *owner; > > struct dss_device *dss; > - struct omap_dss_device *next; > struct drm_bridge *bridge; > struct drm_bridge *next_bridge; > struct drm_panel *panel; > diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c > index ce21c798cca6..40cb353572f6 100644 > --- a/drivers/gpu/drm/omapdrm/dss/output.c > +++ b/drivers/gpu/drm/omapdrm/dss/output.c > @@ -30,7 +30,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, > return 0; > } > > - out->next = omapdss_find_device_by_node(remote_node); > out->bridge = of_drm_find_bridge(remote_node); > out->panel = of_drm_find_panel(remote_node); > if (IS_ERR(out->panel)) > @@ -38,12 +37,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, > > of_node_put(remote_node); > > - if (out->next && out->type != out->next->type) { > - dev_err(out->dev, "output type and display type don't match\n"); > - ret = -EINVAL; > - goto error; > - } > - > if (out->panel) { > struct drm_bridge *bridge; > > @@ -69,7 +62,7 @@ int omapdss_device_init_output(struct omap_dss_device *out, > out->bridge = local_bridge; > } > > - if (!out->next && !out->bridge) { > + if (!out->bridge) { > ret = -EPROBE_DEFER; > goto error; > } > @@ -78,7 +71,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, > > error: > omapdss_device_cleanup_output(out); > - out->next = NULL; > return ret; > } > EXPORT_SYMBOL(omapdss_device_init_output); > @@ -88,9 +80,6 @@ void omapdss_device_cleanup_output(struct omap_dss_device *out) > if (out->bridge && out->panel) > drm_panel_bridge_remove(out->next_bridge ? > out->next_bridge : out->bridge); > - > - if (out->next) > - omapdss_device_put(out->next); > } > EXPORT_SYMBOL(omapdss_device_cleanup_output); > > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c > index 610c5a2f2771..5f5fa01240a7 100644 > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > @@ -75,7 +75,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, > { > struct omap_encoder *omap_encoder = to_omap_encoder(encoder); > struct omap_dss_device *output = omap_encoder->output; > - struct omap_dss_device *dssdev; > struct drm_device *dev = encoder->dev; > struct drm_connector *connector; > struct drm_bridge *bridge; > @@ -98,9 +97,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, > * > * A better solution is to use DRM's bus-flags through the whole driver. > */ > - for (dssdev = output; dssdev; dssdev = dssdev->next) > - omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags); > - > for (bridge = output->bridge; bridge; > bridge = drm_bridge_get_next_bridge(bridge)) { > if (!bridge->timings) -- Regards, Laurent Pinchart
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c index c2791305c332..d62713b241d2 100644 --- a/drivers/gpu/drm/omapdrm/dss/base.c +++ b/drivers/gpu/drm/omapdrm/dss/base.c @@ -135,7 +135,7 @@ struct omap_dss_device *omapdss_device_next_output(struct omap_dss_device *from) goto done; } - if (dssdev->id && (dssdev->next || dssdev->bridge)) + if (dssdev->id && (dssdev->bridge)) goto done; } diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 5d6edec5a427..1f02d3e406dc 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -293,7 +293,6 @@ struct omap_dss_device { struct module *owner; struct dss_device *dss; - struct omap_dss_device *next; struct drm_bridge *bridge; struct drm_bridge *next_bridge; struct drm_panel *panel; diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c index ce21c798cca6..40cb353572f6 100644 --- a/drivers/gpu/drm/omapdrm/dss/output.c +++ b/drivers/gpu/drm/omapdrm/dss/output.c @@ -30,7 +30,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, return 0; } - out->next = omapdss_find_device_by_node(remote_node); out->bridge = of_drm_find_bridge(remote_node); out->panel = of_drm_find_panel(remote_node); if (IS_ERR(out->panel)) @@ -38,12 +37,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, of_node_put(remote_node); - if (out->next && out->type != out->next->type) { - dev_err(out->dev, "output type and display type don't match\n"); - ret = -EINVAL; - goto error; - } - if (out->panel) { struct drm_bridge *bridge; @@ -69,7 +62,7 @@ int omapdss_device_init_output(struct omap_dss_device *out, out->bridge = local_bridge; } - if (!out->next && !out->bridge) { + if (!out->bridge) { ret = -EPROBE_DEFER; goto error; } @@ -78,7 +71,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, error: omapdss_device_cleanup_output(out); - out->next = NULL; return ret; } EXPORT_SYMBOL(omapdss_device_init_output); @@ -88,9 +80,6 @@ void omapdss_device_cleanup_output(struct omap_dss_device *out) if (out->bridge && out->panel) drm_panel_bridge_remove(out->next_bridge ? out->next_bridge : out->bridge); - - if (out->next) - omapdss_device_put(out->next); } EXPORT_SYMBOL(omapdss_device_cleanup_output); diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 610c5a2f2771..5f5fa01240a7 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c @@ -75,7 +75,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, { struct omap_encoder *omap_encoder = to_omap_encoder(encoder); struct omap_dss_device *output = omap_encoder->output; - struct omap_dss_device *dssdev; struct drm_device *dev = encoder->dev; struct drm_connector *connector; struct drm_bridge *bridge; @@ -98,9 +97,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, * * A better solution is to use DRM's bus-flags through the whole driver. */ - for (dssdev = output; dssdev; dssdev = dssdev->next) - omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags); - for (bridge = output->bridge; bridge; bridge = drm_bridge_get_next_bridge(bridge)) { if (!bridge->timings)