diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index e6eb509..13b2540 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -2113,6 +2113,8 @@ radeon_atom_encoder_init(struct radeon_device *rdev)
 		struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 		struct drm_encoder *ext_encoder = radeon_get_external_encoder(encoder);
 
+		radeon_atom_output_lock(encoder, true);
+
 		switch (radeon_encoder->encoder_id) {
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
@@ -2128,6 +2130,8 @@ radeon_atom_encoder_init(struct radeon_device *rdev)
 		if (ext_encoder && (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)))
 			atombios_external_encoder_setup(encoder, ext_encoder,
 							EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT);
+
+		radeon_atom_output_lock(encoder, false);
 	}
 }