From: Dave Airlie <airlied@redhat.com>
Date: Fri, 21 Jul 2017 04:04:44 +0000 (+1000)
Subject: Merge tag 'imx-drm-fixes-2017-07-18' of git://git.pengutronix.de/git/pza/linux into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5896ec77d70d33dd38a455b0aa5f3154aeecea09;p=linux.git

Merge tag 'imx-drm-fixes-2017-07-18' of git://git.pengutronix.de/git/pza/linux into drm-fixes

imx-drm: fix parallel display regression and typo in plane format list

- Fix a regression where the parallel-display driver would not probe
  anymore if no panel is specified in the device tree, since the
  introduction of drm_of_find_panel_or_bridge.
- Fix a typo in the plane format list: replace a duplicate BGRA8888 format
  with BGRX8888, as originally intended.

* tag 'imx-drm-fixes-2017-07-18' of git://git.pengutronix.de/git/pza/linux:
  drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure
  drm/imx: fix typo in ipu_plane_formats[]
---

5896ec77d70d33dd38a455b0aa5f3154aeecea09