Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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[]

+2 -2
+1 -1
drivers/gpu/drm/imx/ipuv3-plane.c
··· 54 54 DRM_FORMAT_RGBA8888, 55 55 DRM_FORMAT_RGBX8888, 56 56 DRM_FORMAT_BGRA8888, 57 - DRM_FORMAT_BGRA8888, 57 + DRM_FORMAT_BGRX8888, 58 58 DRM_FORMAT_UYVY, 59 59 DRM_FORMAT_VYUY, 60 60 DRM_FORMAT_YUYV,
+1 -1
drivers/gpu/drm/imx/parallel-display.c
··· 237 237 238 238 /* port@1 is the output port */ 239 239 ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel, &imxpd->bridge); 240 - if (ret) 240 + if (ret && ret != -ENODEV) 241 241 return ret; 242 242 243 243 imxpd->dev = dev;