| Message ID | 20241021-tidss-irq-fix-v1-2-82ddaec94e4a@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/tidss: Interrupt fixes and cleanups | expand |
On 21/10/24 19:37, Tomi Valkeinen wrote: > We never use the DSS_IRQ_DEVICE_OCP_ERR flag, and the HW doesn't even > have such a bit... So remove it. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Reviewed-by: Devarsh Thakkar <devarsht@ti.com> Regards Devarsh > --- > drivers/gpu/drm/tidss/tidss_irq.c | 5 +---- > drivers/gpu/drm/tidss/tidss_irq.h | 4 +--- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c > index 604334ef526a..91498ff664a2 100644 > --- a/drivers/gpu/drm/tidss/tidss_irq.c > +++ b/drivers/gpu/drm/tidss/tidss_irq.c > @@ -78,9 +78,6 @@ static irqreturn_t tidss_irq_handler(int irq, void *arg) > tidss_crtc_error_irq(crtc, irqstatus); > } > > - if (irqstatus & DSS_IRQ_DEVICE_OCP_ERR) > - dev_err_ratelimited(tidss->dev, "OCP error\n"); > - > return IRQ_HANDLED; > } > > @@ -105,7 +102,7 @@ int tidss_irq_install(struct drm_device *ddev, unsigned int irq) > if (ret) > return ret; > > - tidss->irq_mask = DSS_IRQ_DEVICE_OCP_ERR; > + tidss->irq_mask = 0; > > for (unsigned int i = 0; i < tidss->num_crtcs; ++i) { > struct tidss_crtc *tcrtc = to_tidss_crtc(tidss->crtcs[i]); > diff --git a/drivers/gpu/drm/tidss/tidss_irq.h b/drivers/gpu/drm/tidss/tidss_irq.h > index b512614d5863..dd61f645f662 100644 > --- a/drivers/gpu/drm/tidss/tidss_irq.h > +++ b/drivers/gpu/drm/tidss/tidss_irq.h > @@ -19,15 +19,13 @@ > * bit use |D |fou|FEOL|FEOL|FEOL|FEOL| UUUU | | > * bit number|0 |1-3|4-7 |8-11| 12-19 | 20-23 | 24-31 | > * > - * device bits: D = OCP error > + * device bits: D = Unused > * WB bits: f = frame done wb, o = wb buffer overflow, > * u = wb buffer uncomplete > * vp bits: F = frame done, E = vsync even, O = vsync odd, L = sync lost > * plane bits: U = fifo underflow > */ > > -#define DSS_IRQ_DEVICE_OCP_ERR BIT(0) > - > #define DSS_IRQ_DEVICE_FRAMEDONEWB BIT(1) > #define DSS_IRQ_DEVICE_WBBUFFEROVERFLOW BIT(2) > #define DSS_IRQ_DEVICE_WBUNCOMPLETEERROR BIT(3) >
On 10/21/24 19:37, Tomi Valkeinen wrote: > We never use the DSS_IRQ_DEVICE_OCP_ERR flag, and the HW doesn't even > have such a bit... So remove it. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Reviewed-by: Aradhya Bhatia <aradhya.bhatia@linux.dev> Regards Aradhya [...]
diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c index 604334ef526a..91498ff664a2 100644 --- a/drivers/gpu/drm/tidss/tidss_irq.c +++ b/drivers/gpu/drm/tidss/tidss_irq.c @@ -78,9 +78,6 @@ static irqreturn_t tidss_irq_handler(int irq, void *arg) tidss_crtc_error_irq(crtc, irqstatus); } - if (irqstatus & DSS_IRQ_DEVICE_OCP_ERR) - dev_err_ratelimited(tidss->dev, "OCP error\n"); - return IRQ_HANDLED; } @@ -105,7 +102,7 @@ int tidss_irq_install(struct drm_device *ddev, unsigned int irq) if (ret) return ret; - tidss->irq_mask = DSS_IRQ_DEVICE_OCP_ERR; + tidss->irq_mask = 0; for (unsigned int i = 0; i < tidss->num_crtcs; ++i) { struct tidss_crtc *tcrtc = to_tidss_crtc(tidss->crtcs[i]); diff --git a/drivers/gpu/drm/tidss/tidss_irq.h b/drivers/gpu/drm/tidss/tidss_irq.h index b512614d5863..dd61f645f662 100644 --- a/drivers/gpu/drm/tidss/tidss_irq.h +++ b/drivers/gpu/drm/tidss/tidss_irq.h @@ -19,15 +19,13 @@ * bit use |D |fou|FEOL|FEOL|FEOL|FEOL| UUUU | | * bit number|0 |1-3|4-7 |8-11| 12-19 | 20-23 | 24-31 | * - * device bits: D = OCP error + * device bits: D = Unused * WB bits: f = frame done wb, o = wb buffer overflow, * u = wb buffer uncomplete * vp bits: F = frame done, E = vsync even, O = vsync odd, L = sync lost * plane bits: U = fifo underflow */ -#define DSS_IRQ_DEVICE_OCP_ERR BIT(0) - #define DSS_IRQ_DEVICE_FRAMEDONEWB BIT(1) #define DSS_IRQ_DEVICE_WBBUFFEROVERFLOW BIT(2) #define DSS_IRQ_DEVICE_WBUNCOMPLETEERROR BIT(3)
We never use the DSS_IRQ_DEVICE_OCP_ERR flag, and the HW doesn't even have such a bit... So remove it. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- drivers/gpu/drm/tidss/tidss_irq.c | 5 +---- drivers/gpu/drm/tidss/tidss_irq.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-)