Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7772fdae authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: Support ARGB and ABGR formats 



These formats can easily be supported on all generations of Tegra.

Note that the XRGB and XBGR formats that we supported were in fact using
the ARGB and ABGR Tegra formats. This happened to work in cases where no
alpha was being considered. This change is also a fix for those formats.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 47307954

drivers/gpu/drm/tegra/dc.c

+4 −0
Original line number Diff line number Diff line
@@ -287,7 +287,9 @@ static void tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index, 


static const u32 tegra_primary_plane_formats[] = {

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_RGB565,

};
@@ -630,7 +632,9 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm, 


static const uint32_t tegra_overlay_plane_formats[] = {

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_UYVY,

	DRM_FORMAT_YUYV,

drivers/gpu/drm/tegra/dc.h

+2 −0
Original line number Diff line number Diff line
@@ -598,6 +598,8 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc); 
#define WIN_COLOR_DEPTH_YUV422R        23

#define WIN_COLOR_DEPTH_YCbCr422RA     24

#define WIN_COLOR_DEPTH_YUV422RA       25

#define WIN_COLOR_DEPTH_B8G8R8X8       37

#define WIN_COLOR_DEPTH_R8G8B8X8       38



#define DC_WIN_POSITION				0x704

#define H_POSITION(x) (((x) & 0x1fff) <<  0) /* XXX 0x7fff on Tegra186 */

drivers/gpu/drm/tegra/plane.c

+8 −0
Original line number Diff line number Diff line
@@ -111,10 +111,18 @@ int tegra_plane_format(u32 fourcc, u32 *format, u32 *swap) 


	switch (fourcc) {

	case DRM_FORMAT_XBGR8888:

		*format = WIN_COLOR_DEPTH_R8G8B8X8;

		break;



	case DRM_FORMAT_ABGR8888:

		*format = WIN_COLOR_DEPTH_R8G8B8A8;

		break;



	case DRM_FORMAT_XRGB8888:

		*format = WIN_COLOR_DEPTH_B8G8R8X8;

		break;



	case DRM_FORMAT_ARGB8888:

		*format = WIN_COLOR_DEPTH_B8G8R8A8;

		break;