diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-07-21 14:04:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-07-21 14:04:44 +1000 |
| commit | 5896ec77d70d33dd38a455b0aa5f3154aeecea09 (patch) | |
| tree | 6fc39002d3b4d30de3dadc426fa393bfa5e82e27 /drivers | |
| parent | 660f6b5c639228cf53b4eecda86c8dd9055bed53 (diff) | |
| parent | 799ee2970485dc206c3bf347d6e6827c04d5e4f9 (diff) | |
| download | linux-5896ec77d70d33dd38a455b0aa5f3154aeecea09.tar.bz2 | |
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[]
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 49546222c6d3..6276bb834b4f 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -54,7 +54,7 @@ static const uint32_t ipu_plane_formats[] = { DRM_FORMAT_RGBA8888, DRM_FORMAT_RGBX8888, DRM_FORMAT_BGRA8888, - DRM_FORMAT_BGRA8888, + DRM_FORMAT_BGRX8888, DRM_FORMAT_UYVY, DRM_FORMAT_VYUY, DRM_FORMAT_YUYV, diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 636031a30e17..8aca20209cb8 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -237,7 +237,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) /* port@1 is the output port */ ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel, &imxpd->bridge); - if (ret) + if (ret && ret != -ENODEV) return ret; imxpd->dev = dev; |