diff --git a/[refs] b/[refs] index b0cf5df86f41..1087c6a8a4be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d43f81cbaf43531a977e8b4c4427f19acf8a5061 +refs/heads/master: dbe4d9a799b5825201b4ca5261dee631245936da diff --git a/trunk/drivers/gpu/host1x/drm/dc.c b/trunk/drivers/gpu/host1x/drm/dc.c index 85ea6163a7b0..1e2060324f02 100644 --- a/trunk/drivers/gpu/host1x/drm/dc.c +++ b/trunk/drivers/gpu/host1x/drm/dc.c @@ -105,7 +105,9 @@ static const struct drm_plane_funcs tegra_plane_funcs = { }; static const uint32_t plane_formats[] = { + DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888, + DRM_FORMAT_RGB565, DRM_FORMAT_UYVY, DRM_FORMAT_YUV420, DRM_FORMAT_YUV422, @@ -543,6 +545,9 @@ int tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index, unsigned int tegra_dc_format(uint32_t format) { switch (format) { + case DRM_FORMAT_XBGR8888: + return WIN_COLOR_DEPTH_R8G8B8A8; + case DRM_FORMAT_XRGB8888: return WIN_COLOR_DEPTH_B8G8R8A8;