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

Commit 6590c49e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Greg Kroah-Hartman
Browse files

drm/msm/dpu: don't play tricks with debug macros 



[ Upstream commit df24373435f5899a2a98b7d377479c8d4376613b ]

DPU debugging macros need to be converted to a proper drm_debug_*
macros, however this is a going an intrusive patch, not suitable for a
fix. Wire DPU_DEBUG and DPU_DEBUG_DRIVER to always use DRM_DEBUG_DRIVER
to make sure that DPU debugging messages always end up in the drm debug
messages and are controlled via the usual drm.debug mask.

I don't think that it is a good idea for a generic DPU_DEBUG macro to be
tied to DRM_UT_KMS. It is used to report a debug message from driver, so by
default it should go to the DRM_UT_DRIVER channel. While refactoring
debug macros later on we might end up with particular messages going to
ATOMIC or KMS, but DRIVER should be the default.

Fixes: 25fdd593 ("drm/msm: Add SDM845 DPU support")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/606932/
Link: https://lore.kernel.org/r/20240802-dpu-fix-wb-v2-2-7eac9eb8e895@linaro.org


Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bdb29697

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h

+2 −12
Original line number Diff line number Diff line
@@ -30,24 +30,14 @@ 
 * @fmt: Pointer to format string

 */

#define DPU_DEBUG(fmt, ...)                                                \

	do {                                                               \

		if (drm_debug_enabled(DRM_UT_KMS))                         \

			DRM_DEBUG(fmt, ##__VA_ARGS__); \

		else                                                       \

			pr_debug(fmt, ##__VA_ARGS__);                      \

	} while (0)

	DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__)



/**

 * DPU_DEBUG_DRIVER - macro for hardware driver logging

 * @fmt: Pointer to format string

 */

#define DPU_DEBUG_DRIVER(fmt, ...)                                         \

	do {                                                               \

		if (drm_debug_enabled(DRM_UT_DRIVER))                      \

			DRM_ERROR(fmt, ##__VA_ARGS__); \

		else                                                       \

			pr_debug(fmt, ##__VA_ARGS__);                      \

	} while (0)

	DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__)



#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__)

#define DPU_ERROR_RATELIMITED(fmt, ...) pr_err_ratelimited("[dpu error]" fmt, ##__VA_ARGS__)