summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-07-30 05:45:30 +1000
committerDave Airlie <airlied@redhat.com>2016-07-30 05:45:30 +1000
commit1cf915d305b6e1d57db6c35c208016f9747ba3c6 (patch)
treeaceea61168e44912934bd0c91a7f47acde1f7297 /drivers
parentac5e43c9a750665d5266e1482100e4299dacffcb (diff)
parentff615eed1141a9475559fdd60880a54b8cca9bf6 (diff)
downloadlinux-1cf915d305b6e1d57db6c35c208016f9747ba3c6.tar.bz2
Merge tag 'imx-drm-fixes-2016-07-27' of git://git.pengutronix.de/git/pza/linux into drm-next
imx-drm ldb mode set fix - fix imx-ldb mode setting, which was broken by commit 49f98bc4d44a4 ("drm/imx: store internal bus configuration in crtc state") * tag 'imx-drm-fixes-2016-07-27' of git://git.pengutronix.de/git/pza/linux: drm/imx: imx-ldb: do not try to dereference crtc->state->state in encoder mode_set
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/imx/imx-ldb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 5d2831dfb8b9..b03919ed60ba 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -297,15 +297,12 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
}
if (!bus_format) {
- struct drm_connector_state *conn_state;
struct drm_connector *connector;
- int i;
- for_each_connector_in_state(encoder->crtc->state->state,
- connector, conn_state, i) {
+ drm_for_each_connector(connector, encoder->dev) {
struct drm_display_info *di = &connector->display_info;
- if (conn_state->crtc == encoder->crtc &&
+ if (connector->encoder == encoder &&
di->num_bus_formats) {
bus_format = di->bus_formats[0];
break;