Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] drm/msm/dp: ret initialized to IRQ_HANDLED in
  msm_dp_display_irq_handler()
--

commit 37c008bcf63491b33f14776e4c87241cd46a2065
Author: Yongxing Mou <[email protected]>

drm/msm/dp: wake threaded handler for HPD IRQs

This commit fixes msm_dp_display_irq_handler() to return IRQ_WAKE_THREAD
when an HPD interrupt is pending instead of bitwise-ORing it with
msm_dp_ctrl_isr()'s return value, and marks DP_INTERRUPT_STATUS2 interrupts
as IRQ_HANDLED in msm_dp_ctrl_isr().

> diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c 
> b/drivers/gpu/drm/msm/dp/dp_ctrl.c
> index 8012c3d477113..bf3f1b35abddb 100644
> --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
> +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
> @@ -3021,6 +3021,9 @@ irqreturn_t msm_dp_ctrl_isr(struct msm_dp_ctrl 
> *msm_dp_ctrl,
>       }
>  
>       isr = msm_dp_ctrl_get_interrupt(ctrl);
> +     /* All status2 sources are ACKed by msm_dp_ctrl_get_interrupt(). */
> +     if (isr & DP_INTERRUPT_STATUS2)
> +             ret = IRQ_HANDLED;
>  
>       if (isr & DP_CTRL_INTR_READY_FOR_VIDEO) {
>               drm_dbg_dp(ctrl->drm_dev, "dp_video_ready\n");
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 6f1f9dd3660d0..ad8c30a8ea798 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1091,23 +1091,24 @@ static irqreturn_t msm_dp_display_irq_handler(int 
> irq, void *dev_id)
>       u32 hpd_isr_status;
>       unsigned long flags;
>       irqreturn_t ret = IRQ_HANDLED;
> +     bool hpd_irq_pending;
>  
>       hpd_isr_status = msm_dp_aux_get_hpd_intr_status(dp->aux);
> +     hpd_irq_pending = hpd_isr_status & DP_DP_HPD_INT_MASK;
>  
> -     if (hpd_isr_status & 0x0F) {
> +     if (hpd_irq_pending) {
>               drm_dbg_dp(dp->drm_dev, "type=%d isr=0x%x\n",
>                       dp->msm_dp_display.connector_type, hpd_isr_status);
>  
>               spin_lock_irqsave(&dp->irq_thread_lock, flags);
>               dp->hpd_isr_status |= hpd_isr_status;
> -             ret = IRQ_WAKE_THREAD;
>               spin_unlock_irqrestore(&dp->irq_thread_lock, flags);
>       }
>  
>       /* DP controller isr */
>       ret |= msm_dp_ctrl_isr(dp->ctrl, dp->panel);
>  
> -     return ret;
> +     return hpd_irq_pending ? IRQ_WAKE_THREAD : ret;
>  }
>  
>  static irqreturn_t msm_dp_display_irq_thread(int irq, void *dev_id)

[Severity: Medium]
Should ret in msm_dp_display_irq_handler() be initialized to IRQ_NONE (or
assigned directly from msm_dp_ctrl_isr())?

With ret initialized to IRQ_HANDLED, ret |= msm_dp_ctrl_isr() always
evaluates to IRQ_HANDLED regardless of whether msm_dp_ctrl_isr() returns
IRQ_NONE or IRQ_HANDLED.  This discards IRQ_NONE on unhandled or spurious
interrupts and makes the new DP_INTERRUPT_STATUS2 check in msm_dp_ctrl_isr()
have no effect.

Note that if ret is changed so msm_dp_ctrl_isr()'s return value is
propagated, msm_dp_ctrl_isr() will also need to set ret = IRQ_HANDLED when
msm_dp_ctrl_get_psr_interrupt() returns a non-zero status.

-- 
Sashiko AI review ยท 
https://sashiko.dev/#/patchset/[email protected]?part=26

Reply via email to