Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / amd / amdgpu / dce_v11_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index c161eeda417bdf9aeb7559b1860b1349b985c48d..af30e3f95eab18b7be67658090b0f2af6ff1a974 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -3726,7 +3726,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:
@@ -3737,15 +3737,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);
@@ -3763,13 +3763,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;
        }