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

Commit fbbb1e1a authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Inki Dae
Browse files

drm/exynos: Properly report supported formats for each device 



Exynos DRM reported that all planes for all supported sub-devices supports
only three pixel formats: XRGB24, ARGB24 and NV12. This patch lets each
Exynos DRM sub-drivers to provide the list of supported pixel formats
and registers this list to DRM core.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 74f230d2

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+9 −1
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ static const char * const decon_clks_name[] = { 
	"sclk_decon_eclk",

};



static const uint32_t decon_formats[] = {

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

};



static int decon_enable_vblank(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -497,7 +504,8 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

							DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

				1 << ctx->pipe, type, zpos);

				1 << ctx->pipe, type, decon_formats,

				ARRAY_SIZE(decon_formats), zpos);

		if (ret)

			return ret;

	}

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+14 −1
Original line number Diff line number Diff line
@@ -70,6 +70,18 @@ static const struct of_device_id decon_driver_dt_match[] = { 
};

MODULE_DEVICE_TABLE(of, decon_driver_dt_match);



static const uint32_t decon_formats[] = {

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_RGBX8888,

	DRM_FORMAT_BGRX8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_RGBA8888,

	DRM_FORMAT_BGRA8888,

};



static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -693,7 +705,8 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

						DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

					1 << ctx->pipe, type, zpos);

					1 << ctx->pipe, type, decon_formats,

					ARRAY_SIZE(decon_formats), zpos);

		if (ret)

			return ret;

	}

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+10 −1
Original line number Diff line number Diff line
@@ -188,6 +188,14 @@ static const struct of_device_id fimd_driver_dt_match[] = { 
};

MODULE_DEVICE_TABLE(of, fimd_driver_dt_match);



static const uint32_t fimd_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

};



static inline struct fimd_driver_data *drm_fimd_get_driver_data(

	struct platform_device *pdev)

{
@@ -956,7 +964,8 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

						DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

					1 << ctx->pipe, type, zpos);

					1 << ctx->pipe, type, fimd_formats,

					ARRAY_SIZE(fimd_formats), zpos);

		if (ret)

			return ret;

	}

drivers/gpu/drm/exynos/exynos_drm_plane.c

+3 −8
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
#include "exynos_drm_gem.h"

#include "exynos_drm_plane.h"



static const uint32_t formats[] = {

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_NV12,

};



/*

 * This function is to get X or Y size shown via screen. This needs length and

 * start position of CRTC.
@@ -217,13 +211,14 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane, 
int exynos_plane_init(struct drm_device *dev,

		      struct exynos_drm_plane *exynos_plane,

		      unsigned long possible_crtcs, enum drm_plane_type type,

		      const uint32_t *formats, unsigned int fcount,

		      unsigned int zpos)

{

	int err;



	err = drm_universal_plane_init(dev, &exynos_plane->base, possible_crtcs,

				       &exynos_plane_funcs, formats,

				       ARRAY_SIZE(formats), type);

				       &exynos_plane_funcs, formats, fcount,

				       type);

	if (err) {

		DRM_ERROR("failed to initialize plane\n");

		return err;

drivers/gpu/drm/exynos/exynos_drm_plane.h

+1 −0
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ 
int exynos_plane_init(struct drm_device *dev,

		      struct exynos_drm_plane *exynos_plane,

		      unsigned long possible_crtcs, enum drm_plane_type type,

		      const uint32_t *formats, unsigned int fcount,

		      unsigned int zpos);