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@xxxxxx>
---
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 42279933790e..1159bf8e2c6c 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -55,6 +55,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 c2166d2d3f29..89588984d913 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 173aa6a95757..4e58343d5db2 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -17,6 +17,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>
@@ -175,6 +177,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;
@@ -189,6 +203,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)
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
