diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v8_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 |
1 files changed, 7 insertions, 7 deletions
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, | |||
3659 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: | 3659 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
3660 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: | 3660 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: |
3661 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3661 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3662 | DRM_MODE_ENCODER_DAC); | 3662 | DRM_MODE_ENCODER_DAC, NULL); |
3663 | drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs); | 3663 | drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs); |
3664 | break; | 3664 | break; |
3665 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: | 3665 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
@@ -3670,15 +3670,15 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, | |||
3670 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { | 3670 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
3671 | amdgpu_encoder->rmx_type = RMX_FULL; | 3671 | amdgpu_encoder->rmx_type = RMX_FULL; |
3672 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3672 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3673 | DRM_MODE_ENCODER_LVDS); | 3673 | DRM_MODE_ENCODER_LVDS, NULL); |
3674 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); | 3674 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder); |
3675 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { | 3675 | } else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { |
3676 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3676 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3677 | DRM_MODE_ENCODER_DAC); | 3677 | DRM_MODE_ENCODER_DAC, NULL); |
3678 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3678 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3679 | } else { | 3679 | } else { |
3680 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3680 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3681 | DRM_MODE_ENCODER_TMDS); | 3681 | DRM_MODE_ENCODER_TMDS, NULL); |
3682 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); | 3682 | amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder); |
3683 | } | 3683 | } |
3684 | drm_encoder_helper_add(encoder, &dce_v8_0_dig_helper_funcs); | 3684 | 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, | |||
3696 | amdgpu_encoder->is_ext_encoder = true; | 3696 | amdgpu_encoder->is_ext_encoder = true; |
3697 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) | 3697 | if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) |
3698 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3698 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3699 | DRM_MODE_ENCODER_LVDS); | 3699 | DRM_MODE_ENCODER_LVDS, NULL); |
3700 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) | 3700 | else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) |
3701 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3701 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3702 | DRM_MODE_ENCODER_DAC); | 3702 | DRM_MODE_ENCODER_DAC, NULL); |
3703 | else | 3703 | else |
3704 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, | 3704 | drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs, |
3705 | DRM_MODE_ENCODER_TMDS); | 3705 | DRM_MODE_ENCODER_TMDS, NULL); |
3706 | drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs); | 3706 | drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs); |
3707 | break; | 3707 | break; |
3708 | } | 3708 | } |