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

Commit 909ef254 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-01-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

Just one vc4 fix.

* tag 'drm-misc-fixes-2018-01-08' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/vc4: Move IRQ enable to PM path
parents b2cd1df6 ce9caf2f

drivers/gpu/drm/vc4/vc4_irq.c

+0 −3
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ vc4_irq_postinstall(struct drm_device *dev) 
{

	struct vc4_dev *vc4 = to_vc4_dev(dev);



	/* Undo the effects of a previous vc4_irq_uninstall. */

	enable_irq(dev->irq);



	/* Enable both the render done and out of memory interrupts. */

	V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);

drivers/gpu/drm/vc4/vc4_v3d.c

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ static int vc4_v3d_runtime_resume(struct device *dev) 
		return ret;



	vc4_v3d_init_hw(vc4->dev);



	/* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */

	enable_irq(vc4->dev->irq);

	vc4_irq_postinstall(vc4->dev);



	return 0;