The drm_bridge_funcs.atomic_reset callback and its
drm_atomic_helper_bridge_reset() helper are deprecated.

Switch to the atomic_create_state callback and its
drm_atomic_helper_bridge_create_state() counterpart.

Reviewed-by: Thomas Zimmermann <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>
---
 drivers/gpu/drm/tests/drm_bridge_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c 
b/drivers/gpu/drm/tests/drm_bridge_test.c
index 9d4fbe709df4..10a32620e962 100644
--- a/drivers/gpu/drm/tests/drm_bridge_test.c
+++ b/drivers/gpu/drm/tests/drm_bridge_test.c
@@ -114,11 +114,11 @@ static const struct drm_bridge_funcs 
drm_test_bridge_atomic_funcs = {
        .destroy                = drm_test_bridge_priv_destroy,
        .atomic_enable          = drm_test_bridge_atomic_enable,
        .atomic_disable         = drm_test_bridge_atomic_disable,
        .atomic_destroy_state   = drm_atomic_helper_bridge_destroy_state,
        .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
-       .atomic_reset           = drm_atomic_helper_bridge_reset,
+       .atomic_create_state    = drm_atomic_helper_bridge_create_state,
 };
 
 static int dummy_clear_infoframe(struct drm_bridge *bridge)
 {
        return 0;
@@ -132,11 +132,11 @@ static int dummy_write_infoframe(struct drm_bridge 
*bridge, const u8 *buffer,
 
 static const struct drm_bridge_funcs drm_test_bridge_bus_fmts_funcs = {
        .atomic_get_output_bus_fmts     = 
drm_atomic_helper_bridge_get_hdmi_output_bus_fmts,
        .atomic_destroy_state           = 
drm_atomic_helper_bridge_destroy_state,
        .atomic_duplicate_state         = 
drm_atomic_helper_bridge_duplicate_state,
-       .atomic_reset                   = drm_atomic_helper_bridge_reset,
+       .atomic_create_state            = drm_atomic_helper_bridge_create_state,
        .hdmi_write_avi_infoframe       = dummy_write_infoframe,
        .hdmi_write_hdmi_infoframe      = dummy_write_infoframe,
        .hdmi_clear_avi_infoframe       = dummy_clear_infoframe,
        .hdmi_clear_hdmi_infoframe      = dummy_clear_infoframe,
 };
@@ -299,11 +299,11 @@ static u32 *drm_test_bridge_ ## name ## _in_fmts(struct 
drm_bridge *bridge,                       \
 static const struct drm_bridge_funcs (ident) = {                               
                \
        .atomic_enable                  = drm_test_bridge_atomic_enable,        
                \
        .atomic_disable                 = drm_test_bridge_atomic_disable,       
                \
        .atomic_destroy_state           = 
drm_atomic_helper_bridge_destroy_state,               \
        .atomic_duplicate_state         = 
drm_atomic_helper_bridge_duplicate_state,             \
-       .atomic_reset                   = drm_atomic_helper_bridge_reset,       
                \
+       .atomic_create_state            = 
drm_atomic_helper_bridge_create_state,                \
        .atomic_get_input_bus_fmts      = (input_fmts_func),                    
                \
        .atomic_get_output_bus_fmts     = (output_fmts_func),                   
                \
        .hdmi_write_avi_infoframe       = (hdmi_write_infoframe_func),          
                \
        .hdmi_clear_avi_infoframe       = (hdmi_clear_infoframe_func),          
                \
        .hdmi_write_hdmi_infoframe      = (hdmi_write_infoframe_func),          
                \

-- 
2.54.0

Reply via email to