To prepare for the transition to the DRM bridge API, switch the encoder
operations to the atomic versions of .enable() and .disable(). This
doesn't cause any functional change by itself.

Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
---
 drivers/gpu/drm/xlnx/zynqmp_dp.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
index 6f588dc09ba6..ace9fc731bfe 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
@@ -1399,7 +1399,8 @@ zynqmp_dp_connector_helper_funcs = {
  * DRM Encoder
  */
 
-static void zynqmp_dp_encoder_enable(struct drm_encoder *encoder)
+static void zynqmp_dp_encoder_atomic_enable(struct drm_encoder *encoder,
+                                           struct drm_atomic_state *state)
 {
        struct zynqmp_dp *dp = encoder_to_dp(encoder);
        unsigned int i;
@@ -1431,7 +1432,8 @@ static void zynqmp_dp_encoder_enable(struct drm_encoder 
*encoder)
        zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_ENABLE, 1);
 }
 
-static void zynqmp_dp_encoder_disable(struct drm_encoder *encoder)
+static void zynqmp_dp_encoder_atomic_disable(struct drm_encoder *encoder,
+                                            struct drm_atomic_state *state)
 {
        struct zynqmp_dp *dp = encoder_to_dp(encoder);
 
@@ -1508,8 +1510,8 @@ zynqmp_dp_encoder_atomic_check(struct drm_encoder 
*encoder,
 }
 
 static const struct drm_encoder_helper_funcs zynqmp_dp_encoder_helper_funcs = {
-       .enable                 = zynqmp_dp_encoder_enable,
-       .disable                = zynqmp_dp_encoder_disable,
+       .atomic_enable          = zynqmp_dp_encoder_atomic_enable,
+       .atomic_disable         = zynqmp_dp_encoder_atomic_disable,
        .atomic_mode_set        = zynqmp_dp_encoder_atomic_mode_set,
        .atomic_check           = zynqmp_dp_encoder_atomic_check,
 };
-- 
Regards,

Laurent Pinchart

Reply via email to