diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 14 |
1 files changed, 7 insertions, 7 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, | |||
3729 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: | 3729 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
3730 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: | 3730 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: |
3731 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3731 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3732 | DRM_MODE_ENCODER_DAC); | 3732 | DRM_MODE_ENCODER_DAC, NULL); |
3733 | drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs); | 3733 | drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs); |
3734 | break; | 3734 | break; |
3735 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: | 3735 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
@@ -3740,15 +3740,15 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, | |||
3740 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { | 3740 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
3741 | amdgpu_encoder->rmx_type = RMX_FULL; | 3741 | amdgpu_encoder->rmx_type = RMX_FULL; |
3742 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3742 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3743 | DRM_MODE_ENCODER_LVDS); | 3743 | DRM_MODE_ENCODER_LVDS, NULL); |
3744 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); | 3744 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); |
3745 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { | 3745 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { |
3746 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3746 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3747 | DRM_MODE_ENCODER_DAC); | 3747 | DRM_MODE_ENCODER_DAC, NULL); |
3748 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3748 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3749 | } else { | 3749 | } else { |
3750 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3750 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3751 | DRM_MODE_ENCODER_TMDS); | 3751 | DRM_MODE_ENCODER_TMDS, NULL); |
3752 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3752 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3753 | } | 3753 | } |
3754 | drm_encoder_helper_add(encoder, &dce_v10_0_dig_helper_funcs); | 3754 | 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, | |||
3766 | amdgpu_encoder->is_ext_encoder = true; | 3766 | amdgpu_encoder->is_ext_encoder = true; |
3767 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) | 3767 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) |
3768 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3768 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3769 | DRM_MODE_ENCODER_LVDS); | 3769 | DRM_MODE_ENCODER_LVDS, NULL); |
3770 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) | 3770 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) |
3771 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3771 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3772 | DRM_MODE_ENCODER_DAC); | 3772 | DRM_MODE_ENCODER_DAC, NULL); |
3773 | else | 3773 | else |
3774 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, | 3774 | drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs, |
3775 | DRM_MODE_ENCODER_TMDS); | 3775 | DRM_MODE_ENCODER_TMDS, NULL); |
3776 | drm_encoder_helper_add(encoder, &dce_v10_0_ext_helper_funcs); | 3776 | drm_encoder_helper_add(encoder, &dce_v10_0_ext_helper_funcs); |
3777 | break; | 3777 | break; |
3778 | } | 3778 | } |