Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cf915d3 authored by Dave Airlie's avatar Dave Airlie
Browse files

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 49f98bc4 ("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
parents ac5e43c9 ff615eed

drivers/gpu/drm/imx/imx-ldb.c

+2 −5
Original line number Diff line number Diff line
@@ -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;