Commit e6700703 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-v5.18' of... 

Merge tag 'exynos-drm-next-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

New feature
- Add BGR pixel format support for FIMD device. As for this,
  this patch uses undocumented register, WIN_RGB_ORDER, but
  it is safe because product kernels have been using same
  register.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220304085220.324245-1-inki.dae@samsung.com
parents 6de7e4f0 2d684f4e

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+3 −9
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ static int decon_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct decon_context *ctx;

	struct device_node *i80_if_timings;

	struct resource *res;

	int ret;



	if (!dev->of_node)
@@ -728,16 +727,11 @@ static int decon_probe(struct platform_device *pdev) 
		goto err_iounmap;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

					   ctx->i80_if ? "lcd_sys" : "vsync");

	if (!res) {

		dev_err(dev, "irq request failed.\n");

		ret = -ENXIO;

	ret =  platform_get_irq_byname(pdev, ctx->i80_if ? "lcd_sys" : "vsync");

	if (ret < 0)

		goto err_iounmap;

	}



	ret = devm_request_irq(dev, res->start, decon_irq_handler,

							0, "drm_decon", ctx);

	ret = devm_request_irq(dev, ret, decon_irq_handler, 0, "drm_decon", ctx);

	if (ret) {

		dev_err(dev, "irq request failed.\n");

		goto err_iounmap;

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+4 −2
Original line number Diff line number Diff line
@@ -1335,8 +1335,10 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, 
	int ret;

	int te_gpio_irq;



	dsi->te_gpio = devm_gpiod_get_optional(dsi->dev, "te", GPIOD_IN);

	if (IS_ERR(dsi->te_gpio)) {

	dsi->te_gpio = gpiod_get_optional(panel, "te", GPIOD_IN);

	if (!dsi->te_gpio) {

		return 0;

	} else if (IS_ERR(dsi->te_gpio)) {

		dev_err(dsi->dev, "gpio request failed with %ld\n",

				PTR_ERR(dsi->te_gpio));

		return PTR_ERR(dsi->te_gpio);

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+5 −8
Original line number Diff line number Diff line
@@ -1267,7 +1267,6 @@ static int fimc_probe(struct platform_device *pdev) 
	struct exynos_drm_ipp_formats *formats;

	struct device *dev = &pdev->dev;

	struct fimc_context *ctx;

	struct resource *res;

	int ret;

	int i, j, num_limits, num_formats;
@@ -1330,13 +1329,11 @@ static int fimc_probe(struct platform_device *pdev) 
		return PTR_ERR(ctx->regs);



	/* resource irq */

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "failed to request irq resource.\n");

		return -ENOENT;

	}

	ret = platform_get_irq(pdev, 0);

	if (ret < 0)

		return ret;



	ret = devm_request_irq(dev, res->start, fimc_irq_handler,

	ret = devm_request_irq(dev, ret, fimc_irq_handler,

			       0, dev_name(dev), ctx);

	if (ret < 0) {

		dev_err(dev, "failed to request irq.\n");

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+44 −11
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct fimd_driver_data { 
	unsigned int has_dp_clk:1;

	unsigned int has_hw_trigger:1;

	unsigned int has_trigger_per_te:1;

	unsigned int has_bgr_support:1;

};



static struct fimd_driver_data s3c64xx_fimd_driver_data = {
@@ -138,6 +139,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { 
	.lcdblk_bypass_shift = 1,

	.has_shadowcon = 1,

	.has_vtsel = 1,

	.has_bgr_support = 1,

};



static struct fimd_driver_data exynos5_fimd_driver_data = {
@@ -149,6 +151,7 @@ static struct fimd_driver_data exynos5_fimd_driver_data = { 
	.has_vidoutcon = 1,

	.has_vtsel = 1,

	.has_dp_clk = 1,

	.has_bgr_support = 1,

};



static struct fimd_driver_data exynos5420_fimd_driver_data = {
@@ -162,6 +165,7 @@ static struct fimd_driver_data exynos5420_fimd_driver_data = { 
	.has_vtsel = 1,

	.has_mic_bypass = 1,

	.has_dp_clk = 1,

	.has_bgr_support = 1,

};



struct fimd_context {
@@ -226,6 +230,18 @@ static const uint32_t fimd_formats[] = { 
	DRM_FORMAT_ARGB8888,

};



static const uint32_t fimd_extended_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_XRGB1555,

	DRM_FORMAT_XBGR1555,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_BGR565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

};



static const unsigned int capabilities[WINDOWS_NR] = {

	0,

	EXYNOS_DRM_PLANE_CAP_WIN_BLEND | EXYNOS_DRM_PLANE_CAP_PIX_BLEND,
@@ -673,21 +689,25 @@ static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win, 
		val |= WINCONx_BYTSWP;

		break;

	case DRM_FORMAT_XRGB1555:

	case DRM_FORMAT_XBGR1555:

		val |= WINCON0_BPPMODE_16BPP_1555;

		val |= WINCONx_HAWSWP;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_BGR565:

		val |= WINCON0_BPPMODE_16BPP_565;

		val |= WINCONx_HAWSWP;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

		val |= WINCON0_BPPMODE_24BPP_888;

		val |= WINCONx_WSWP;

		val |= WINCONx_BURSTLEN_16WORD;

		break;

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ABGR8888:

	default:

		val |= WINCON1_BPPMODE_25BPP_A1888;

		val |= WINCONx_WSWP;
@@ -695,6 +715,18 @@ static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win, 
		break;

	}



	switch (pixel_format) {

	case DRM_FORMAT_XBGR1555:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ABGR8888:

	case DRM_FORMAT_BGR565:

		writel(WIN_RGB_ORDER_REVERSE, ctx->regs + WIN_RGB_ORDER(win));

		break;

	default:

		writel(WIN_RGB_ORDER_FORWARD, ctx->regs + WIN_RGB_ORDER(win));

		break;

	}



	/*

	 * Setting dma-burst to 16Word causes permanent tearing for very small

	 * buffers, e.g. cursor buffer. Burst Mode switching which based on
@@ -1074,8 +1106,14 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
	ctx->drm_dev = drm_dev;



	for (i = 0; i < WINDOWS_NR; i++) {

		if (ctx->driver_data->has_bgr_support) {

			ctx->configs[i].pixel_formats = fimd_extended_formats;

			ctx->configs[i].num_pixel_formats = ARRAY_SIZE(fimd_extended_formats);

		} else {

			ctx->configs[i].pixel_formats = fimd_formats;

			ctx->configs[i].num_pixel_formats = ARRAY_SIZE(fimd_formats);

		}



		ctx->configs[i].zpos = i;

		ctx->configs[i].type = fimd_win_types[i];

		ctx->configs[i].capabilities = capabilities[i];
@@ -1133,7 +1171,6 @@ static int fimd_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct fimd_context *ctx;

	struct device_node *i80_if_timings;

	struct resource *res;

	int ret;



	if (!dev->of_node)
@@ -1206,15 +1243,11 @@ static int fimd_probe(struct platform_device *pdev) 
	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);



	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

					   ctx->i80_if ? "lcd_sys" : "vsync");

	if (!res) {

		dev_err(dev, "irq request failed.\n");

		return -ENXIO;

	}

	ret = platform_get_irq_byname(pdev, ctx->i80_if ? "lcd_sys" : "vsync");

	if (ret < 0)

		return ret;



	ret = devm_request_irq(dev, res->start, fimd_irq_handler,

							0, "drm_fimd", ctx);

	ret = devm_request_irq(dev, ret, fimd_irq_handler, 0, "drm_fimd", ctx);

	if (ret) {

		dev_err(dev, "irq request failed.\n");

		return ret;

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+3 −7
Original line number Diff line number Diff line
@@ -1220,7 +1220,6 @@ static int gsc_probe(struct platform_device *pdev) 
	struct gsc_driverdata *driver_data;

	struct exynos_drm_ipp_formats *formats;

	struct gsc_context *ctx;

	struct resource *res;

	int num_formats, ret, i, j;



	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
@@ -1275,13 +1274,10 @@ static int gsc_probe(struct platform_device *pdev) 
		return PTR_ERR(ctx->regs);



	/* resource irq */

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "failed to request irq resource.\n");

		return -ENOENT;

	}

	ctx->irq = platform_get_irq(pdev, 0);

	if (ctx->irq < 0)

		return ctx->irq;



	ctx->irq = res->start;

	ret = devm_request_irq(dev, ctx->irq, gsc_irq_handler, 0,

			       dev_name(dev), ctx);

	if (ret < 0) {