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

Commit 3672583f authored by Jyri Sarha's avatar Jyri Sarha
Browse files

drm/tilcdc: Enable frame done irq and functionality for LCDC rev 1 



We should wait for the last frame to complete before shutting things
down also on LCDC rev 1.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Tested-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 75d7f277

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -171,7 +171,7 @@ static void tilcdc_crtc_enable_irqs(struct drm_device *dev) 




	if (priv->rev == 1) {

	if (priv->rev == 1) {

		tilcdc_set(dev, LCDC_RASTER_CTRL_REG,

		tilcdc_set(dev, LCDC_RASTER_CTRL_REG,

			LCDC_V1_SYNC_LOST_INT_ENA |

			LCDC_V1_SYNC_LOST_INT_ENA | LCDC_V1_FRAME_DONE_INT_ENA |

			LCDC_V1_UNDERFLOW_INT_ENA);

			LCDC_V1_UNDERFLOW_INT_ENA);

		tilcdc_set(dev, LCDC_DMA_CTRL_REG,

		tilcdc_set(dev, LCDC_DMA_CTRL_REG,

			LCDC_V1_END_OF_FRAME_INT_ENA);

			LCDC_V1_END_OF_FRAME_INT_ENA);
@@ -190,7 +190,7 @@ static void tilcdc_crtc_disable_irqs(struct drm_device *dev) 
	/* disable irqs that we might have enabled: */

	/* disable irqs that we might have enabled: */

	if (priv->rev == 1) {

	if (priv->rev == 1) {

		tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,

		tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,

			LCDC_V1_SYNC_LOST_INT_ENA |

			LCDC_V1_SYNC_LOST_INT_ENA | LCDC_V1_FRAME_DONE_INT_ENA |

			LCDC_V1_UNDERFLOW_INT_ENA | LCDC_V1_PL_INT_ENA);

			LCDC_V1_UNDERFLOW_INT_ENA | LCDC_V1_PL_INT_ENA);

		tilcdc_clear(dev, LCDC_DMA_CTRL_REG,

		tilcdc_clear(dev, LCDC_DMA_CTRL_REG,

			LCDC_V1_END_OF_FRAME_INT_ENA);

			LCDC_V1_END_OF_FRAME_INT_ENA);
@@ -935,13 +935,17 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) 
		}

		}

	}

	}





	/* For revision 2 only */

	if (priv->rev == 2) {

	if (stat & LCDC_FRAME_DONE) {

	if (stat & LCDC_FRAME_DONE) {

		tilcdc_crtc->frame_done = true;

		tilcdc_crtc->frame_done = true;

		wake_up(&tilcdc_crtc->frame_done_wq);

		wake_up(&tilcdc_crtc->frame_done_wq);

		/* rev 1 lcdc appears to hang if irq is not disbaled here */

		if (priv->rev == 1)

			tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,

				     LCDC_V1_FRAME_DONE_INT_ENA);

	}

	}





	/* For revision 2 only */

	if (priv->rev == 2) {

		/* Indicate to LCDC that the interrupt service routine has

		/* Indicate to LCDC that the interrupt service routine has

		 * completed, see 13.3.6.1.6 in AM335x TRM.

		 * completed, see 13.3.6.1.6 in AM335x TRM.

		 */

		 */

drivers/gpu/drm/tilcdc/tilcdc_regs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define LCDC_V1_PL_INT_ENA                       BIT(4)

#define LCDC_V1_PL_INT_ENA                       BIT(4)

#define LCDC_V2_PL_INT_ENA                       BIT(6)

#define LCDC_V2_PL_INT_ENA                       BIT(6)

#define LCDC_V1_SYNC_LOST_INT_ENA                BIT(5)

#define LCDC_V1_SYNC_LOST_INT_ENA                BIT(5)

#define LCDC_V1_FRAME_DONE_INT_ENA               BIT(3)

#define LCDC_MONOCHROME_MODE                     BIT(1)

#define LCDC_MONOCHROME_MODE                     BIT(1)

#define LCDC_RASTER_ENABLE                       BIT(0)

#define LCDC_RASTER_ENABLE                       BIT(0)

#define LCDC_TFT_ALT_ENABLE                      BIT(23)

#define LCDC_TFT_ALT_ENABLE                      BIT(23)