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

Merge tag 'exynos-drm-next-for-v5.13' of... 

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

One cleanup
- Based on the patch[1], clean up the use of request_irq function
  series.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git/commit/?id=cbe16f35bee6880becca6f20d2ebf6b457148552



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

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1617092998-23645-1-git-send-email-inki.dae@samsung.com
parents 2f835b5d a4e5eed2

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+2 −2
Original line number Diff line number Diff line
@@ -775,8 +775,8 @@ static int decon_conf_irq(struct decon_context *ctx, const char *name, 
			return irq;

		}

	}

	irq_set_status_flags(irq, IRQ_NOAUTOEN);

	ret = devm_request_irq(ctx->dev, irq, handler, flags, "drm_decon", ctx);

	ret = devm_request_irq(ctx->dev, irq, handler,

			       flags | IRQF_NO_AUTOEN, "drm_decon", ctx);

	if (ret < 0) {

		dev_err(ctx->dev, "IRQ %s request failed\n", name);

		return ret;

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+3 −4
Original line number Diff line number Diff line
@@ -1352,10 +1352,9 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, 
	}



	te_gpio_irq = gpio_to_irq(dsi->te_gpio);

	irq_set_status_flags(te_gpio_irq, IRQ_NOAUTOEN);



	ret = request_threaded_irq(te_gpio_irq, exynos_dsi_te_irq_handler, NULL,

					IRQF_TRIGGER_RISING, "TE", dsi);

				   IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN, "TE", dsi);

	if (ret) {

		dev_err(dsi->dev, "request interrupt failed with %d\n", ret);

		gpio_free(dsi->te_gpio);
@@ -1802,9 +1801,9 @@ static int exynos_dsi_probe(struct platform_device *pdev) 
	if (dsi->irq < 0)

		return dsi->irq;



	irq_set_status_flags(dsi->irq, IRQ_NOAUTOEN);

	ret = devm_request_threaded_irq(dev, dsi->irq, NULL,

					exynos_dsi_irq, IRQF_ONESHOT,

					exynos_dsi_irq,

					IRQF_ONESHOT | IRQF_NO_AUTOEN,

					dev_name(dev), dsi);

	if (ret) {

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

include/linux/interrupt.h

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ 
 *                interrupt handler after suspending interrupts. For system

 *                wakeup devices users need to implement wakeup detection in

 *                their interrupt handlers.

 * IRQF_NO_AUTOEN - Don't enable IRQ or NMI automatically when users request it.

 *                Users will enable it explicitly by enable_irq() or enable_nmi()

 *                later.

 */

#define IRQF_SHARED		0x00000080

#define IRQF_PROBE_SHARED	0x00000100
@@ -74,6 +77,7 @@ 
#define IRQF_NO_THREAD		0x00010000

#define IRQF_EARLY_RESUME	0x00020000

#define IRQF_COND_SUSPEND	0x00040000

#define IRQF_NO_AUTOEN		0x00080000



#define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)

kernel/irq/manage.c

+9 −2
Original line number Diff line number Diff line
@@ -1693,7 +1693,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
			irqd_set(&desc->irq_data, IRQD_NO_BALANCING);

		}



		if (irq_settings_can_autoenable(desc)) {

		if (!(new->flags & IRQF_NO_AUTOEN) &&

		    irq_settings_can_autoenable(desc)) {

			irq_startup(desc, IRQ_RESEND, IRQ_START_COND);

		} else {

			/*
@@ -2086,10 +2087,15 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, 
	 * which interrupt is which (messes up the interrupt freeing

	 * logic etc).

	 *

	 * Also shared interrupts do not go well with disabling auto enable.

	 * The sharing interrupt might request it while it's still disabled

	 * and then wait for interrupts forever.

	 *

	 * Also IRQF_COND_SUSPEND only makes sense for shared interrupts and

	 * it cannot be set along with IRQF_NO_SUSPEND.

	 */

	if (((irqflags & IRQF_SHARED) && !dev_id) ||

	    ((irqflags & IRQF_SHARED) && (irqflags & IRQF_NO_AUTOEN)) ||

	    (!(irqflags & IRQF_SHARED) && (irqflags & IRQF_COND_SUSPEND)) ||

	    ((irqflags & IRQF_NO_SUSPEND) && (irqflags & IRQF_COND_SUSPEND)))

		return -EINVAL;
@@ -2245,7 +2251,8 @@ int request_nmi(unsigned int irq, irq_handler_t handler, 


	desc = irq_to_desc(irq);



	if (!desc || irq_settings_can_autoenable(desc) ||

	if (!desc || (irq_settings_can_autoenable(desc) &&

	    !(irqflags & IRQF_NO_AUTOEN)) ||

	    !irq_settings_can_request(desc) ||

	    WARN_ON(irq_settings_is_per_cpu_devid(desc)) ||

	    !irq_supports_nmi(desc))