projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7af5cdb
)
drm/msm/dpu: Correct dpu encoder spinlock initialization
author
Shubhashree Dhar
<dhar@codeaurora.org>
Mon, 24 Jun 2019 06:27:12 +0000
(11:57 +0530)
committer
Sean Paul
<seanpaul@chromium.org>
Mon, 22 Jul 2019 17:44:17 +0000
(13:44 -0400)
dpu encoder spinlock should be initialized during dpu encoder
init instead of dpu encoder setup which is part of modeset init.
Signed-off-by: Shubhashree Dhar <dhar@codeaurora.org>
[seanpaul resolved conflict in old init removal and revised the commit message]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link:
https://patchwork.freedesktop.org/patch/msgid/1561357632-15361-1-git-send-email-dhar@codeaurora.org
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 0e2f74163a165040dd4c468c502bb6a1e832f0be..0aa8a12c99520b6f3c110869a7edb3eaa82cb404 100644
(file)
--- a/
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@
-2221,8
+2221,6
@@
int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
if (ret)
goto fail;
- spin_lock_init(&dpu_enc->enc_spinlock);
-
atomic_set(&dpu_enc->frame_done_timeout_ms, 0);
timer_setup(&dpu_enc->frame_done_timer,
dpu_encoder_frame_done_timeout, 0);
@@
-2276,6
+2274,7
@@
struct drm_encoder *dpu_encoder_init(struct drm_device *dev,
drm_encoder_helper_add(&dpu_enc->base, &dpu_encoder_helper_funcs);
+ spin_lock_init(&dpu_enc->enc_spinlock);
dpu_enc->enabled = false;
return &dpu_enc->base;