From: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
commit 8844f467d6a58dc915f241e81c46e0c126f8c070 upstream.
There is little point in using %ps to print a value known to be NULL. On
the other hand it makes sense to print the callback symbol in the
'invalid IRQ' message. Correct those two error messages to make more
sense.
Fixes: 6893199183f8 ("drm/msm/dpu: stop using raw IRQ indices in the kernel output")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
Reviewed-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
Patchwork: https://patchwork.freedesktop.org/patch/585565/
Link: https://lore.kernel.org/r/20240330-dpu-irq-messages-v1-1-9ce782ae35f9@xxxxxxxxxx
Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
@@ -525,14 +525,14 @@ int dpu_core_irq_register_callback(struc
int ret;
if (!irq_cb) {
- DPU_ERROR("invalid IRQ=[%d, %d] irq_cb:%ps\n",
- DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
+ DPU_ERROR("IRQ=[%d, %d] NULL callback\n",
+ DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
return -EINVAL;
}
if (!dpu_core_irq_is_valid(irq_idx)) {
- DPU_ERROR("invalid IRQ=[%d, %d]\n",
- DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
+ DPU_ERROR("invalid IRQ=[%d, %d] irq_cb:%ps\n",
+ DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
return -EINVAL;
}
Patches currently in stable-queue which might be from dmitry.baryshkov@xxxxxxxxxx are
queue-6.6/clk-qcom-dispcc-sm8450-fix-displayport-clocks.patch
queue-6.6/drm-msm-dsi-print-dual-dsi-adjusted-pclk-instead-of-.patch
queue-6.6/clk-qcom-dispcc-sm8550-fix-displayport-clocks.patch
queue-6.6/drm-msm-dpu-add-callback-function-pointer-check-befo.patch
queue-6.6/drm-msm-dpu-stop-using-raw-irq-indices-in-the-kernel.patch
queue-6.6/wifi-ath10k-populate-board-data-for-wcn3990.patch
queue-6.6/dt-bindings-phy-qcom-usb-snps-femto-v2-use-correct-f.patch
queue-6.6/drm-msm-dpu-remove-irq_idx-argument-from-irq-callbac.patch
queue-6.6/usb-typec-ucsi-always-register-a-link-to-usb-pd-devi.patch
queue-6.6/dt-bindings-phy-qcom-sc8280xp-qmp-ufs-phy-fix-msm899.patch
queue-6.6/drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch
queue-6.6/drm-bridge-lt9611uxc-don-t-log-an-error-when-dsi-hos.patch
queue-6.6/drm-msm-dpu-make-the-irq-table-size-static.patch
queue-6.6/soc-qcom-pmic_glink-don-t-traverse-clients-list-with.patch
queue-6.6/drm-msm-dpu-add-helper-to-get-irq-related-data.patch
queue-6.6/soc-qcom-pmic_glink-notify-clients-about-the-current.patch
queue-6.6/drm-msm-dp-allow-voltage-swing-pre-emphasis-of-3.patch
queue-6.6/usb-typec-ucsi-simplify-partner-s-pd-caps-registrati.patch
queue-6.6/drm-msm-dp-avoid-a-long-timeout-for-aux-transfer-if-.patch
queue-6.6/clk-qcom-dispcc-sm6350-fix-displayport-clocks.patch
queue-6.6/drm-mipi-dsi-use-correct-return-type-for-the-dsc-fun.patch
queue-6.6/drm-msm-dpu-make-error-messages-at-dpu_core_irq_register_callback-more-sensible.patch
queue-6.6/drm-bridge-lt9611-don-t-log-an-error-when-dsi-host-c.patch
queue-6.6/drm-msm-dpu-extract-dpu_core_irq_is_valid-helper.patch
queue-6.6/soc-qcom-pmic_glink-make-client-lock-non-sleeping.patch
queue-6.6/input-pm8xxx-vibrator-correct-vib_max_levels-calcula.patch
