Rev 1268 | Rev 1321 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1268 | Rev 1313 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright 2007-8 Advanced Micro Devices, Inc. |
2 | * Copyright 2007-8 Advanced Micro Devices, Inc. |
3 | * Copyright 2008 Red Hat Inc. |
3 | * Copyright 2008 Red Hat Inc. |
4 | * |
4 | * |
5 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * Permission is hereby granted, free of charge, to any person obtaining a |
6 | * copy of this software and associated documentation files (the "Software"), |
6 | * copy of this software and associated documentation files (the "Software"), |
7 | * to deal in the Software without restriction, including without limitation |
7 | * to deal in the Software without restriction, including without limitation |
8 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
8 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
9 | * and/or sell copies of the Software, and to permit persons to whom the |
9 | * and/or sell copies of the Software, and to permit persons to whom the |
10 | * Software is furnished to do so, subject to the following conditions: |
10 | * Software is furnished to do so, subject to the following conditions: |
11 | * |
11 | * |
12 | * The above copyright notice and this permission notice shall be included in |
12 | * The above copyright notice and this permission notice shall be included in |
13 | * all copies or substantial portions of the Software. |
13 | * all copies or substantial portions of the Software. |
14 | * |
14 | * |
15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
18 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR |
18 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR |
19 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
19 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
20 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
20 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
21 | * OTHER DEALINGS IN THE SOFTWARE. |
21 | * OTHER DEALINGS IN THE SOFTWARE. |
22 | * |
22 | * |
23 | * Authors: Dave Airlie |
23 | * Authors: Dave Airlie |
24 | * Alex Deucher |
24 | * Alex Deucher |
25 | */ |
25 | */ |
26 | #include "drmP.h" |
26 | #include "drmP.h" |
27 | #include "drm_edid.h" |
27 | #include "drm_edid.h" |
28 | #include "drm_crtc_helper.h" |
28 | #include "drm_crtc_helper.h" |
29 | #include "drm_fb_helper.h" |
29 | #include "drm_fb_helper.h" |
30 | #include "radeon_drm.h" |
30 | #include "radeon_drm.h" |
31 | #include "radeon.h" |
31 | #include "radeon.h" |
32 | #include "atom.h" |
32 | #include "atom.h" |
33 | 33 | ||
34 | extern void |
34 | extern void |
35 | radeon_combios_connected_scratch_regs(struct drm_connector *connector, |
35 | radeon_combios_connected_scratch_regs(struct drm_connector *connector, |
36 | struct drm_encoder *encoder, |
36 | struct drm_encoder *encoder, |
37 | bool connected); |
37 | bool connected); |
38 | extern void |
38 | extern void |
39 | radeon_atombios_connected_scratch_regs(struct drm_connector *connector, |
39 | radeon_atombios_connected_scratch_regs(struct drm_connector *connector, |
40 | struct drm_encoder *encoder, |
40 | struct drm_encoder *encoder, |
41 | bool connected); |
41 | bool connected); |
42 | 42 | ||
43 | static void radeon_property_change_mode(struct drm_encoder *encoder) |
43 | static void radeon_property_change_mode(struct drm_encoder *encoder) |
44 | { |
44 | { |
45 | struct drm_crtc *crtc = encoder->crtc; |
45 | struct drm_crtc *crtc = encoder->crtc; |
46 | 46 | ||
47 | if (crtc && crtc->enabled) { |
47 | if (crtc && crtc->enabled) { |
48 | drm_crtc_helper_set_mode(crtc, &crtc->mode, |
48 | drm_crtc_helper_set_mode(crtc, &crtc->mode, |
49 | crtc->x, crtc->y, crtc->fb); |
49 | crtc->x, crtc->y, crtc->fb); |
50 | } |
50 | } |
51 | } |
51 | } |
52 | static void |
52 | static void |
53 | radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_connector_status status) |
53 | radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_connector_status status) |
54 | { |
54 | { |
55 | struct drm_device *dev = connector->dev; |
55 | struct drm_device *dev = connector->dev; |
56 | struct radeon_device *rdev = dev->dev_private; |
56 | struct radeon_device *rdev = dev->dev_private; |
57 | struct drm_encoder *best_encoder = NULL; |
57 | struct drm_encoder *best_encoder = NULL; |
58 | struct drm_encoder *encoder = NULL; |
58 | struct drm_encoder *encoder = NULL; |
59 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
59 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
60 | struct drm_mode_object *obj; |
60 | struct drm_mode_object *obj; |
61 | bool connected; |
61 | bool connected; |
62 | int i; |
62 | int i; |
63 | 63 | ||
64 | best_encoder = connector_funcs->best_encoder(connector); |
64 | best_encoder = connector_funcs->best_encoder(connector); |
65 | 65 | ||
66 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
66 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
67 | if (connector->encoder_ids[i] == 0) |
67 | if (connector->encoder_ids[i] == 0) |
68 | break; |
68 | break; |
69 | 69 | ||
70 | obj = drm_mode_object_find(connector->dev, |
70 | obj = drm_mode_object_find(connector->dev, |
71 | connector->encoder_ids[i], |
71 | connector->encoder_ids[i], |
72 | DRM_MODE_OBJECT_ENCODER); |
72 | DRM_MODE_OBJECT_ENCODER); |
73 | if (!obj) |
73 | if (!obj) |
74 | continue; |
74 | continue; |
75 | 75 | ||
76 | encoder = obj_to_encoder(obj); |
76 | encoder = obj_to_encoder(obj); |
77 | 77 | ||
78 | if ((encoder == best_encoder) && (status == connector_status_connected)) |
78 | if ((encoder == best_encoder) && (status == connector_status_connected)) |
79 | connected = true; |
79 | connected = true; |
80 | else |
80 | else |
81 | connected = false; |
81 | connected = false; |
82 | 82 | ||
83 | if (rdev->is_atom_bios) |
83 | if (rdev->is_atom_bios) |
84 | radeon_atombios_connected_scratch_regs(connector, encoder, connected); |
84 | radeon_atombios_connected_scratch_regs(connector, encoder, connected); |
85 | else |
85 | else |
86 | radeon_combios_connected_scratch_regs(connector, encoder, connected); |
86 | radeon_combios_connected_scratch_regs(connector, encoder, connected); |
87 | 87 | ||
88 | } |
88 | } |
89 | } |
89 | } |
90 | 90 | ||
91 | struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type) |
91 | struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type) |
92 | { |
92 | { |
93 | struct drm_mode_object *obj; |
93 | struct drm_mode_object *obj; |
94 | struct drm_encoder *encoder; |
94 | struct drm_encoder *encoder; |
95 | int i; |
95 | int i; |
96 | 96 | ||
97 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
97 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
98 | if (connector->encoder_ids[i] == 0) |
98 | if (connector->encoder_ids[i] == 0) |
99 | break; |
99 | break; |
100 | 100 | ||
101 | obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER); |
101 | obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER); |
102 | if (!obj) |
102 | if (!obj) |
103 | continue; |
103 | continue; |
104 | 104 | ||
105 | encoder = obj_to_encoder(obj); |
105 | encoder = obj_to_encoder(obj); |
106 | if (encoder->encoder_type == encoder_type) |
106 | if (encoder->encoder_type == encoder_type) |
107 | return encoder; |
107 | return encoder; |
108 | } |
108 | } |
109 | return NULL; |
109 | return NULL; |
110 | } |
110 | } |
111 | 111 | ||
112 | struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector) |
112 | struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector) |
113 | { |
113 | { |
114 | int enc_id = connector->encoder_ids[0]; |
114 | int enc_id = connector->encoder_ids[0]; |
115 | struct drm_mode_object *obj; |
115 | struct drm_mode_object *obj; |
116 | struct drm_encoder *encoder; |
116 | struct drm_encoder *encoder; |
117 | 117 | ||
118 | /* pick the encoder ids */ |
118 | /* pick the encoder ids */ |
119 | if (enc_id) { |
119 | if (enc_id) { |
120 | obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); |
120 | obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); |
121 | if (!obj) |
121 | if (!obj) |
122 | return NULL; |
122 | return NULL; |
123 | encoder = obj_to_encoder(obj); |
123 | encoder = obj_to_encoder(obj); |
124 | return encoder; |
124 | return encoder; |
125 | } |
125 | } |
126 | return NULL; |
126 | return NULL; |
127 | } |
127 | } |
128 | 128 | ||
129 | /* |
129 | /* |
130 | * radeon_connector_analog_encoder_conflict_solve |
130 | * radeon_connector_analog_encoder_conflict_solve |
131 | * - search for other connectors sharing this encoder |
131 | * - search for other connectors sharing this encoder |
132 | * if priority is true, then set them disconnected if this is connected |
132 | * if priority is true, then set them disconnected if this is connected |
133 | * if priority is false, set us disconnected if they are connected |
133 | * if priority is false, set us disconnected if they are connected |
134 | */ |
134 | */ |
135 | static enum drm_connector_status |
135 | static enum drm_connector_status |
136 | radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, |
136 | radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, |
137 | struct drm_encoder *encoder, |
137 | struct drm_encoder *encoder, |
138 | enum drm_connector_status current_status, |
138 | enum drm_connector_status current_status, |
139 | bool priority) |
139 | bool priority) |
140 | { |
140 | { |
141 | struct drm_device *dev = connector->dev; |
141 | struct drm_device *dev = connector->dev; |
142 | struct drm_connector *conflict; |
142 | struct drm_connector *conflict; |
143 | int i; |
143 | int i; |
144 | 144 | ||
145 | list_for_each_entry(conflict, &dev->mode_config.connector_list, head) { |
145 | list_for_each_entry(conflict, &dev->mode_config.connector_list, head) { |
146 | if (conflict == connector) |
146 | if (conflict == connector) |
147 | continue; |
147 | continue; |
148 | 148 | ||
149 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
149 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
150 | if (conflict->encoder_ids[i] == 0) |
150 | if (conflict->encoder_ids[i] == 0) |
151 | break; |
151 | break; |
152 | 152 | ||
153 | /* if the IDs match */ |
153 | /* if the IDs match */ |
154 | if (conflict->encoder_ids[i] == encoder->base.id) { |
154 | if (conflict->encoder_ids[i] == encoder->base.id) { |
155 | if (conflict->status != connector_status_connected) |
155 | if (conflict->status != connector_status_connected) |
156 | continue; |
156 | continue; |
157 | 157 | ||
158 | if (priority == true) { |
158 | if (priority == true) { |
159 | DRM_INFO("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict)); |
159 | DRM_INFO("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict)); |
160 | DRM_INFO("in favor of %s\n", drm_get_connector_name(connector)); |
160 | DRM_INFO("in favor of %s\n", drm_get_connector_name(connector)); |
161 | conflict->status = connector_status_disconnected; |
161 | conflict->status = connector_status_disconnected; |
162 | radeon_connector_update_scratch_regs(conflict, connector_status_disconnected); |
162 | radeon_connector_update_scratch_regs(conflict, connector_status_disconnected); |
163 | } else { |
163 | } else { |
164 | DRM_INFO("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector)); |
164 | DRM_INFO("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector)); |
165 | DRM_INFO("in favor of %s\n", drm_get_connector_name(conflict)); |
165 | DRM_INFO("in favor of %s\n", drm_get_connector_name(conflict)); |
166 | current_status = connector_status_disconnected; |
166 | current_status = connector_status_disconnected; |
167 | } |
167 | } |
168 | break; |
168 | break; |
169 | } |
169 | } |
170 | } |
170 | } |
171 | } |
171 | } |
172 | return current_status; |
172 | return current_status; |
173 | 173 | ||
174 | } |
174 | } |
175 | 175 | ||
176 | static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encoder) |
176 | static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encoder) |
177 | { |
177 | { |
178 | struct drm_device *dev = encoder->dev; |
178 | struct drm_device *dev = encoder->dev; |
179 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
179 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
180 | struct drm_display_mode *mode = NULL; |
180 | struct drm_display_mode *mode = NULL; |
181 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
181 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
182 | 182 | ||
183 | if (native_mode->hdisplay != 0 && |
183 | if (native_mode->hdisplay != 0 && |
184 | native_mode->vdisplay != 0 && |
184 | native_mode->vdisplay != 0 && |
185 | native_mode->clock != 0) { |
185 | native_mode->clock != 0) { |
186 | mode = drm_mode_duplicate(dev, native_mode); |
186 | mode = drm_mode_duplicate(dev, native_mode); |
187 | mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; |
187 | mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; |
188 | drm_mode_set_name(mode); |
188 | drm_mode_set_name(mode); |
189 | 189 | ||
190 | DRM_DEBUG("Adding native panel mode %s\n", mode->name); |
190 | DRM_DEBUG("Adding native panel mode %s\n", mode->name); |
191 | } |
191 | } |
192 | return mode; |
192 | return mode; |
193 | } |
193 | } |
194 | 194 | ||
195 | static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_connector *connector) |
195 | static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_connector *connector) |
196 | { |
196 | { |
197 | struct drm_device *dev = encoder->dev; |
197 | struct drm_device *dev = encoder->dev; |
198 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
198 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
199 | struct drm_display_mode *mode = NULL; |
199 | struct drm_display_mode *mode = NULL; |
200 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
200 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
201 | int i; |
201 | int i; |
202 | struct mode_size { |
202 | struct mode_size { |
203 | int w; |
203 | int w; |
204 | int h; |
204 | int h; |
205 | } common_modes[17] = { |
205 | } common_modes[17] = { |
206 | { 640, 480}, |
206 | { 640, 480}, |
207 | { 720, 480}, |
207 | { 720, 480}, |
208 | { 800, 600}, |
208 | { 800, 600}, |
209 | { 848, 480}, |
209 | { 848, 480}, |
210 | {1024, 768}, |
210 | {1024, 768}, |
211 | {1152, 768}, |
211 | {1152, 768}, |
212 | {1280, 720}, |
212 | {1280, 720}, |
213 | {1280, 800}, |
213 | {1280, 800}, |
214 | {1280, 854}, |
214 | {1280, 854}, |
215 | {1280, 960}, |
215 | {1280, 960}, |
216 | {1280, 1024}, |
216 | {1280, 1024}, |
217 | {1440, 900}, |
217 | {1440, 900}, |
218 | {1400, 1050}, |
218 | {1400, 1050}, |
219 | {1680, 1050}, |
219 | {1680, 1050}, |
220 | {1600, 1200}, |
220 | {1600, 1200}, |
221 | {1920, 1080}, |
221 | {1920, 1080}, |
222 | {1920, 1200} |
222 | {1920, 1200} |
223 | }; |
223 | }; |
224 | 224 | ||
225 | for (i = 0; i < 17; i++) { |
225 | for (i = 0; i < 17; i++) { |
226 | if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT)) { |
226 | if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT)) { |
227 | if (common_modes[i].w > 1024 || |
227 | if (common_modes[i].w > 1024 || |
228 | common_modes[i].h > 768) |
228 | common_modes[i].h > 768) |
229 | continue; |
229 | continue; |
230 | } |
230 | } |
231 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
231 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
232 | if (common_modes[i].w > native_mode->hdisplay || |
232 | if (common_modes[i].w > native_mode->hdisplay || |
233 | common_modes[i].h > native_mode->vdisplay || |
233 | common_modes[i].h > native_mode->vdisplay || |
234 | (common_modes[i].w == native_mode->hdisplay && |
234 | (common_modes[i].w == native_mode->hdisplay && |
235 | common_modes[i].h == native_mode->vdisplay)) |
235 | common_modes[i].h == native_mode->vdisplay)) |
236 | continue; |
236 | continue; |
237 | } |
237 | } |
238 | if (common_modes[i].w < 320 || common_modes[i].h < 200) |
238 | if (common_modes[i].w < 320 || common_modes[i].h < 200) |
239 | continue; |
239 | continue; |
240 | 240 | ||
241 | mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false); |
241 | mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false); |
242 | drm_mode_probed_add(connector, mode); |
242 | drm_mode_probed_add(connector, mode); |
243 | } |
243 | } |
244 | } |
244 | } |
245 | 245 | ||
246 | int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property, |
246 | int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property, |
247 | uint64_t val) |
247 | uint64_t val) |
248 | { |
248 | { |
249 | struct drm_device *dev = connector->dev; |
249 | struct drm_device *dev = connector->dev; |
250 | struct radeon_device *rdev = dev->dev_private; |
250 | struct radeon_device *rdev = dev->dev_private; |
251 | struct drm_encoder *encoder; |
251 | struct drm_encoder *encoder; |
252 | struct radeon_encoder *radeon_encoder; |
252 | struct radeon_encoder *radeon_encoder; |
253 | 253 | ||
254 | if (property == rdev->mode_info.coherent_mode_property) { |
254 | if (property == rdev->mode_info.coherent_mode_property) { |
255 | struct radeon_encoder_atom_dig *dig; |
255 | struct radeon_encoder_atom_dig *dig; |
256 | 256 | ||
257 | /* need to find digital encoder on connector */ |
257 | /* need to find digital encoder on connector */ |
258 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS); |
258 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS); |
259 | if (!encoder) |
259 | if (!encoder) |
260 | return 0; |
260 | return 0; |
261 | 261 | ||
262 | radeon_encoder = to_radeon_encoder(encoder); |
262 | radeon_encoder = to_radeon_encoder(encoder); |
263 | 263 | ||
264 | if (!radeon_encoder->enc_priv) |
264 | if (!radeon_encoder->enc_priv) |
265 | return 0; |
265 | return 0; |
266 | 266 | ||
267 | dig = radeon_encoder->enc_priv; |
267 | dig = radeon_encoder->enc_priv; |
268 | dig->coherent_mode = val ? true : false; |
268 | dig->coherent_mode = val ? true : false; |
269 | radeon_property_change_mode(&radeon_encoder->base); |
269 | radeon_property_change_mode(&radeon_encoder->base); |
270 | } |
270 | } |
271 | 271 | ||
272 | if (property == rdev->mode_info.tv_std_property) { |
272 | if (property == rdev->mode_info.tv_std_property) { |
273 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TVDAC); |
273 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TVDAC); |
274 | if (!encoder) { |
274 | if (!encoder) { |
275 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_DAC); |
275 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_DAC); |
276 | } |
276 | } |
277 | 277 | ||
278 | if (!encoder) |
278 | if (!encoder) |
279 | return 0; |
279 | return 0; |
280 | 280 | ||
281 | radeon_encoder = to_radeon_encoder(encoder); |
281 | radeon_encoder = to_radeon_encoder(encoder); |
282 | if (!radeon_encoder->enc_priv) |
282 | if (!radeon_encoder->enc_priv) |
283 | return 0; |
283 | return 0; |
284 | if (rdev->is_atom_bios) { |
284 | if (rdev->is_atom_bios) { |
285 | struct radeon_encoder_atom_dac *dac_int; |
285 | struct radeon_encoder_atom_dac *dac_int; |
286 | dac_int = radeon_encoder->enc_priv; |
286 | dac_int = radeon_encoder->enc_priv; |
287 | dac_int->tv_std = val; |
287 | dac_int->tv_std = val; |
288 | } else { |
288 | } else { |
289 | struct radeon_encoder_tv_dac *dac_int; |
289 | struct radeon_encoder_tv_dac *dac_int; |
290 | dac_int = radeon_encoder->enc_priv; |
290 | dac_int = radeon_encoder->enc_priv; |
291 | dac_int->tv_std = val; |
291 | dac_int->tv_std = val; |
292 | } |
292 | } |
293 | radeon_property_change_mode(&radeon_encoder->base); |
293 | radeon_property_change_mode(&radeon_encoder->base); |
294 | } |
294 | } |
295 | 295 | ||
296 | if (property == rdev->mode_info.load_detect_property) { |
296 | if (property == rdev->mode_info.load_detect_property) { |
297 | struct radeon_connector *radeon_connector = |
297 | struct radeon_connector *radeon_connector = |
298 | to_radeon_connector(connector); |
298 | to_radeon_connector(connector); |
299 | 299 | ||
300 | if (val == 0) |
300 | if (val == 0) |
301 | radeon_connector->dac_load_detect = false; |
301 | radeon_connector->dac_load_detect = false; |
302 | else |
302 | else |
303 | radeon_connector->dac_load_detect = true; |
303 | radeon_connector->dac_load_detect = true; |
304 | } |
304 | } |
305 | 305 | ||
306 | if (property == rdev->mode_info.tmds_pll_property) { |
306 | if (property == rdev->mode_info.tmds_pll_property) { |
307 | struct radeon_encoder_int_tmds *tmds = NULL; |
307 | struct radeon_encoder_int_tmds *tmds = NULL; |
308 | bool ret = false; |
308 | bool ret = false; |
309 | /* need to find digital encoder on connector */ |
309 | /* need to find digital encoder on connector */ |
310 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS); |
310 | encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS); |
311 | if (!encoder) |
311 | if (!encoder) |
312 | return 0; |
312 | return 0; |
313 | 313 | ||
314 | radeon_encoder = to_radeon_encoder(encoder); |
314 | radeon_encoder = to_radeon_encoder(encoder); |
315 | 315 | ||
316 | tmds = radeon_encoder->enc_priv; |
316 | tmds = radeon_encoder->enc_priv; |
317 | if (!tmds) |
317 | if (!tmds) |
318 | return 0; |
318 | return 0; |
319 | 319 | ||
320 | if (val == 0) { |
320 | if (val == 0) { |
321 | if (rdev->is_atom_bios) |
321 | if (rdev->is_atom_bios) |
322 | ret = radeon_atombios_get_tmds_info(radeon_encoder, tmds); |
322 | ret = radeon_atombios_get_tmds_info(radeon_encoder, tmds); |
323 | else |
323 | else |
324 | ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds); |
324 | ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds); |
325 | } |
325 | } |
326 | if (val == 1 || ret == false) { |
326 | if (val == 1 || ret == false) { |
327 | radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds); |
327 | radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds); |
328 | } |
328 | } |
329 | radeon_property_change_mode(&radeon_encoder->base); |
329 | radeon_property_change_mode(&radeon_encoder->base); |
330 | } |
330 | } |
331 | 331 | ||
332 | return 0; |
332 | return 0; |
333 | } |
333 | } |
334 | 334 | ||
335 | static void radeon_fixup_lvds_native_mode(struct drm_encoder *encoder, |
335 | static void radeon_fixup_lvds_native_mode(struct drm_encoder *encoder, |
336 | struct drm_connector *connector) |
336 | struct drm_connector *connector) |
337 | { |
337 | { |
338 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
338 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
339 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
339 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
340 | 340 | ||
341 | /* Try to get native mode details from EDID if necessary */ |
341 | /* Try to get native mode details from EDID if necessary */ |
342 | if (!native_mode->clock) { |
342 | if (!native_mode->clock) { |
343 | struct drm_display_mode *t, *mode; |
343 | struct drm_display_mode *t, *mode; |
344 | 344 | ||
345 | list_for_each_entry_safe(mode, t, &connector->probed_modes, head) { |
345 | list_for_each_entry_safe(mode, t, &connector->probed_modes, head) { |
346 | if (mode->hdisplay == native_mode->hdisplay && |
346 | if (mode->hdisplay == native_mode->hdisplay && |
347 | mode->vdisplay == native_mode->vdisplay) { |
347 | mode->vdisplay == native_mode->vdisplay) { |
348 | *native_mode = *mode; |
348 | *native_mode = *mode; |
349 | drm_mode_set_crtcinfo(native_mode, CRTC_INTERLACE_HALVE_V); |
349 | drm_mode_set_crtcinfo(native_mode, CRTC_INTERLACE_HALVE_V); |
350 | DRM_INFO("Determined LVDS native mode details from EDID\n"); |
350 | DRM_INFO("Determined LVDS native mode details from EDID\n"); |
351 | break; |
351 | break; |
352 | } |
352 | } |
353 | } |
353 | } |
354 | } |
354 | } |
355 | if (!native_mode->clock) { |
355 | if (!native_mode->clock) { |
356 | DRM_INFO("No LVDS native mode details, disabling RMX\n"); |
356 | DRM_INFO("No LVDS native mode details, disabling RMX\n"); |
357 | radeon_encoder->rmx_type = RMX_OFF; |
357 | radeon_encoder->rmx_type = RMX_OFF; |
358 | } |
358 | } |
359 | } |
359 | } |
360 | 360 | ||
361 | static int radeon_lvds_get_modes(struct drm_connector *connector) |
361 | static int radeon_lvds_get_modes(struct drm_connector *connector) |
362 | { |
362 | { |
363 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
363 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
364 | struct drm_encoder *encoder; |
364 | struct drm_encoder *encoder; |
365 | int ret = 0; |
365 | int ret = 0; |
366 | struct drm_display_mode *mode; |
366 | struct drm_display_mode *mode; |
367 | 367 | ||
368 | if (radeon_connector->ddc_bus) { |
368 | if (radeon_connector->ddc_bus) { |
369 | ret = radeon_ddc_get_modes(radeon_connector); |
369 | ret = radeon_ddc_get_modes(radeon_connector); |
370 | if (ret > 0) { |
370 | if (ret > 0) { |
371 | encoder = radeon_best_single_encoder(connector); |
371 | encoder = radeon_best_single_encoder(connector); |
372 | if (encoder) { |
372 | if (encoder) { |
373 | radeon_fixup_lvds_native_mode(encoder, connector); |
373 | radeon_fixup_lvds_native_mode(encoder, connector); |
374 | /* add scaled modes */ |
374 | /* add scaled modes */ |
375 | radeon_add_common_modes(encoder, connector); |
375 | radeon_add_common_modes(encoder, connector); |
376 | } |
376 | } |
377 | return ret; |
377 | return ret; |
378 | } |
378 | } |
379 | } |
379 | } |
380 | 380 | ||
381 | encoder = radeon_best_single_encoder(connector); |
381 | encoder = radeon_best_single_encoder(connector); |
382 | if (!encoder) |
382 | if (!encoder) |
383 | return 0; |
383 | return 0; |
384 | 384 | ||
385 | /* we have no EDID modes */ |
385 | /* we have no EDID modes */ |
386 | mode = radeon_fp_native_mode(encoder); |
386 | mode = radeon_fp_native_mode(encoder); |
387 | if (mode) { |
387 | if (mode) { |
388 | ret = 1; |
388 | ret = 1; |
389 | drm_mode_probed_add(connector, mode); |
389 | drm_mode_probed_add(connector, mode); |
390 | /* add scaled modes */ |
390 | /* add scaled modes */ |
391 | radeon_add_common_modes(encoder, connector); |
391 | radeon_add_common_modes(encoder, connector); |
392 | } |
392 | } |
393 | 393 | ||
394 | return ret; |
394 | return ret; |
395 | } |
395 | } |
396 | 396 | ||
397 | static int radeon_lvds_mode_valid(struct drm_connector *connector, |
397 | static int radeon_lvds_mode_valid(struct drm_connector *connector, |
398 | struct drm_display_mode *mode) |
398 | struct drm_display_mode *mode) |
399 | { |
399 | { |
400 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
400 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
401 | 401 | ||
402 | if ((mode->hdisplay < 320) || (mode->vdisplay < 240)) |
402 | if ((mode->hdisplay < 320) || (mode->vdisplay < 240)) |
403 | return MODE_PANEL; |
403 | return MODE_PANEL; |
404 | 404 | ||
405 | if (encoder) { |
405 | if (encoder) { |
406 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
406 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
407 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
407 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
408 | 408 | ||
409 | /* AVIVO hardware supports downscaling modes larger than the panel |
409 | /* AVIVO hardware supports downscaling modes larger than the panel |
410 | * to the panel size, but I'm not sure this is desirable. |
410 | * to the panel size, but I'm not sure this is desirable. |
411 | */ |
411 | */ |
412 | if ((mode->hdisplay > native_mode->hdisplay) || |
412 | if ((mode->hdisplay > native_mode->hdisplay) || |
413 | (mode->vdisplay > native_mode->vdisplay)) |
413 | (mode->vdisplay > native_mode->vdisplay)) |
414 | return MODE_PANEL; |
414 | return MODE_PANEL; |
415 | 415 | ||
416 | /* if scaling is disabled, block non-native modes */ |
416 | /* if scaling is disabled, block non-native modes */ |
417 | if (radeon_encoder->rmx_type == RMX_OFF) { |
417 | if (radeon_encoder->rmx_type == RMX_OFF) { |
418 | if ((mode->hdisplay != native_mode->hdisplay) || |
418 | if ((mode->hdisplay != native_mode->hdisplay) || |
419 | (mode->vdisplay != native_mode->vdisplay)) |
419 | (mode->vdisplay != native_mode->vdisplay)) |
420 | return MODE_PANEL; |
420 | return MODE_PANEL; |
421 | } |
421 | } |
422 | } |
422 | } |
423 | 423 | ||
424 | return MODE_OK; |
424 | return MODE_OK; |
425 | } |
425 | } |
426 | 426 | ||
427 | static enum drm_connector_status radeon_lvds_detect(struct drm_connector *connector) |
427 | static enum drm_connector_status radeon_lvds_detect(struct drm_connector *connector) |
428 | { |
428 | { |
429 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
429 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
430 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
430 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
431 | enum drm_connector_status ret = connector_status_disconnected; |
431 | enum drm_connector_status ret = connector_status_disconnected; |
432 | 432 | ||
433 | if (encoder) { |
433 | if (encoder) { |
434 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
434 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
435 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
435 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
436 | 436 | ||
437 | /* check if panel is valid */ |
437 | /* check if panel is valid */ |
438 | if (native_mode->hdisplay >= 320 && native_mode->vdisplay >= 240) |
438 | if (native_mode->hdisplay >= 320 && native_mode->vdisplay >= 240) |
439 | ret = connector_status_connected; |
439 | ret = connector_status_connected; |
440 | 440 | ||
441 | } |
441 | } |
442 | 442 | ||
443 | /* check for edid as well */ |
443 | /* check for edid as well */ |
444 | if (radeon_connector->edid) |
444 | if (radeon_connector->edid) |
445 | ret = connector_status_connected; |
445 | ret = connector_status_connected; |
446 | else { |
446 | else { |
447 | if (radeon_connector->ddc_bus) { |
447 | if (radeon_connector->ddc_bus) { |
448 | radeon_i2c_do_lock(radeon_connector, 1); |
448 | radeon_i2c_do_lock(radeon_connector, 1); |
449 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, |
449 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, |
450 | &radeon_connector->ddc_bus->adapter); |
450 | &radeon_connector->ddc_bus->adapter); |
451 | radeon_i2c_do_lock(radeon_connector, 0); |
451 | radeon_i2c_do_lock(radeon_connector, 0); |
452 | if (radeon_connector->edid) |
452 | if (radeon_connector->edid) |
453 | ret = connector_status_connected; |
453 | ret = connector_status_connected; |
454 | } |
454 | } |
455 | } |
455 | } |
456 | /* check acpi lid status ??? */ |
456 | /* check acpi lid status ??? */ |
457 | 457 | ||
458 | radeon_connector_update_scratch_regs(connector, ret); |
458 | radeon_connector_update_scratch_regs(connector, ret); |
459 | return ret; |
459 | return ret; |
460 | } |
460 | } |
461 | 461 | ||
462 | static void radeon_connector_destroy(struct drm_connector *connector) |
462 | static void radeon_connector_destroy(struct drm_connector *connector) |
463 | { |
463 | { |
464 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
464 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
465 | 465 | ||
466 | if (radeon_connector->ddc_bus) |
466 | if (radeon_connector->ddc_bus) |
467 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
467 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
468 | if (radeon_connector->edid) |
468 | if (radeon_connector->edid) |
469 | kfree(radeon_connector->edid); |
469 | kfree(radeon_connector->edid); |
470 | kfree(radeon_connector->con_priv); |
470 | kfree(radeon_connector->con_priv); |
471 | drm_sysfs_connector_remove(connector); |
471 | drm_sysfs_connector_remove(connector); |
472 | drm_connector_cleanup(connector); |
472 | drm_connector_cleanup(connector); |
473 | kfree(connector); |
473 | kfree(connector); |
474 | } |
474 | } |
475 | 475 | ||
476 | static int radeon_lvds_set_property(struct drm_connector *connector, |
476 | static int radeon_lvds_set_property(struct drm_connector *connector, |
477 | struct drm_property *property, |
477 | struct drm_property *property, |
478 | uint64_t value) |
478 | uint64_t value) |
479 | { |
479 | { |
480 | struct drm_device *dev = connector->dev; |
480 | struct drm_device *dev = connector->dev; |
481 | struct radeon_encoder *radeon_encoder; |
481 | struct radeon_encoder *radeon_encoder; |
482 | enum radeon_rmx_type rmx_type; |
482 | enum radeon_rmx_type rmx_type; |
483 | 483 | ||
484 | DRM_DEBUG("\n"); |
484 | DRM_DEBUG("\n"); |
485 | if (property != dev->mode_config.scaling_mode_property) |
485 | if (property != dev->mode_config.scaling_mode_property) |
486 | return 0; |
486 | return 0; |
487 | 487 | ||
488 | if (connector->encoder) |
488 | if (connector->encoder) |
489 | radeon_encoder = to_radeon_encoder(connector->encoder); |
489 | radeon_encoder = to_radeon_encoder(connector->encoder); |
490 | else { |
490 | else { |
491 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
491 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
492 | radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector)); |
492 | radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector)); |
493 | } |
493 | } |
494 | 494 | ||
495 | switch (value) { |
495 | switch (value) { |
496 | case DRM_MODE_SCALE_NONE: rmx_type = RMX_OFF; break; |
496 | case DRM_MODE_SCALE_NONE: rmx_type = RMX_OFF; break; |
497 | case DRM_MODE_SCALE_CENTER: rmx_type = RMX_CENTER; break; |
497 | case DRM_MODE_SCALE_CENTER: rmx_type = RMX_CENTER; break; |
498 | case DRM_MODE_SCALE_ASPECT: rmx_type = RMX_ASPECT; break; |
498 | case DRM_MODE_SCALE_ASPECT: rmx_type = RMX_ASPECT; break; |
499 | default: |
499 | default: |
500 | case DRM_MODE_SCALE_FULLSCREEN: rmx_type = RMX_FULL; break; |
500 | case DRM_MODE_SCALE_FULLSCREEN: rmx_type = RMX_FULL; break; |
501 | } |
501 | } |
502 | if (radeon_encoder->rmx_type == rmx_type) |
502 | if (radeon_encoder->rmx_type == rmx_type) |
503 | return 0; |
503 | return 0; |
504 | 504 | ||
505 | radeon_encoder->rmx_type = rmx_type; |
505 | radeon_encoder->rmx_type = rmx_type; |
506 | 506 | ||
507 | radeon_property_change_mode(&radeon_encoder->base); |
507 | radeon_property_change_mode(&radeon_encoder->base); |
508 | return 0; |
508 | return 0; |
509 | } |
509 | } |
510 | 510 | ||
511 | 511 | ||
512 | struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = { |
512 | struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = { |
513 | .get_modes = radeon_lvds_get_modes, |
513 | .get_modes = radeon_lvds_get_modes, |
514 | .mode_valid = radeon_lvds_mode_valid, |
514 | .mode_valid = radeon_lvds_mode_valid, |
515 | .best_encoder = radeon_best_single_encoder, |
515 | .best_encoder = radeon_best_single_encoder, |
516 | }; |
516 | }; |
517 | 517 | ||
518 | struct drm_connector_funcs radeon_lvds_connector_funcs = { |
518 | struct drm_connector_funcs radeon_lvds_connector_funcs = { |
519 | .dpms = drm_helper_connector_dpms, |
519 | .dpms = drm_helper_connector_dpms, |
520 | .detect = radeon_lvds_detect, |
520 | .detect = radeon_lvds_detect, |
521 | .fill_modes = drm_helper_probe_single_connector_modes, |
521 | .fill_modes = drm_helper_probe_single_connector_modes, |
522 | .destroy = radeon_connector_destroy, |
522 | .destroy = radeon_connector_destroy, |
523 | .set_property = radeon_lvds_set_property, |
523 | .set_property = radeon_lvds_set_property, |
524 | }; |
524 | }; |
525 | 525 | ||
526 | static int radeon_vga_get_modes(struct drm_connector *connector) |
526 | static int radeon_vga_get_modes(struct drm_connector *connector) |
527 | { |
527 | { |
528 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
528 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
529 | int ret; |
529 | int ret; |
530 | 530 | ||
531 | ret = radeon_ddc_get_modes(radeon_connector); |
531 | ret = radeon_ddc_get_modes(radeon_connector); |
532 | 532 | ||
533 | return ret; |
533 | return ret; |
534 | } |
534 | } |
535 | 535 | ||
536 | static int radeon_vga_mode_valid(struct drm_connector *connector, |
536 | static int radeon_vga_mode_valid(struct drm_connector *connector, |
537 | struct drm_display_mode *mode) |
537 | struct drm_display_mode *mode) |
538 | { |
538 | { |
539 | /* XXX check mode bandwidth */ |
539 | /* XXX check mode bandwidth */ |
540 | /* XXX verify against max DAC output frequency */ |
540 | /* XXX verify against max DAC output frequency */ |
541 | return MODE_OK; |
541 | return MODE_OK; |
542 | } |
542 | } |
543 | 543 | ||
544 | static enum drm_connector_status radeon_vga_detect(struct drm_connector *connector) |
544 | static enum drm_connector_status radeon_vga_detect(struct drm_connector *connector) |
545 | { |
545 | { |
546 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
546 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
547 | struct drm_encoder *encoder; |
547 | struct drm_encoder *encoder; |
548 | struct drm_encoder_helper_funcs *encoder_funcs; |
548 | struct drm_encoder_helper_funcs *encoder_funcs; |
549 | bool dret; |
549 | bool dret; |
550 | enum drm_connector_status ret = connector_status_disconnected; |
550 | enum drm_connector_status ret = connector_status_disconnected; |
551 | 551 | ||
552 | encoder = radeon_best_single_encoder(connector); |
552 | encoder = radeon_best_single_encoder(connector); |
553 | if (!encoder) |
553 | if (!encoder) |
554 | ret = connector_status_disconnected; |
554 | ret = connector_status_disconnected; |
555 | 555 | ||
556 | radeon_i2c_do_lock(radeon_connector, 1); |
556 | radeon_i2c_do_lock(radeon_connector, 1); |
557 | dret = radeon_ddc_probe(radeon_connector); |
557 | dret = radeon_ddc_probe(radeon_connector); |
558 | radeon_i2c_do_lock(radeon_connector, 0); |
558 | radeon_i2c_do_lock(radeon_connector, 0); |
559 | if (dret) { |
559 | if (dret) { |
560 | if (radeon_connector->edid) { |
560 | if (radeon_connector->edid) { |
561 | kfree(radeon_connector->edid); |
561 | kfree(radeon_connector->edid); |
562 | radeon_connector->edid = NULL; |
562 | radeon_connector->edid = NULL; |
563 | } |
563 | } |
564 | radeon_i2c_do_lock(radeon_connector, 1); |
564 | radeon_i2c_do_lock(radeon_connector, 1); |
565 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter); |
565 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter); |
566 | radeon_i2c_do_lock(radeon_connector, 0); |
566 | radeon_i2c_do_lock(radeon_connector, 0); |
567 | 567 | ||
568 | if (!radeon_connector->edid) { |
568 | if (!radeon_connector->edid) { |
569 | DRM_ERROR("DDC responded but not EDID found for %s\n", |
569 | DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", |
570 | drm_get_connector_name(connector)); |
570 | drm_get_connector_name(connector)); |
- | 571 | ret = connector_status_connected; |
|
571 | } else { |
572 | } else { |
572 | radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
573 | radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
573 | 574 | ||
574 | /* some oems have boards with separate digital and analog connectors |
575 | /* some oems have boards with separate digital and analog connectors |
575 | * with a shared ddc line (often vga + hdmi) |
576 | * with a shared ddc line (often vga + hdmi) |
576 | */ |
577 | */ |
577 | if (radeon_connector->use_digital && radeon_connector->shared_ddc) { |
578 | if (radeon_connector->use_digital && radeon_connector->shared_ddc) { |
578 | kfree(radeon_connector->edid); |
579 | kfree(radeon_connector->edid); |
579 | radeon_connector->edid = NULL; |
580 | radeon_connector->edid = NULL; |
580 | ret = connector_status_disconnected; |
581 | ret = connector_status_disconnected; |
581 | } else |
582 | } else |
582 | ret = connector_status_connected; |
583 | ret = connector_status_connected; |
583 | } |
584 | } |
584 | } else { |
585 | } else { |
585 | if (radeon_connector->dac_load_detect) { |
586 | if (radeon_connector->dac_load_detect) { |
586 | encoder_funcs = encoder->helper_private; |
587 | encoder_funcs = encoder->helper_private; |
587 | ret = encoder_funcs->detect(encoder, connector); |
588 | ret = encoder_funcs->detect(encoder, connector); |
588 | } |
589 | } |
589 | } |
590 | } |
590 | 591 | ||
591 | if (ret == connector_status_connected) |
592 | if (ret == connector_status_connected) |
592 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true); |
593 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true); |
593 | radeon_connector_update_scratch_regs(connector, ret); |
594 | radeon_connector_update_scratch_regs(connector, ret); |
594 | return ret; |
595 | return ret; |
595 | } |
596 | } |
596 | 597 | ||
597 | struct drm_connector_helper_funcs radeon_vga_connector_helper_funcs = { |
598 | struct drm_connector_helper_funcs radeon_vga_connector_helper_funcs = { |
598 | .get_modes = radeon_vga_get_modes, |
599 | .get_modes = radeon_vga_get_modes, |
599 | .mode_valid = radeon_vga_mode_valid, |
600 | .mode_valid = radeon_vga_mode_valid, |
600 | .best_encoder = radeon_best_single_encoder, |
601 | .best_encoder = radeon_best_single_encoder, |
601 | }; |
602 | }; |
602 | 603 | ||
603 | struct drm_connector_funcs radeon_vga_connector_funcs = { |
604 | struct drm_connector_funcs radeon_vga_connector_funcs = { |
604 | .dpms = drm_helper_connector_dpms, |
605 | .dpms = drm_helper_connector_dpms, |
605 | .detect = radeon_vga_detect, |
606 | .detect = radeon_vga_detect, |
606 | .fill_modes = drm_helper_probe_single_connector_modes, |
607 | .fill_modes = drm_helper_probe_single_connector_modes, |
607 | .destroy = radeon_connector_destroy, |
608 | .destroy = radeon_connector_destroy, |
608 | .set_property = radeon_connector_set_property, |
609 | .set_property = radeon_connector_set_property, |
609 | }; |
610 | }; |
610 | 611 | ||
611 | static int radeon_tv_get_modes(struct drm_connector *connector) |
612 | static int radeon_tv_get_modes(struct drm_connector *connector) |
612 | { |
613 | { |
613 | struct drm_device *dev = connector->dev; |
614 | struct drm_device *dev = connector->dev; |
614 | struct radeon_device *rdev = dev->dev_private; |
615 | struct radeon_device *rdev = dev->dev_private; |
615 | struct drm_display_mode *tv_mode; |
616 | struct drm_display_mode *tv_mode; |
616 | struct drm_encoder *encoder; |
617 | struct drm_encoder *encoder; |
617 | 618 | ||
618 | encoder = radeon_best_single_encoder(connector); |
619 | encoder = radeon_best_single_encoder(connector); |
619 | if (!encoder) |
620 | if (!encoder) |
620 | return 0; |
621 | return 0; |
621 | 622 | ||
622 | /* avivo chips can scale any mode */ |
623 | /* avivo chips can scale any mode */ |
623 | if (rdev->family >= CHIP_RS600) |
624 | if (rdev->family >= CHIP_RS600) |
624 | /* add scaled modes */ |
625 | /* add scaled modes */ |
625 | radeon_add_common_modes(encoder, connector); |
626 | radeon_add_common_modes(encoder, connector); |
626 | else { |
627 | else { |
627 | /* only 800x600 is supported right now on pre-avivo chips */ |
628 | /* only 800x600 is supported right now on pre-avivo chips */ |
628 | tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false, false); |
629 | tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false, false); |
629 | tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; |
630 | tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; |
630 | drm_mode_probed_add(connector, tv_mode); |
631 | drm_mode_probed_add(connector, tv_mode); |
631 | } |
632 | } |
632 | return 1; |
633 | return 1; |
633 | } |
634 | } |
634 | 635 | ||
635 | static int radeon_tv_mode_valid(struct drm_connector *connector, |
636 | static int radeon_tv_mode_valid(struct drm_connector *connector, |
636 | struct drm_display_mode *mode) |
637 | struct drm_display_mode *mode) |
637 | { |
638 | { |
638 | if ((mode->hdisplay > 1024) || (mode->vdisplay > 768)) |
639 | if ((mode->hdisplay > 1024) || (mode->vdisplay > 768)) |
639 | return MODE_CLOCK_RANGE; |
640 | return MODE_CLOCK_RANGE; |
640 | return MODE_OK; |
641 | return MODE_OK; |
641 | } |
642 | } |
642 | 643 | ||
643 | static enum drm_connector_status radeon_tv_detect(struct drm_connector *connector) |
644 | static enum drm_connector_status radeon_tv_detect(struct drm_connector *connector) |
644 | { |
645 | { |
645 | struct drm_encoder *encoder; |
646 | struct drm_encoder *encoder; |
646 | struct drm_encoder_helper_funcs *encoder_funcs; |
647 | struct drm_encoder_helper_funcs *encoder_funcs; |
647 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
648 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
648 | enum drm_connector_status ret = connector_status_disconnected; |
649 | enum drm_connector_status ret = connector_status_disconnected; |
649 | 650 | ||
650 | if (!radeon_connector->dac_load_detect) |
651 | if (!radeon_connector->dac_load_detect) |
651 | return ret; |
652 | return ret; |
652 | 653 | ||
653 | encoder = radeon_best_single_encoder(connector); |
654 | encoder = radeon_best_single_encoder(connector); |
654 | if (!encoder) |
655 | if (!encoder) |
655 | ret = connector_status_disconnected; |
656 | ret = connector_status_disconnected; |
656 | else { |
657 | else { |
657 | encoder_funcs = encoder->helper_private; |
658 | encoder_funcs = encoder->helper_private; |
658 | ret = encoder_funcs->detect(encoder, connector); |
659 | ret = encoder_funcs->detect(encoder, connector); |
659 | } |
660 | } |
660 | if (ret == connector_status_connected) |
661 | if (ret == connector_status_connected) |
661 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false); |
662 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false); |
662 | radeon_connector_update_scratch_regs(connector, ret); |
663 | radeon_connector_update_scratch_regs(connector, ret); |
663 | return ret; |
664 | return ret; |
664 | } |
665 | } |
665 | 666 | ||
666 | struct drm_connector_helper_funcs radeon_tv_connector_helper_funcs = { |
667 | struct drm_connector_helper_funcs radeon_tv_connector_helper_funcs = { |
667 | .get_modes = radeon_tv_get_modes, |
668 | .get_modes = radeon_tv_get_modes, |
668 | .mode_valid = radeon_tv_mode_valid, |
669 | .mode_valid = radeon_tv_mode_valid, |
669 | .best_encoder = radeon_best_single_encoder, |
670 | .best_encoder = radeon_best_single_encoder, |
670 | }; |
671 | }; |
671 | 672 | ||
672 | struct drm_connector_funcs radeon_tv_connector_funcs = { |
673 | struct drm_connector_funcs radeon_tv_connector_funcs = { |
673 | .dpms = drm_helper_connector_dpms, |
674 | .dpms = drm_helper_connector_dpms, |
674 | .detect = radeon_tv_detect, |
675 | .detect = radeon_tv_detect, |
675 | .fill_modes = drm_helper_probe_single_connector_modes, |
676 | .fill_modes = drm_helper_probe_single_connector_modes, |
676 | .destroy = radeon_connector_destroy, |
677 | .destroy = radeon_connector_destroy, |
677 | .set_property = radeon_connector_set_property, |
678 | .set_property = radeon_connector_set_property, |
678 | }; |
679 | }; |
679 | 680 | ||
680 | static int radeon_dvi_get_modes(struct drm_connector *connector) |
681 | static int radeon_dvi_get_modes(struct drm_connector *connector) |
681 | { |
682 | { |
682 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
683 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
683 | int ret; |
684 | int ret; |
684 | 685 | ||
685 | ret = radeon_ddc_get_modes(radeon_connector); |
686 | ret = radeon_ddc_get_modes(radeon_connector); |
686 | return ret; |
687 | return ret; |
687 | } |
688 | } |
688 | 689 | ||
689 | /* |
690 | /* |
690 | * DVI is complicated |
691 | * DVI is complicated |
691 | * Do a DDC probe, if DDC probe passes, get the full EDID so |
692 | * Do a DDC probe, if DDC probe passes, get the full EDID so |
692 | * we can do analog/digital monitor detection at this point. |
693 | * we can do analog/digital monitor detection at this point. |
693 | * If the monitor is an analog monitor or we got no DDC, |
694 | * If the monitor is an analog monitor or we got no DDC, |
694 | * we need to find the DAC encoder object for this connector. |
695 | * we need to find the DAC encoder object for this connector. |
695 | * If we got no DDC, we do load detection on the DAC encoder object. |
696 | * If we got no DDC, we do load detection on the DAC encoder object. |
696 | * If we got analog DDC or load detection passes on the DAC encoder |
697 | * If we got analog DDC or load detection passes on the DAC encoder |
697 | * we have to check if this analog encoder is shared with anyone else (TV) |
698 | * we have to check if this analog encoder is shared with anyone else (TV) |
698 | * if its shared we have to set the other connector to disconnected. |
699 | * if its shared we have to set the other connector to disconnected. |
699 | */ |
700 | */ |
700 | static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connector) |
701 | static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connector) |
701 | { |
702 | { |
702 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
703 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
703 | struct drm_encoder *encoder = NULL; |
704 | struct drm_encoder *encoder = NULL; |
704 | struct drm_encoder_helper_funcs *encoder_funcs; |
705 | struct drm_encoder_helper_funcs *encoder_funcs; |
705 | struct drm_mode_object *obj; |
706 | struct drm_mode_object *obj; |
706 | int i; |
707 | int i; |
707 | enum drm_connector_status ret = connector_status_disconnected; |
708 | enum drm_connector_status ret = connector_status_disconnected; |
708 | bool dret; |
709 | bool dret; |
709 | 710 | ||
710 | radeon_i2c_do_lock(radeon_connector, 1); |
711 | radeon_i2c_do_lock(radeon_connector, 1); |
711 | dret = radeon_ddc_probe(radeon_connector); |
712 | dret = radeon_ddc_probe(radeon_connector); |
712 | radeon_i2c_do_lock(radeon_connector, 0); |
713 | radeon_i2c_do_lock(radeon_connector, 0); |
713 | if (dret) { |
714 | if (dret) { |
714 | if (radeon_connector->edid) { |
715 | if (radeon_connector->edid) { |
715 | kfree(radeon_connector->edid); |
716 | kfree(radeon_connector->edid); |
716 | radeon_connector->edid = NULL; |
717 | radeon_connector->edid = NULL; |
717 | } |
718 | } |
718 | radeon_i2c_do_lock(radeon_connector, 1); |
719 | radeon_i2c_do_lock(radeon_connector, 1); |
719 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter); |
720 | radeon_connector->edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter); |
720 | radeon_i2c_do_lock(radeon_connector, 0); |
721 | radeon_i2c_do_lock(radeon_connector, 0); |
721 | 722 | ||
722 | if (!radeon_connector->edid) { |
723 | if (!radeon_connector->edid) { |
723 | DRM_ERROR("DDC responded but not EDID found for %s\n", |
724 | DRM_ERROR("%s: probed a monitor but no|invalid EDID\n", |
724 | drm_get_connector_name(connector)); |
725 | drm_get_connector_name(connector)); |
725 | } else { |
726 | } else { |
726 | radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
727 | radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
727 | 728 | ||
728 | /* some oems have boards with separate digital and analog connectors |
729 | /* some oems have boards with separate digital and analog connectors |
729 | * with a shared ddc line (often vga + hdmi) |
730 | * with a shared ddc line (often vga + hdmi) |
730 | */ |
731 | */ |
731 | if ((!radeon_connector->use_digital) && radeon_connector->shared_ddc) { |
732 | if ((!radeon_connector->use_digital) && radeon_connector->shared_ddc) { |
732 | kfree(radeon_connector->edid); |
733 | kfree(radeon_connector->edid); |
733 | radeon_connector->edid = NULL; |
734 | radeon_connector->edid = NULL; |
734 | ret = connector_status_disconnected; |
735 | ret = connector_status_disconnected; |
735 | } else |
736 | } else |
736 | ret = connector_status_connected; |
737 | ret = connector_status_connected; |
737 | } |
738 | } |
738 | } |
739 | } |
739 | 740 | ||
740 | if ((ret == connector_status_connected) && (radeon_connector->use_digital == true)) |
741 | if ((ret == connector_status_connected) && (radeon_connector->use_digital == true)) |
741 | goto out; |
742 | goto out; |
742 | 743 | ||
743 | /* find analog encoder */ |
744 | /* find analog encoder */ |
744 | if (radeon_connector->dac_load_detect) { |
745 | if (radeon_connector->dac_load_detect) { |
745 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
746 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
746 | if (connector->encoder_ids[i] == 0) |
747 | if (connector->encoder_ids[i] == 0) |
747 | break; |
748 | break; |
748 | 749 | ||
749 | obj = drm_mode_object_find(connector->dev, |
750 | obj = drm_mode_object_find(connector->dev, |
750 | connector->encoder_ids[i], |
751 | connector->encoder_ids[i], |
751 | DRM_MODE_OBJECT_ENCODER); |
752 | DRM_MODE_OBJECT_ENCODER); |
752 | if (!obj) |
753 | if (!obj) |
753 | continue; |
754 | continue; |
754 | 755 | ||
755 | encoder = obj_to_encoder(obj); |
756 | encoder = obj_to_encoder(obj); |
756 | 757 | ||
757 | encoder_funcs = encoder->helper_private; |
758 | encoder_funcs = encoder->helper_private; |
758 | if (encoder_funcs->detect) { |
759 | if (encoder_funcs->detect) { |
759 | if (ret != connector_status_connected) { |
760 | if (ret != connector_status_connected) { |
760 | ret = encoder_funcs->detect(encoder, connector); |
761 | ret = encoder_funcs->detect(encoder, connector); |
761 | if (ret == connector_status_connected) { |
762 | if (ret == connector_status_connected) { |
762 | radeon_connector->use_digital = false; |
763 | radeon_connector->use_digital = false; |
763 | } |
764 | } |
764 | } |
765 | } |
765 | break; |
766 | break; |
766 | } |
767 | } |
767 | } |
768 | } |
768 | } |
769 | } |
769 | 770 | ||
770 | if ((ret == connector_status_connected) && (radeon_connector->use_digital == false) && |
771 | if ((ret == connector_status_connected) && (radeon_connector->use_digital == false) && |
771 | encoder) { |
772 | encoder) { |
772 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true); |
773 | ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true); |
773 | } |
774 | } |
774 | 775 | ||
775 | out: |
776 | out: |
776 | /* updated in get modes as well since we need to know if it's analog or digital */ |
777 | /* updated in get modes as well since we need to know if it's analog or digital */ |
777 | radeon_connector_update_scratch_regs(connector, ret); |
778 | radeon_connector_update_scratch_regs(connector, ret); |
778 | return ret; |
779 | return ret; |
779 | } |
780 | } |
780 | 781 | ||
781 | /* okay need to be smart in here about which encoder to pick */ |
782 | /* okay need to be smart in here about which encoder to pick */ |
782 | struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector) |
783 | struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector) |
783 | { |
784 | { |
784 | int enc_id = connector->encoder_ids[0]; |
785 | int enc_id = connector->encoder_ids[0]; |
785 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
786 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
786 | struct drm_mode_object *obj; |
787 | struct drm_mode_object *obj; |
787 | struct drm_encoder *encoder; |
788 | struct drm_encoder *encoder; |
788 | int i; |
789 | int i; |
789 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
790 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
790 | if (connector->encoder_ids[i] == 0) |
791 | if (connector->encoder_ids[i] == 0) |
791 | break; |
792 | break; |
792 | 793 | ||
793 | obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER); |
794 | obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER); |
794 | if (!obj) |
795 | if (!obj) |
795 | continue; |
796 | continue; |
796 | 797 | ||
797 | encoder = obj_to_encoder(obj); |
798 | encoder = obj_to_encoder(obj); |
798 | 799 | ||
799 | if (radeon_connector->use_digital == true) { |
800 | if (radeon_connector->use_digital == true) { |
800 | if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS) |
801 | if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS) |
801 | return encoder; |
802 | return encoder; |
802 | } else { |
803 | } else { |
803 | if (encoder->encoder_type == DRM_MODE_ENCODER_DAC || |
804 | if (encoder->encoder_type == DRM_MODE_ENCODER_DAC || |
804 | encoder->encoder_type == DRM_MODE_ENCODER_TVDAC) |
805 | encoder->encoder_type == DRM_MODE_ENCODER_TVDAC) |
805 | return encoder; |
806 | return encoder; |
806 | } |
807 | } |
807 | } |
808 | } |
808 | 809 | ||
809 | /* see if we have a default encoder TODO */ |
810 | /* see if we have a default encoder TODO */ |
810 | 811 | ||
811 | /* then check use digitial */ |
812 | /* then check use digitial */ |
812 | /* pick the first one */ |
813 | /* pick the first one */ |
813 | if (enc_id) { |
814 | if (enc_id) { |
814 | obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); |
815 | obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); |
815 | if (!obj) |
816 | if (!obj) |
816 | return NULL; |
817 | return NULL; |
817 | encoder = obj_to_encoder(obj); |
818 | encoder = obj_to_encoder(obj); |
818 | return encoder; |
819 | return encoder; |
819 | } |
820 | } |
820 | return NULL; |
821 | return NULL; |
821 | } |
822 | } |
822 | 823 | ||
823 | static void radeon_dvi_force(struct drm_connector *connector) |
824 | static void radeon_dvi_force(struct drm_connector *connector) |
824 | { |
825 | { |
825 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
826 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
826 | if (connector->force == DRM_FORCE_ON) |
827 | if (connector->force == DRM_FORCE_ON) |
827 | radeon_connector->use_digital = false; |
828 | radeon_connector->use_digital = false; |
828 | if (connector->force == DRM_FORCE_ON_DIGITAL) |
829 | if (connector->force == DRM_FORCE_ON_DIGITAL) |
829 | radeon_connector->use_digital = true; |
830 | radeon_connector->use_digital = true; |
830 | } |
831 | } |
831 | 832 | ||
832 | static int radeon_dvi_mode_valid(struct drm_connector *connector, |
833 | static int radeon_dvi_mode_valid(struct drm_connector *connector, |
833 | struct drm_display_mode *mode) |
834 | struct drm_display_mode *mode) |
834 | { |
835 | { |
835 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
836 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
836 | 837 | ||
837 | /* XXX check mode bandwidth */ |
838 | /* XXX check mode bandwidth */ |
838 | 839 | ||
839 | if (radeon_connector->use_digital && (mode->clock > 165000)) { |
840 | if (radeon_connector->use_digital && (mode->clock > 165000)) { |
840 | if ((radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I) || |
841 | if ((radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I) || |
841 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || |
842 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || |
842 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) |
843 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) |
843 | return MODE_OK; |
844 | return MODE_OK; |
844 | else |
845 | else |
845 | return MODE_CLOCK_HIGH; |
846 | return MODE_CLOCK_HIGH; |
846 | } |
847 | } |
847 | return MODE_OK; |
848 | return MODE_OK; |
848 | } |
849 | } |
849 | 850 | ||
850 | struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = { |
851 | struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = { |
851 | .get_modes = radeon_dvi_get_modes, |
852 | .get_modes = radeon_dvi_get_modes, |
852 | .mode_valid = radeon_dvi_mode_valid, |
853 | .mode_valid = radeon_dvi_mode_valid, |
853 | .best_encoder = radeon_dvi_encoder, |
854 | .best_encoder = radeon_dvi_encoder, |
854 | }; |
855 | }; |
855 | 856 | ||
856 | struct drm_connector_funcs radeon_dvi_connector_funcs = { |
857 | struct drm_connector_funcs radeon_dvi_connector_funcs = { |
857 | .dpms = drm_helper_connector_dpms, |
858 | .dpms = drm_helper_connector_dpms, |
858 | .detect = radeon_dvi_detect, |
859 | .detect = radeon_dvi_detect, |
859 | .fill_modes = drm_helper_probe_single_connector_modes, |
860 | .fill_modes = drm_helper_probe_single_connector_modes, |
860 | .set_property = radeon_connector_set_property, |
861 | .set_property = radeon_connector_set_property, |
861 | .destroy = radeon_connector_destroy, |
862 | .destroy = radeon_connector_destroy, |
862 | .force = radeon_dvi_force, |
863 | .force = radeon_dvi_force, |
863 | }; |
864 | }; |
864 | 865 | ||
865 | void |
866 | void |
866 | radeon_add_atom_connector(struct drm_device *dev, |
867 | radeon_add_atom_connector(struct drm_device *dev, |
867 | uint32_t connector_id, |
868 | uint32_t connector_id, |
868 | uint32_t supported_device, |
869 | uint32_t supported_device, |
869 | int connector_type, |
870 | int connector_type, |
870 | struct radeon_i2c_bus_rec *i2c_bus, |
871 | struct radeon_i2c_bus_rec *i2c_bus, |
871 | bool linkb, |
872 | bool linkb, |
872 | uint32_t igp_lane_info, |
873 | uint32_t igp_lane_info, |
873 | uint16_t connector_object_id) |
874 | uint16_t connector_object_id) |
874 | { |
875 | { |
875 | struct radeon_device *rdev = dev->dev_private; |
876 | struct radeon_device *rdev = dev->dev_private; |
876 | struct drm_connector *connector; |
877 | struct drm_connector *connector; |
877 | struct radeon_connector *radeon_connector; |
878 | struct radeon_connector *radeon_connector; |
878 | struct radeon_connector_atom_dig *radeon_dig_connector; |
879 | struct radeon_connector_atom_dig *radeon_dig_connector; |
879 | uint32_t subpixel_order = SubPixelNone; |
880 | uint32_t subpixel_order = SubPixelNone; |
880 | bool shared_ddc = false; |
881 | bool shared_ddc = false; |
881 | int ret; |
882 | int ret; |
882 | 883 | ||
883 | /* fixme - tv/cv/din */ |
884 | /* fixme - tv/cv/din */ |
884 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
885 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
885 | return; |
886 | return; |
886 | 887 | ||
887 | /* see if we already added it */ |
888 | /* see if we already added it */ |
888 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
889 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
889 | radeon_connector = to_radeon_connector(connector); |
890 | radeon_connector = to_radeon_connector(connector); |
890 | if (radeon_connector->connector_id == connector_id) { |
891 | if (radeon_connector->connector_id == connector_id) { |
891 | radeon_connector->devices |= supported_device; |
892 | radeon_connector->devices |= supported_device; |
892 | return; |
893 | return; |
893 | } |
894 | } |
894 | if (radeon_connector->ddc_bus && i2c_bus->valid) { |
895 | if (radeon_connector->ddc_bus && i2c_bus->valid) { |
895 | if (memcmp(&radeon_connector->ddc_bus->rec, i2c_bus, |
896 | if (memcmp(&radeon_connector->ddc_bus->rec, i2c_bus, |
896 | sizeof(struct radeon_i2c_bus_rec)) == 0) { |
897 | sizeof(struct radeon_i2c_bus_rec)) == 0) { |
897 | radeon_connector->shared_ddc = true; |
898 | radeon_connector->shared_ddc = true; |
898 | shared_ddc = true; |
899 | shared_ddc = true; |
899 | } |
900 | } |
900 | } |
901 | } |
901 | } |
902 | } |
902 | 903 | ||
903 | radeon_connector = kzalloc(sizeof(struct radeon_connector), GFP_KERNEL); |
904 | radeon_connector = kzalloc(sizeof(struct radeon_connector), GFP_KERNEL); |
904 | if (!radeon_connector) |
905 | if (!radeon_connector) |
905 | return; |
906 | return; |
906 | 907 | ||
907 | connector = &radeon_connector->base; |
908 | connector = &radeon_connector->base; |
908 | 909 | ||
909 | radeon_connector->connector_id = connector_id; |
910 | radeon_connector->connector_id = connector_id; |
910 | radeon_connector->devices = supported_device; |
911 | radeon_connector->devices = supported_device; |
911 | radeon_connector->shared_ddc = shared_ddc; |
912 | radeon_connector->shared_ddc = shared_ddc; |
912 | radeon_connector->connector_object_id = connector_object_id; |
913 | radeon_connector->connector_object_id = connector_object_id; |
913 | switch (connector_type) { |
914 | switch (connector_type) { |
914 | case DRM_MODE_CONNECTOR_VGA: |
915 | case DRM_MODE_CONNECTOR_VGA: |
915 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
916 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
916 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
917 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
917 | if (ret) |
918 | if (ret) |
918 | goto failed; |
919 | goto failed; |
919 | if (i2c_bus->valid) { |
920 | if (i2c_bus->valid) { |
920 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "VGA"); |
921 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "VGA"); |
921 | if (!radeon_connector->ddc_bus) |
922 | if (!radeon_connector->ddc_bus) |
922 | goto failed; |
923 | goto failed; |
923 | } |
924 | } |
924 | radeon_connector->dac_load_detect = true; |
925 | radeon_connector->dac_load_detect = true; |
925 | drm_connector_attach_property(&radeon_connector->base, |
926 | drm_connector_attach_property(&radeon_connector->base, |
926 | rdev->mode_info.load_detect_property, |
927 | rdev->mode_info.load_detect_property, |
927 | 1); |
928 | 1); |
928 | break; |
929 | break; |
929 | case DRM_MODE_CONNECTOR_DVIA: |
930 | case DRM_MODE_CONNECTOR_DVIA: |
930 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
931 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
931 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
932 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
932 | if (ret) |
933 | if (ret) |
933 | goto failed; |
934 | goto failed; |
934 | if (i2c_bus->valid) { |
935 | if (i2c_bus->valid) { |
935 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
936 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
936 | if (!radeon_connector->ddc_bus) |
937 | if (!radeon_connector->ddc_bus) |
937 | goto failed; |
938 | goto failed; |
938 | } |
939 | } |
939 | radeon_connector->dac_load_detect = true; |
940 | radeon_connector->dac_load_detect = true; |
940 | drm_connector_attach_property(&radeon_connector->base, |
941 | drm_connector_attach_property(&radeon_connector->base, |
941 | rdev->mode_info.load_detect_property, |
942 | rdev->mode_info.load_detect_property, |
942 | 1); |
943 | 1); |
943 | break; |
944 | break; |
944 | case DRM_MODE_CONNECTOR_DVII: |
945 | case DRM_MODE_CONNECTOR_DVII: |
945 | case DRM_MODE_CONNECTOR_DVID: |
946 | case DRM_MODE_CONNECTOR_DVID: |
946 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
947 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
947 | if (!radeon_dig_connector) |
948 | if (!radeon_dig_connector) |
948 | goto failed; |
949 | goto failed; |
949 | radeon_dig_connector->linkb = linkb; |
950 | radeon_dig_connector->linkb = linkb; |
950 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
951 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
951 | radeon_connector->con_priv = radeon_dig_connector; |
952 | radeon_connector->con_priv = radeon_dig_connector; |
952 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
953 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
953 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
954 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
954 | if (ret) |
955 | if (ret) |
955 | goto failed; |
956 | goto failed; |
956 | if (i2c_bus->valid) { |
957 | if (i2c_bus->valid) { |
957 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
958 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
958 | if (!radeon_connector->ddc_bus) |
959 | if (!radeon_connector->ddc_bus) |
959 | goto failed; |
960 | goto failed; |
960 | } |
961 | } |
961 | subpixel_order = SubPixelHorizontalRGB; |
962 | subpixel_order = SubPixelHorizontalRGB; |
962 | drm_connector_attach_property(&radeon_connector->base, |
963 | drm_connector_attach_property(&radeon_connector->base, |
963 | rdev->mode_info.coherent_mode_property, |
964 | rdev->mode_info.coherent_mode_property, |
964 | 1); |
965 | 1); |
965 | radeon_connector->dac_load_detect = true; |
966 | radeon_connector->dac_load_detect = true; |
966 | drm_connector_attach_property(&radeon_connector->base, |
967 | drm_connector_attach_property(&radeon_connector->base, |
967 | rdev->mode_info.load_detect_property, |
968 | rdev->mode_info.load_detect_property, |
968 | 1); |
969 | 1); |
969 | break; |
970 | break; |
970 | case DRM_MODE_CONNECTOR_HDMIA: |
971 | case DRM_MODE_CONNECTOR_HDMIA: |
971 | case DRM_MODE_CONNECTOR_HDMIB: |
972 | case DRM_MODE_CONNECTOR_HDMIB: |
972 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
973 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
973 | if (!radeon_dig_connector) |
974 | if (!radeon_dig_connector) |
974 | goto failed; |
975 | goto failed; |
975 | radeon_dig_connector->linkb = linkb; |
976 | radeon_dig_connector->linkb = linkb; |
976 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
977 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
977 | radeon_connector->con_priv = radeon_dig_connector; |
978 | radeon_connector->con_priv = radeon_dig_connector; |
978 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
979 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
979 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
980 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
980 | if (ret) |
981 | if (ret) |
981 | goto failed; |
982 | goto failed; |
982 | if (i2c_bus->valid) { |
983 | if (i2c_bus->valid) { |
983 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "HDMI"); |
984 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "HDMI"); |
984 | if (!radeon_connector->ddc_bus) |
985 | if (!radeon_connector->ddc_bus) |
985 | goto failed; |
986 | goto failed; |
986 | } |
987 | } |
987 | drm_connector_attach_property(&radeon_connector->base, |
988 | drm_connector_attach_property(&radeon_connector->base, |
988 | rdev->mode_info.coherent_mode_property, |
989 | rdev->mode_info.coherent_mode_property, |
989 | 1); |
990 | 1); |
990 | subpixel_order = SubPixelHorizontalRGB; |
991 | subpixel_order = SubPixelHorizontalRGB; |
991 | break; |
992 | break; |
992 | case DRM_MODE_CONNECTOR_DisplayPort: |
993 | case DRM_MODE_CONNECTOR_DisplayPort: |
993 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
994 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
994 | if (!radeon_dig_connector) |
995 | if (!radeon_dig_connector) |
995 | goto failed; |
996 | goto failed; |
996 | radeon_dig_connector->linkb = linkb; |
997 | radeon_dig_connector->linkb = linkb; |
997 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
998 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
998 | radeon_connector->con_priv = radeon_dig_connector; |
999 | radeon_connector->con_priv = radeon_dig_connector; |
999 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
1000 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
1000 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
1001 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
1001 | if (ret) |
1002 | if (ret) |
1002 | goto failed; |
1003 | goto failed; |
1003 | if (i2c_bus->valid) { |
1004 | if (i2c_bus->valid) { |
1004 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP"); |
1005 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP"); |
1005 | if (!radeon_connector->ddc_bus) |
1006 | if (!radeon_connector->ddc_bus) |
1006 | goto failed; |
1007 | goto failed; |
1007 | } |
1008 | } |
1008 | subpixel_order = SubPixelHorizontalRGB; |
1009 | subpixel_order = SubPixelHorizontalRGB; |
1009 | break; |
1010 | break; |
1010 | case DRM_MODE_CONNECTOR_SVIDEO: |
1011 | case DRM_MODE_CONNECTOR_SVIDEO: |
1011 | case DRM_MODE_CONNECTOR_Composite: |
1012 | case DRM_MODE_CONNECTOR_Composite: |
1012 | case DRM_MODE_CONNECTOR_9PinDIN: |
1013 | case DRM_MODE_CONNECTOR_9PinDIN: |
1013 | if (radeon_tv == 1) { |
1014 | if (radeon_tv == 1) { |
1014 | drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); |
1015 | drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); |
1015 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); |
1016 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); |
1016 | if (ret) |
1017 | if (ret) |
1017 | goto failed; |
1018 | goto failed; |
1018 | radeon_connector->dac_load_detect = true; |
1019 | radeon_connector->dac_load_detect = true; |
1019 | drm_connector_attach_property(&radeon_connector->base, |
1020 | drm_connector_attach_property(&radeon_connector->base, |
1020 | rdev->mode_info.load_detect_property, |
1021 | rdev->mode_info.load_detect_property, |
1021 | 1); |
1022 | 1); |
1022 | } |
1023 | } |
1023 | break; |
1024 | break; |
1024 | case DRM_MODE_CONNECTOR_LVDS: |
1025 | case DRM_MODE_CONNECTOR_LVDS: |
1025 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
1026 | radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL); |
1026 | if (!radeon_dig_connector) |
1027 | if (!radeon_dig_connector) |
1027 | goto failed; |
1028 | goto failed; |
1028 | radeon_dig_connector->linkb = linkb; |
1029 | radeon_dig_connector->linkb = linkb; |
1029 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
1030 | radeon_dig_connector->igp_lane_info = igp_lane_info; |
1030 | radeon_connector->con_priv = radeon_dig_connector; |
1031 | radeon_connector->con_priv = radeon_dig_connector; |
1031 | drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); |
1032 | drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); |
1032 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); |
1033 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); |
1033 | if (ret) |
1034 | if (ret) |
1034 | goto failed; |
1035 | goto failed; |
1035 | if (i2c_bus->valid) { |
1036 | if (i2c_bus->valid) { |
1036 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "LVDS"); |
1037 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "LVDS"); |
1037 | if (!radeon_connector->ddc_bus) |
1038 | if (!radeon_connector->ddc_bus) |
1038 | goto failed; |
1039 | goto failed; |
1039 | } |
1040 | } |
1040 | drm_mode_create_scaling_mode_property(dev); |
1041 | drm_mode_create_scaling_mode_property(dev); |
1041 | drm_connector_attach_property(&radeon_connector->base, |
1042 | drm_connector_attach_property(&radeon_connector->base, |
1042 | dev->mode_config.scaling_mode_property, |
1043 | dev->mode_config.scaling_mode_property, |
1043 | DRM_MODE_SCALE_FULLSCREEN); |
1044 | DRM_MODE_SCALE_FULLSCREEN); |
1044 | subpixel_order = SubPixelHorizontalRGB; |
1045 | subpixel_order = SubPixelHorizontalRGB; |
1045 | break; |
1046 | break; |
1046 | } |
1047 | } |
1047 | 1048 | ||
1048 | connector->display_info.subpixel_order = subpixel_order; |
1049 | connector->display_info.subpixel_order = subpixel_order; |
1049 | drm_sysfs_connector_add(connector); |
1050 | drm_sysfs_connector_add(connector); |
1050 | return; |
1051 | return; |
1051 | 1052 | ||
1052 | failed: |
1053 | failed: |
1053 | if (radeon_connector->ddc_bus) |
1054 | if (radeon_connector->ddc_bus) |
1054 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
1055 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
1055 | drm_connector_cleanup(connector); |
1056 | drm_connector_cleanup(connector); |
1056 | kfree(connector); |
1057 | kfree(connector); |
1057 | } |
1058 | } |
1058 | 1059 | ||
1059 | void |
1060 | void |
1060 | radeon_add_legacy_connector(struct drm_device *dev, |
1061 | radeon_add_legacy_connector(struct drm_device *dev, |
1061 | uint32_t connector_id, |
1062 | uint32_t connector_id, |
1062 | uint32_t supported_device, |
1063 | uint32_t supported_device, |
1063 | int connector_type, |
1064 | int connector_type, |
1064 | struct radeon_i2c_bus_rec *i2c_bus, |
1065 | struct radeon_i2c_bus_rec *i2c_bus, |
1065 | uint16_t connector_object_id) |
1066 | uint16_t connector_object_id) |
1066 | { |
1067 | { |
1067 | struct radeon_device *rdev = dev->dev_private; |
1068 | struct radeon_device *rdev = dev->dev_private; |
1068 | struct drm_connector *connector; |
1069 | struct drm_connector *connector; |
1069 | struct radeon_connector *radeon_connector; |
1070 | struct radeon_connector *radeon_connector; |
1070 | uint32_t subpixel_order = SubPixelNone; |
1071 | uint32_t subpixel_order = SubPixelNone; |
1071 | int ret; |
1072 | int ret; |
1072 | - | ||
1073 | ENTER(); |
- | |
1074 | - | ||
1075 | dbgprintf("id %d device %x type %x i2c %x\n", |
- | |
1076 | connector_id, supported_device, connector_type, i2c_bus); |
1073 | |
1077 | /* fixme - tv/cv/din */ |
1074 | /* fixme - tv/cv/din */ |
1078 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
1075 | if (connector_type == DRM_MODE_CONNECTOR_Unknown) |
1079 | return; |
1076 | return; |
1080 | 1077 | ||
1081 | /* see if we already added it */ |
1078 | /* see if we already added it */ |
1082 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
1079 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
1083 | radeon_connector = to_radeon_connector(connector); |
1080 | radeon_connector = to_radeon_connector(connector); |
1084 | if (radeon_connector->connector_id == connector_id) { |
1081 | if (radeon_connector->connector_id == connector_id) { |
1085 | radeon_connector->devices |= supported_device; |
1082 | radeon_connector->devices |= supported_device; |
1086 | LEAVE(); |
- | |
1087 | return; |
1083 | return; |
1088 | } |
1084 | } |
1089 | } |
1085 | } |
1090 | 1086 | ||
1091 | radeon_connector = kzalloc(sizeof(struct radeon_connector), GFP_KERNEL); |
1087 | radeon_connector = kzalloc(sizeof(struct radeon_connector), GFP_KERNEL); |
1092 | if (!radeon_connector) |
1088 | if (!radeon_connector) |
1093 | return; |
1089 | return; |
1094 | 1090 | ||
1095 | connector = &radeon_connector->base; |
1091 | connector = &radeon_connector->base; |
1096 | 1092 | ||
1097 | radeon_connector->connector_id = connector_id; |
1093 | radeon_connector->connector_id = connector_id; |
1098 | radeon_connector->devices = supported_device; |
1094 | radeon_connector->devices = supported_device; |
1099 | radeon_connector->connector_object_id = connector_object_id; |
1095 | radeon_connector->connector_object_id = connector_object_id; |
1100 | switch (connector_type) { |
1096 | switch (connector_type) { |
1101 | case DRM_MODE_CONNECTOR_VGA: |
1097 | case DRM_MODE_CONNECTOR_VGA: |
1102 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
1098 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
1103 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
1099 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
1104 | if (ret) |
1100 | if (ret) |
1105 | goto failed; |
1101 | goto failed; |
1106 | if (i2c_bus->valid) { |
1102 | if (i2c_bus->valid) { |
1107 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "VGA"); |
1103 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "VGA"); |
1108 | if (!radeon_connector->ddc_bus) |
1104 | if (!radeon_connector->ddc_bus) |
1109 | goto failed; |
1105 | goto failed; |
1110 | } |
1106 | } |
1111 | radeon_connector->dac_load_detect = true; |
1107 | radeon_connector->dac_load_detect = true; |
1112 | drm_connector_attach_property(&radeon_connector->base, |
1108 | drm_connector_attach_property(&radeon_connector->base, |
1113 | rdev->mode_info.load_detect_property, |
1109 | rdev->mode_info.load_detect_property, |
1114 | 1); |
1110 | 1); |
1115 | break; |
1111 | break; |
1116 | case DRM_MODE_CONNECTOR_DVIA: |
1112 | case DRM_MODE_CONNECTOR_DVIA: |
1117 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
1113 | drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); |
1118 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
1114 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); |
1119 | if (ret) |
1115 | if (ret) |
1120 | goto failed; |
1116 | goto failed; |
1121 | if (i2c_bus->valid) { |
1117 | if (i2c_bus->valid) { |
1122 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
1118 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
1123 | if (!radeon_connector->ddc_bus) |
1119 | if (!radeon_connector->ddc_bus) |
1124 | goto failed; |
1120 | goto failed; |
1125 | } |
1121 | } |
1126 | radeon_connector->dac_load_detect = true; |
1122 | radeon_connector->dac_load_detect = true; |
1127 | drm_connector_attach_property(&radeon_connector->base, |
1123 | drm_connector_attach_property(&radeon_connector->base, |
1128 | rdev->mode_info.load_detect_property, |
1124 | rdev->mode_info.load_detect_property, |
1129 | 1); |
1125 | 1); |
1130 | break; |
1126 | break; |
1131 | case DRM_MODE_CONNECTOR_DVII: |
1127 | case DRM_MODE_CONNECTOR_DVII: |
1132 | case DRM_MODE_CONNECTOR_DVID: |
1128 | case DRM_MODE_CONNECTOR_DVID: |
1133 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
1129 | drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); |
1134 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
1130 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); |
1135 | if (ret) |
1131 | if (ret) |
1136 | goto failed; |
1132 | goto failed; |
1137 | if (i2c_bus->valid) { |
1133 | if (i2c_bus->valid) { |
1138 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
1134 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI"); |
1139 | if (!radeon_connector->ddc_bus) |
1135 | if (!radeon_connector->ddc_bus) |
1140 | goto failed; |
1136 | goto failed; |
1141 | radeon_connector->dac_load_detect = true; |
1137 | radeon_connector->dac_load_detect = true; |
1142 | drm_connector_attach_property(&radeon_connector->base, |
1138 | drm_connector_attach_property(&radeon_connector->base, |
1143 | rdev->mode_info.load_detect_property, |
1139 | rdev->mode_info.load_detect_property, |
1144 | 1); |
1140 | 1); |
1145 | } |
1141 | } |
1146 | subpixel_order = SubPixelHorizontalRGB; |
1142 | subpixel_order = SubPixelHorizontalRGB; |
1147 | break; |
1143 | break; |
1148 | case DRM_MODE_CONNECTOR_SVIDEO: |
1144 | case DRM_MODE_CONNECTOR_SVIDEO: |
1149 | case DRM_MODE_CONNECTOR_Composite: |
1145 | case DRM_MODE_CONNECTOR_Composite: |
1150 | case DRM_MODE_CONNECTOR_9PinDIN: |
1146 | case DRM_MODE_CONNECTOR_9PinDIN: |
1151 | if (radeon_tv == 1) { |
1147 | if (radeon_tv == 1) { |
1152 | drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); |
1148 | drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); |
1153 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); |
1149 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); |
1154 | if (ret) |
1150 | if (ret) |
1155 | goto failed; |
1151 | goto failed; |
1156 | radeon_connector->dac_load_detect = true; |
1152 | radeon_connector->dac_load_detect = true; |
- | 1153 | /* RS400,RC410,RS480 chipset seems to report a lot |
|
- | 1154 | * of false positive on load detect, we haven't yet |
|
- | 1155 | * found a way to make load detect reliable on those |
|
- | 1156 | * chipset, thus just disable it for TV. |
|
- | 1157 | */ |
|
- | 1158 | if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) |
|
- | 1159 | radeon_connector->dac_load_detect = false; |
|
1157 | drm_connector_attach_property(&radeon_connector->base, |
1160 | drm_connector_attach_property(&radeon_connector->base, |
1158 | rdev->mode_info.load_detect_property, |
1161 | rdev->mode_info.load_detect_property, |
1159 | 1); |
1162 | 1); |
1160 | } |
1163 | } |
1161 | break; |
1164 | break; |
1162 | case DRM_MODE_CONNECTOR_LVDS: |
1165 | case DRM_MODE_CONNECTOR_LVDS: |
1163 | drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); |
1166 | drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); |
1164 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); |
1167 | ret = drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); |
1165 | if (ret) |
1168 | if (ret) |
1166 | goto failed; |
1169 | goto failed; |
1167 | if (i2c_bus->valid) { |
1170 | if (i2c_bus->valid) { |
1168 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "LVDS"); |
1171 | radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "LVDS"); |
1169 | if (!radeon_connector->ddc_bus) |
1172 | if (!radeon_connector->ddc_bus) |
1170 | goto failed; |
1173 | goto failed; |
1171 | } |
1174 | } |
1172 | drm_connector_attach_property(&radeon_connector->base, |
1175 | drm_connector_attach_property(&radeon_connector->base, |
1173 | dev->mode_config.scaling_mode_property, |
1176 | dev->mode_config.scaling_mode_property, |
1174 | DRM_MODE_SCALE_FULLSCREEN); |
1177 | DRM_MODE_SCALE_FULLSCREEN); |
1175 | subpixel_order = SubPixelHorizontalRGB; |
1178 | subpixel_order = SubPixelHorizontalRGB; |
1176 | break; |
1179 | break; |
1177 | } |
1180 | } |
1178 | 1181 | ||
1179 | connector->display_info.subpixel_order = subpixel_order; |
1182 | connector->display_info.subpixel_order = subpixel_order; |
1180 | drm_sysfs_connector_add(connector); |
1183 | drm_sysfs_connector_add(connector); |
1181 | LEAVE(); |
- | |
1182 | return; |
1184 | return; |
1183 | 1185 | ||
1184 | failed: |
1186 | failed: |
1185 | if (radeon_connector->ddc_bus) |
1187 | if (radeon_connector->ddc_bus) |
1186 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
1188 | radeon_i2c_destroy(radeon_connector->ddc_bus); |
1187 | drm_connector_cleanup(connector); |
1189 | drm_connector_cleanup(connector); |
1188 | kfree(connector); |
1190 | kfree(connector); |
1189 | LEAVE(); |
- | |
1190 | }>>>>>>>>>> |
1191 | }>>>>>>>>>> |