| Message ID | 1518428694-18018-10-git-send-email-tomi.valkeinen@ti.com |
|---|---|
| State | Accepted |
| Commit | eb5bc1f92ba38ae16a4db499e3ebeb0b86fe769e |
| Headers | show |
| Series | drm/omap: misc patches | expand |
Hi Tomi, Thank you for the patch. On Monday, 12 February 2018 11:44:39 EET Tomi Valkeinen wrote: > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > Sort the dssdev array based on DT aliases. > > With this change we can remove the panel ordering from dss/display.c and > have all sorting related to dssdevs in one place. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/omapdrm/dss/display.c | 2 ++ > drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 + > drivers/gpu/drm/omapdrm/omap_drv.c | 18 ++++++++++++++++++ > 3 files changed, 21 insertions(+) > > diff --git a/drivers/gpu/drm/omapdrm/dss/display.c > b/drivers/gpu/drm/omapdrm/dss/display.c index 424143128cd4..3ef99f344bd3 > 100644 > --- a/drivers/gpu/drm/omapdrm/dss/display.c > +++ b/drivers/gpu/drm/omapdrm/dss/display.c > @@ -52,6 +52,8 @@ int omapdss_register_display(struct omap_dss_device > *dssdev) if (id < 0) > id = disp_num_counter++; > > + dssdev->alias_id = id; > + > snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id); > > /* Use 'label' property for name, if it exists */ > diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h > b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 4222661d4c88..bd5f174a3c56 > 100644 > --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h > +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h > @@ -478,6 +478,7 @@ struct omap_dss_device { > > /* alias in the form of "display%d" */ > char alias[16]; > + int alias_id; Can the alias ID be negative ? Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > enum omap_display_type type; > enum omap_display_type output_type; > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c > b/drivers/gpu/drm/omapdrm/omap_drv.c index b5061fc7241a..877c3749f69b > 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -15,6 +15,8 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <linux/of.h> > +#include <linux/sort.h> > #include <linux/sys_soc.h> > > #include <drm/drm_atomic.h> > @@ -165,6 +167,18 @@ static void omap_disconnect_dssdevs(struct drm_device > *ddev) priv->num_dssdevs = 0; > } > > +static int omap_compare_dssdevs(const void *a, const void *b) > +{ > + const struct omap_dss_device *dssdev1 = *(struct omap_dss_device **)a; > + const struct omap_dss_device *dssdev2 = *(struct omap_dss_device **)b; > + > + if (dssdev1->alias_id > dssdev2->alias_id) > + return 1; > + else if (dssdev1->alias_id < dssdev2->alias_id) > + return -1; > + return 0; > +} > + > static void omap_collect_dssdevs(struct drm_device *ddev) > { > struct omap_drm_private *priv = ddev->dev_private; > @@ -179,6 +193,10 @@ static void omap_collect_dssdevs(struct drm_device > *ddev) break; > } > } > + > + /* Sort the list by DT aliases */ > + sort(priv->dssdevs, priv->num_dssdevs, sizeof(priv->dssdevs[0]), > + omap_compare_dssdevs, NULL); > } > > static int omap_connect_dssdevs(struct drm_device *ddev)
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c index 424143128cd4..3ef99f344bd3 100644 --- a/drivers/gpu/drm/omapdrm/dss/display.c +++ b/drivers/gpu/drm/omapdrm/dss/display.c @@ -52,6 +52,8 @@ int omapdss_register_display(struct omap_dss_device *dssdev) if (id < 0) id = disp_num_counter++; + dssdev->alias_id = id; + snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id); /* Use 'label' property for name, if it exists */ diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 4222661d4c88..bd5f174a3c56 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -478,6 +478,7 @@ struct omap_dss_device { /* alias in the form of "display%d" */ char alias[16]; + int alias_id; enum omap_display_type type; enum omap_display_type output_type; diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index b5061fc7241a..877c3749f69b 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -15,6 +15,8 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/of.h> +#include <linux/sort.h> #include <linux/sys_soc.h> #include <drm/drm_atomic.h> @@ -165,6 +167,18 @@ static void omap_disconnect_dssdevs(struct drm_device *ddev) priv->num_dssdevs = 0; } +static int omap_compare_dssdevs(const void *a, const void *b) +{ + const struct omap_dss_device *dssdev1 = *(struct omap_dss_device **)a; + const struct omap_dss_device *dssdev2 = *(struct omap_dss_device **)b; + + if (dssdev1->alias_id > dssdev2->alias_id) + return 1; + else if (dssdev1->alias_id < dssdev2->alias_id) + return -1; + return 0; +} + static void omap_collect_dssdevs(struct drm_device *ddev) { struct omap_drm_private *priv = ddev->dev_private; @@ -179,6 +193,10 @@ static void omap_collect_dssdevs(struct drm_device *ddev) break; } } + + /* Sort the list by DT aliases */ + sort(priv->dssdevs, priv->num_dssdevs, sizeof(priv->dssdevs[0]), + omap_compare_dssdevs, NULL); } static int omap_connect_dssdevs(struct drm_device *ddev)