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

Commit cba8844a authored by Jyri Sarha's avatar Jyri Sarha
Browse files

drm/tilcdc: Enable sync lost error and recovery handling for rev 1 LCDC 



Revision 1 LCDC support also sync lost errors and can benefit from
sync lost recovery routine.

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

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+20 −15
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static void tilcdc_crtc_enable_irqs(struct drm_device *dev) 


	if (priv->rev == 1) {

		tilcdc_set(dev, LCDC_RASTER_CTRL_REG,

			LCDC_V1_SYNC_LOST_INT_ENA |

			LCDC_V1_UNDERFLOW_INT_ENA);

		tilcdc_set(dev, LCDC_DMA_CTRL_REG,

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

	if (priv->rev == 1) {

		tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,

			LCDC_V1_SYNC_LOST_INT_ENA |

			LCDC_V1_UNDERFLOW_INT_ENA | LCDC_V1_PL_INT_ENA);

		tilcdc_clear(dev, LCDC_DMA_CTRL_REG,

			LCDC_V1_END_OF_FRAME_INT_ENA);
@@ -845,13 +847,6 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) 
		dev_err_ratelimited(dev->dev, "%s(0x%08x): FIFO underflow",

				    __func__, stat);



	/* For revision 2 only */

	if (priv->rev == 2) {

		if (stat & LCDC_FRAME_DONE) {

			tilcdc_crtc->frame_done = true;

			wake_up(&tilcdc_crtc->frame_done_wq);

		}



	if (stat & LCDC_SYNC_LOST) {

		dev_err_ratelimited(dev->dev, "%s(0x%08x): Sync lost",

				    __func__, stat);
@@ -859,14 +854,24 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) 
		if (tilcdc_crtc->sync_lost_count++ >

		    SYNC_LOST_COUNT_LIMIT) {

			dev_err(dev->dev, "%s(0x%08x): Sync lost flood detected, recovering", __func__, stat);

				queue_work(system_wq,

					   &tilcdc_crtc->recover_work);

			queue_work(system_wq, &tilcdc_crtc->recover_work);

			if (priv->rev == 1)

				tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,

					     LCDC_V1_SYNC_LOST_INT_ENA);

			else

				tilcdc_write(dev, LCDC_INT_ENABLE_CLR_REG,

					     LCDC_SYNC_LOST);

			tilcdc_crtc->sync_lost_count = 0;

		}

	}



	/* For revision 2 only */

	if (priv->rev == 2) {

		if (stat & LCDC_FRAME_DONE) {

			tilcdc_crtc->frame_done = true;

			wake_up(&tilcdc_crtc->frame_done_wq);

		}



		/* Indicate to LCDC that the interrupt service routine has

		 * completed, see 13.3.6.1.6 in AM335x TRM.

		 */

drivers/gpu/drm/tilcdc/tilcdc_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define LCDC_V2_UNDERFLOW_INT_ENA                BIT(5)

#define LCDC_V1_PL_INT_ENA                       BIT(4)

#define LCDC_V2_PL_INT_ENA                       BIT(6)

#define LCDC_V1_SYNC_LOST_INT_ENA                BIT(5)

#define LCDC_MONOCHROME_MODE                     BIT(1)

#define LCDC_RASTER_ENABLE                       BIT(0)

#define LCDC_TFT_ALT_ENABLE                      BIT(23)