← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/radeon_combios.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_combios.c
1561
1561
                           (rdev->pdev->subsystem_device == 0x4150)) {
1562
1562
                        /* Mac G5 tower 9600 */
1563
1563
                        rdev->mode_info.connector_table = CT_MAC_G5_9600;
 
1564
                } else if ((rdev->pdev->device == 0x4c66) &&
 
1565
                           (rdev->pdev->subsystem_vendor == 0x1002) &&
 
1566
                           (rdev->pdev->subsystem_device == 0x4c66)) {
 
1567
                        /* SAM440ep RV250 embedded board */
 
1568
                        rdev->mode_info.connector_table = CT_SAM440EP;
1564
1569
                } else
1565
1570
#endif /* CONFIG_PPC_PMAC */
1566
1571
#ifdef CONFIG_PPC64
2134
2139
                                            CONNECTOR_OBJECT_ID_SVIDEO,
2135
2140
                                            &hpd);
2136
2141
                break;
 
2142
        case CT_SAM440EP:
 
2143
                DRM_INFO("Connector Table: %d (SAM440ep embedded board)\n",
 
2144
                         rdev->mode_info.connector_table);
 
2145
                /* LVDS */
 
2146
                ddc_i2c = combios_setup_i2c_bus(rdev, DDC_NONE_DETECTED, 0, 0);
 
2147
                hpd.hpd = RADEON_HPD_NONE;
 
2148
                radeon_add_legacy_encoder(dev,
 
2149
                                          radeon_get_encoder_enum(dev,
 
2150
                                                                ATOM_DEVICE_LCD1_SUPPORT,
 
2151
                                                                0),
 
2152
                                          ATOM_DEVICE_LCD1_SUPPORT);
 
2153
                radeon_add_legacy_connector(dev, 0, ATOM_DEVICE_LCD1_SUPPORT,
 
2154
                                            DRM_MODE_CONNECTOR_LVDS, &ddc_i2c,
 
2155
                                            CONNECTOR_OBJECT_ID_LVDS,
 
2156
                                            &hpd);
 
2157
                /* DVI-I - secondary dac, int tmds */
 
2158
                ddc_i2c = combios_setup_i2c_bus(rdev, DDC_DVI, 0, 0);
 
2159
                hpd.hpd = RADEON_HPD_1; /* ??? */
 
2160
                radeon_add_legacy_encoder(dev,
 
2161
                                          radeon_get_encoder_enum(dev,
 
2162
                                                                ATOM_DEVICE_DFP1_SUPPORT,
 
2163
                                                                0),
 
2164
                                          ATOM_DEVICE_DFP1_SUPPORT);
 
2165
                radeon_add_legacy_encoder(dev,
 
2166
                                          radeon_get_encoder_enum(dev,
 
2167
                                                                ATOM_DEVICE_CRT2_SUPPORT,
 
2168
                                                                2),
 
2169
                                          ATOM_DEVICE_CRT2_SUPPORT);
 
2170
                radeon_add_legacy_connector(dev, 1,
 
2171
                                            ATOM_DEVICE_DFP1_SUPPORT |
 
2172
                                            ATOM_DEVICE_CRT2_SUPPORT,
 
2173
                                            DRM_MODE_CONNECTOR_DVII, &ddc_i2c,
 
2174
                                            CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I,
 
2175
                                            &hpd);
 
2176
                /* VGA - primary dac */
 
2177
                ddc_i2c = combios_setup_i2c_bus(rdev, DDC_VGA, 0, 0);
 
2178
                hpd.hpd = RADEON_HPD_NONE;
 
2179
                radeon_add_legacy_encoder(dev,
 
2180
                                          radeon_get_encoder_enum(dev,
 
2181
                                                                ATOM_DEVICE_CRT1_SUPPORT,
 
2182
                                                                1),
 
2183
                                          ATOM_DEVICE_CRT1_SUPPORT);
 
2184
                radeon_add_legacy_connector(dev, 2,
 
2185
                                            ATOM_DEVICE_CRT1_SUPPORT,
 
2186
                                            DRM_MODE_CONNECTOR_VGA, &ddc_i2c,
 
2187
                                            CONNECTOR_OBJECT_ID_VGA,
 
2188
                                            &hpd);
 
2189
                /* TV - TV DAC */
 
2190
                ddc_i2c.valid = false;
 
2191
                hpd.hpd = RADEON_HPD_NONE;
 
2192
                radeon_add_legacy_encoder(dev,
 
2193
                                          radeon_get_encoder_enum(dev,
 
2194
                                                                ATOM_DEVICE_TV1_SUPPORT,
 
2195
                                                                2),
 
2196
                                          ATOM_DEVICE_TV1_SUPPORT);
 
2197
                radeon_add_legacy_connector(dev, 3, ATOM_DEVICE_TV1_SUPPORT,
 
2198
                                            DRM_MODE_CONNECTOR_SVIDEO,
 
2199
                                            &ddc_i2c,
 
2200
                                            CONNECTOR_OBJECT_ID_SVIDEO,
 
2201
                                            &hpd);
 
2202
                break;
2137
2203
        default:
2138
2204
                DRM_INFO("Connector table: %d (invalid)\n",
2139
2205
                         rdev->mode_info.connector_table);