diff options
author | Dave Airlie <airlied@redhat.com> | 2017-07-27 00:15:43 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-07-27 00:15:43 +0200 |
commit | 0eb2c0ae578ba00f97c7541e01abbce022d14909 (patch) | |
tree | 172db28b9232906ddac61b4bf20c4b0c60c85139 /drivers/gpu/drm/imx/ipuv3-plane.c | |
parent | Merge tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm... (diff) | |
parent | Linux 4.13-rc2 (diff) | |
download | linux-0eb2c0ae578ba00f97c7541e01abbce022d14909.tar.xz linux-0eb2c0ae578ba00f97c7541e01abbce022d14909.zip |
Backmerge tag 'v4.13-rc2' into drm-next
Linux 4.13-rc2
This is required for drm-misc fixing.
Diffstat (limited to 'drivers/gpu/drm/imx/ipuv3-plane.c')
-rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index ff53c8dec633..0847cc0d96a4 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, |