Use atomic variants for encoder callback functions such that
certain states like self-refresh can be accessed as part of
enable/disable sequence.

Signed-off-by: Kalyan Thota <quic_kaly...@quicinc.com>
Signed-off-by: Vinod Polimera <quic_vpoli...@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index b9b254d..a0cb089 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1196,7 +1196,8 @@ void dpu_encoder_virt_runtime_resume(struct drm_encoder 
*drm_enc)
        mutex_unlock(&dpu_enc->enc_lock);
 }
 
-static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)
+static void dpu_encoder_virt_atomic_enable(struct drm_encoder *drm_enc,
+                                       struct drm_atomic_state *state)
 {
        struct dpu_encoder_virt *dpu_enc = NULL;
        int ret = 0;
@@ -1232,7 +1233,8 @@ static void dpu_encoder_virt_enable(struct drm_encoder 
*drm_enc)
        mutex_unlock(&dpu_enc->enc_lock);
 }
 
-static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)
+static void dpu_encoder_virt_atomic_disable(struct drm_encoder *drm_enc,
+                                       struct drm_atomic_state *state)
 {
        struct dpu_encoder_virt *dpu_enc = NULL;
        int i = 0;
@@ -2407,8 +2409,8 @@ static void dpu_encoder_frame_done_timeout(struct 
timer_list *t)
 
 static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = {
        .atomic_mode_set = dpu_encoder_virt_atomic_mode_set,
-       .disable = dpu_encoder_virt_disable,
-       .enable = dpu_encoder_virt_enable,
+       .atomic_disable = dpu_encoder_virt_atomic_disable,
+       .atomic_enable = dpu_encoder_virt_atomic_enable,
        .atomic_check = dpu_encoder_virt_atomic_check,
 };
 
-- 
2.7.4

Reply via email to