3 files changed, 21 insertions, 21 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 4dcc8fba5792..093599aba64b 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -3729,7 +3729,7 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
                 drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                 DRM_MODE_ENCODER_DAC);
+                                 DRM_MODE_ENCODER_DAC, NULL);
                 drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs);
                 break;
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3740,15 +3740,15 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
                         amdgpu_encoder->rmx_type = RMX_FULL;
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);
                 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 } else {
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 }
                 drm_encoder_helper_add(encoder, &dce_v10_0_dig_helper_funcs);
@@ -3766,13 +3766,13 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
                 amdgpu_encoder->is_ext_encoder = true;
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                 else
                         drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                 drm_encoder_helper_add(encoder, &dce_v10_0_ext_helper_funcs);
                 break;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 8f1e51128b33..8701661a8868 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -3722,7 +3722,7 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
                 drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                 DRM_MODE_ENCODER_DAC);
+                                 DRM_MODE_ENCODER_DAC, NULL);
                 drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs);
                 break;
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3733,15 +3733,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
                         amdgpu_encoder->rmx_type = RMX_FULL;
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);
                 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 } else {
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 }
                 drm_encoder_helper_add(encoder, &dce_v11_0_dig_helper_funcs);
@@ -3759,13 +3759,13 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
                 amdgpu_encoder->is_ext_encoder = true;
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                 else
                         drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                 drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs);
                 break;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 42d954dc436d..d0e128c24813 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -3659,7 +3659,7 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
                 drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                 DRM_MODE_ENCODER_DAC);
+                                 DRM_MODE_ENCODER_DAC, NULL);
                 drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs);
                 break;
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3670,15 +3670,15 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
                         amdgpu_encoder->rmx_type = RMX_FULL;
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);
                 } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 } else {
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                         amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);
                 }
                 drm_encoder_helper_add(encoder, &dce_v8_0_dig_helper_funcs);
@@ -3696,13 +3696,13 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
                 amdgpu_encoder->is_ext_encoder = true;
                 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_LVDS);
+                                         DRM_MODE_ENCODER_LVDS, NULL);
                 else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_DAC);
+                                         DRM_MODE_ENCODER_DAC, NULL);
                 else
                         drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,
-                                         DRM_MODE_ENCODER_TMDS);
+                                         DRM_MODE_ENCODER_TMDS, NULL);
                 drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs);
                 break;
         }