Rev 6661 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6661 | Rev 6938 | ||
|---|---|---|---|
| Line 118... | Line 118... | ||
| 118 | break; |
118 | break; |
| 119 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
119 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
| 120 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: |
120 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: |
| 121 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
121 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
| 122 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
122 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
| 123 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3: |
- | |
| 124 | if (dig->backlight_level == 0) |
123 | if (dig->backlight_level == 0) |
| 125 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLOFF, 0, 0); |
124 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLOFF, 0, 0); |
| 126 | else { |
125 | else { |
| 127 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_BL_BRIGHTNESS_CONTROL, 0, 0); |
126 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_BL_BRIGHTNESS_CONTROL, 0, 0); |
| 128 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLON, 0, 0); |
127 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLON, 0, 0); |
| Line 2772... | Line 2771... | ||
| 2772 | case ENCODER_OBJECT_ID_INTERNAL_TMDS1: |
2771 | case ENCODER_OBJECT_ID_INTERNAL_TMDS1: |
| 2773 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: |
2772 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: |
| 2774 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: |
2773 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: |
| 2775 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
2774 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 2776 | radeon_encoder->rmx_type = RMX_FULL; |
2775 | radeon_encoder->rmx_type = RMX_FULL; |
| 2777 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); |
2776 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2777 | DRM_MODE_ENCODER_LVDS, NULL); |
|
| 2778 | radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); |
2778 | radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); |
| 2779 | } else { |
2779 | } else { |
| 2780 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); |
2780 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2781 | DRM_MODE_ENCODER_TMDS, NULL); |
|
| 2781 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
2782 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
| 2782 | } |
2783 | } |
| 2783 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); |
2784 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); |
| 2784 | break; |
2785 | break; |
| 2785 | case ENCODER_OBJECT_ID_INTERNAL_DAC1: |
2786 | case ENCODER_OBJECT_ID_INTERNAL_DAC1: |
| 2786 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); |
2787 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2788 | DRM_MODE_ENCODER_DAC, NULL); |
|
| 2787 | radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); |
2789 | radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); |
| 2788 | drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); |
2790 | drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); |
| 2789 | break; |
2791 | break; |
| 2790 | case ENCODER_OBJECT_ID_INTERNAL_DAC2: |
2792 | case ENCODER_OBJECT_ID_INTERNAL_DAC2: |
| 2791 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
2793 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
| 2792 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: |
2794 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: |
| 2793 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TVDAC); |
2795 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2796 | DRM_MODE_ENCODER_TVDAC, NULL); |
|
| 2794 | radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); |
2797 | radeon_encoder->enc_priv = radeon_atombios_set_dac_info(radeon_encoder); |
| 2795 | drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); |
2798 | drm_encoder_helper_add(encoder, &radeon_atom_dac_helper_funcs); |
| 2796 | break; |
2799 | break; |
| 2797 | case ENCODER_OBJECT_ID_INTERNAL_DVO1: |
2800 | case ENCODER_OBJECT_ID_INTERNAL_DVO1: |
| 2798 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
2801 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
| Line 2802... | Line 2805... | ||
| 2802 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
2805 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
| 2803 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
2806 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
| 2804 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3: |
2807 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3: |
| 2805 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
2808 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 2806 | radeon_encoder->rmx_type = RMX_FULL; |
2809 | radeon_encoder->rmx_type = RMX_FULL; |
| 2807 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); |
2810 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2811 | DRM_MODE_ENCODER_LVDS, NULL); |
|
| 2808 | radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); |
2812 | radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); |
| 2809 | } else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { |
2813 | } else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) { |
| 2810 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); |
2814 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2815 | DRM_MODE_ENCODER_DAC, NULL); |
|
| 2811 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
2816 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
| 2812 | } else { |
2817 | } else { |
| 2813 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); |
2818 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2819 | DRM_MODE_ENCODER_TMDS, NULL); |
|
| 2814 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
2820 | radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); |
| 2815 | } |
2821 | } |
| 2816 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); |
2822 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); |
| 2817 | break; |
2823 | break; |
| 2818 | case ENCODER_OBJECT_ID_SI170B: |
2824 | case ENCODER_OBJECT_ID_SI170B: |
| Line 2825... | Line 2831... | ||
| 2825 | case ENCODER_OBJECT_ID_TRAVIS: |
2831 | case ENCODER_OBJECT_ID_TRAVIS: |
| 2826 | case ENCODER_OBJECT_ID_NUTMEG: |
2832 | case ENCODER_OBJECT_ID_NUTMEG: |
| 2827 | /* these are handled by the primary encoders */ |
2833 | /* these are handled by the primary encoders */ |
| 2828 | radeon_encoder->is_ext_encoder = true; |
2834 | radeon_encoder->is_ext_encoder = true; |
| 2829 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) |
2835 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) |
| 2830 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); |
2836 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2837 | DRM_MODE_ENCODER_LVDS, NULL); |
|
| 2831 | else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) |
2838 | else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) |
| 2832 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_DAC); |
2839 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2840 | DRM_MODE_ENCODER_DAC, NULL); |
|
| 2833 | else |
2841 | else |
| 2834 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); |
2842 | drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, |
| - | 2843 | DRM_MODE_ENCODER_TMDS, NULL); |
|
| 2835 | drm_encoder_helper_add(encoder, &radeon_atom_ext_helper_funcs); |
2844 | drm_encoder_helper_add(encoder, &radeon_atom_ext_helper_funcs); |
| 2836 | break; |
2845 | break; |
| 2837 | } |
2846 | } |
| 2838 | } |
2847 | } |