Skip to content

Commit

Permalink
Merge tag 'imx-drm-fixes-2016-07-27' of git://git.pengutronix.de/git/…
Browse files Browse the repository at this point in the history
…pza/linux into drm-next

imx-drm ldb mode set fix

- fix imx-ldb mode setting, which was broken by commit 49f98bc ("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
  • Loading branch information
airlied committed Jul 29, 2016
2 parents ac5e43c + ff615ee commit 1cf915d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/gpu/drm/imx/imx-ldb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1cf915d

Please sign in to comment.