diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 14 |
1 files changed, 7 insertions, 7 deletions
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, | |||
3722 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: | 3722 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
3723 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: | 3723 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: |
3724 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3724 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3725 | DRM_MODE_ENCODER_DAC); | 3725 | DRM_MODE_ENCODER_DAC, NULL); |
3726 | drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs); | 3726 | drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs); |
3727 | break; | 3727 | break; |
3728 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: | 3728 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
@@ -3733,15 +3733,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, | |||
3733 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { | 3733 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
3734 | amdgpu_encoder->rmx_type = RMX_FULL; | 3734 | amdgpu_encoder->rmx_type = RMX_FULL; |
3735 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3735 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3736 | DRM_MODE_ENCODER_LVDS); | 3736 | DRM_MODE_ENCODER_LVDS, NULL); |
3737 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); | 3737 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); |
3738 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { | 3738 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { |
3739 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3739 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3740 | DRM_MODE_ENCODER_DAC); | 3740 | DRM_MODE_ENCODER_DAC, NULL); |
3741 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3741 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3742 | } else { | 3742 | } else { |
3743 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3743 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3744 | DRM_MODE_ENCODER_TMDS); | 3744 | DRM_MODE_ENCODER_TMDS, NULL); |
3745 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3745 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3746 | } | 3746 | } |
3747 | drm_encoder_helper_add(encoder, &dce_v11_0_dig_helper_funcs); | 3747 | 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, | |||
3759 | amdgpu_encoder->is_ext_encoder = true; | 3759 | amdgpu_encoder->is_ext_encoder = true; |
3760 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) | 3760 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) |
3761 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3761 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3762 | DRM_MODE_ENCODER_LVDS); | 3762 | DRM_MODE_ENCODER_LVDS, NULL); |
3763 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) | 3763 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) |
3764 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3764 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3765 | DRM_MODE_ENCODER_DAC); | 3765 | DRM_MODE_ENCODER_DAC, NULL); |
3766 | else | 3766 | else |
3767 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, | 3767 | drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs, |
3768 | DRM_MODE_ENCODER_TMDS); | 3768 | DRM_MODE_ENCODER_TMDS, NULL); |
3769 | drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs); | 3769 | drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs); |
3770 | break; | 3770 | break; |
3771 | } | 3771 | } |