leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Tested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
Jyri Sarha
2016-11-21 18:30:19 +02:00
parent 75d7f277ee
commit 3672583f25
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/tilcdc/tilcdc_crtc.c
View File

@@ -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.
*/ */

1
drivers/gpu/drm/tilcdc/tilcdc_regs.h
View File

@@ -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)