drm/msm/atomic: Drop per-CRTC locks in reverse order
Subsystems (4)
PATCH 1/1 drm/msm/atomic: Drop per-CRTC locks in reverse order
From: Rob Clark <[email protected]>
lockdep dislikes seeing locks unwound in a non-nested fashion.
--- drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/msm/msm_kms.h | 4 ++++ include/drm/drm_crtc.h | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_atomic.c +1 -1
@@ -67,7 +67,7 @@ static void unlock_crtcs(struct msm_kms *kms, unsigned int crtc_mask) {struct drm_crtc *crtc; -for_each_crtc_mask (kms->dev, crtc, crtc_mask) +for_each_crtc_mask_reverse (kms->dev, crtc, crtc_mask)mutex_unlock (&kms->commit_lock[drm_crtc_index (crtc)]); }
drivers/gpu/drm/msm/msm_kms.h +4 -0
@@ -211,4 +211,8 @@ int dpu_mdss_init(struct drm_device *dev); drm_for_each_crtc(crtc, dev) \ for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) +#define for_each_crtc_mask_reverse (dev, crtc, crtc_mask) \ + drm_for_each_crtc_reverse(crtc, dev) \ + for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) +#endif /* __MSM_KMS_H__ */
include/drm/drm_crtc.h +10 -0
@@ -1274,4 +1274,14 @@ static inline struct drm_crtc *drm_crtc_find(struct drm_device *dev,#define drm_for_each_crtc (crtc, dev) \ list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) +/** +* drm_for_each_crtc_reverse - iterate over all CRTCs in reverse order +* @crtc: a &struct drm_crtc as the loop cursor +* @dev: the &struct drm_device +* +* Iterate over all CRTCs of @dev. +*/ +#define drm_for_each_crtc_reverse (crtc, dev) \ + list_for_each_entry_reverse(crtc, &(dev)->mode_config.crtc_list, head) +#endif /* __DRM_CRTC_H__ */
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · Rob Clark
From: Rob Clark <[email protected]>
lockdep dislikes seeing locks unwound in a non-nested fashion.
Fixes 37c2016e3608 ("drm/msm: Fix race condition in msm driver withasync layer updates")
Signed-off-by Rob Clark <[email protected]>
Quoted 51 lines
--- drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/msm/msm_kms.h | 4 ++++ include/drm/drm_crtc.h | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_atomic.c +1
-1@@ -67,7 +67,7 @@ static void unlock_crtcs(struct msm_kms *kms, unsigned int crtc_mask) {struct drm_crtc *crtc; -for_each_crtc_mask (kms->dev, crtc, crtc_mask) +for_each_crtc_mask_reverse (kms->dev, crtc, crtc_mask)mutex_unlock (&kms->commit_lock[drm_crtc_index (crtc)]); }drivers/gpu/drm/msm/msm_kms.h +4
-0@@ -211,4 +211,8 @@ int dpu_mdss_init(struct drm_device *dev); drm_for_each_crtc(crtc, dev) \ for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) +#define for_each_crtc_mask_reverse (dev, crtc, crtc_mask) \ + drm_for_each_crtc_reverse(crtc, dev) \ + for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) +#endif /* __MSM_KMS_H__ */ include/drm/drm_crtc.h +9
-0@@ -1274,4 +1274,14 @@ static inline struct drm_crtc *drm_crtc_find(struct drm_device *dev, #define drm_for_each_crtc(crtc, dev) \ list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) +/** + * drm_for_each_crtc_reverse - iterate over all CRTCs in reverse order + * @crtc: a &struct drm_crtc as the loop cursor + * @dev: the &struct drm_device + * + * Iterate over all CRTCs of @dev. + */ +#define drm_for_each_crtc_reverse(crtc, dev) \ + list_for_each_entry_reverse(crtc, &(dev)->mode_config.crtc_list,
Quoted 3 lines
head)
+
#endif /*__DRM_CRTC_H__*/
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Tue, 20 Oct 2020 15:26:00 -0700 you wrote:
From: Rob Clark <[email protected]>
lockdep dislikes seeing locks unwound in a non-nested fashion.
Fixes 37c2016e3608 ("drm/msm: Fix race condition in msm driver with async layer updates")Signed-off-by Rob Clark <[email protected]>[...]
Here is the summary with links:
- drm/msm/atomic: Drop per-CRTC locks in reverse order
https://git.kernel.org/qcom/c/cb21f3f882ad
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html