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

Merge tag 'exynos-drm-fixes-v5.17-rc6' of... 

Merge tag 'exynos-drm-fixes-v5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

Fixups
- Make display controller drivers for Exynos series to use
  platform_get_irq and platform_get_irq_byname functions
  to get the interrupt, which prevents irq chaning from messed up
  when using hierarchical interrupt domains which use "interrupts"
  property in the node.
- Fix two regressions to TE-gpio handling.

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

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220225014042.17637-1-inki.dae@samsung.com
parents 7e57714c 4188db23

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
@@ -1334,8 +1334,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

+4 −9
Original line number Diff line number Diff line
@@ -1133,7 +1133,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 +1205,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) {