aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2016-05-24 08:31:49 +0200
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-05-30 09:14:00 +0200
commitc82b4d73e2cd32fff41be0cd6e75ea83d32943b3 (patch)
tree762d21fe0ac1674ae46dbc7672826e435aa56725 /drivers/gpu/drm/imx
parentdrm/imx: parallel-display: remove dead code (diff)
downloadlinux-dev-c82b4d73e2cd32fff41be0cd6e75ea83d32943b3.tar.xz
linux-dev-c82b4d73e2cd32fff41be0cd6e75ea83d32943b3.zip
drm/imx: imx-ldb: honor 'native-mode' property when selecting video mode from DT
This patch allows to select a specific video mode from a list of modes defined in DT by setting the 'native-mode' property appropriately. This change does not affect the behaviour of existing platforms, since they either: - have just one display-timings subnode - have the native-mode property pointing to the first entry - let the bootloader select the appropriate timing Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx')
-rw-r--r--drivers/gpu/drm/imx/imx-ldb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 5f8f0bf45a62..beff793bb717 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -25,6 +25,7 @@
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include <linux/of_device.h>
#include <linux/of_graph.h>
+#include <video/of_display_timing.h>
#include <video/of_videomode.h>
#include <linux/regmap.h>
#include <linux/videodev2.h>
@@ -625,7 +626,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
/* fallback to display-timings node */
ret = of_get_drm_display_mode(child,
&channel->mode,
- 0);
+ OF_USE_NATIVE_MODE);
if (!ret)
channel->mode_valid = 1;
}