Rev 6088 | Rev 6937 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6088 | Rev 6935 | ||
---|---|---|---|
Line 106... | Line 106... | ||
106 | { |
106 | { |
107 | struct drm_mode_config *config = &state->dev->mode_config; |
107 | struct drm_mode_config *config = &state->dev->mode_config; |
108 | struct drm_crtc_state *crtc_state; |
108 | struct drm_crtc_state *crtc_state; |
109 | struct drm_connector *connector; |
109 | struct drm_connector *connector; |
110 | struct drm_connector_state *connector_state; |
110 | struct drm_connector_state *connector_state; |
111 | int ret; |
- | |
Line 112... | Line 111... | ||
112 | 111 | ||
113 | /* |
112 | /* |
114 | * We can only steal an encoder coming from a connector, which means we |
113 | * We can only steal an encoder coming from a connector, which means we |
115 | * must already hold the connection_mutex. |
114 | * must already hold the connection_mutex. |
Line 137... | Line 136... | ||
137 | connector_state = drm_atomic_get_connector_state(state, |
136 | connector_state = drm_atomic_get_connector_state(state, |
138 | connector); |
137 | connector); |
139 | if (IS_ERR(connector_state)) |
138 | if (IS_ERR(connector_state)) |
140 | return PTR_ERR(connector_state); |
139 | return PTR_ERR(connector_state); |
Line 141... | Line -... | ||
141 | - | ||
142 | ret = drm_atomic_set_crtc_for_connector(connector_state, NULL); |
- | |
143 | if (ret) |
- | |
144 | return ret; |
140 | |
145 | connector_state->best_encoder = NULL; |
141 | connector_state->best_encoder = NULL; |
Line 146... | Line 142... | ||
146 | } |
142 | } |
147 | 143 | ||
Line 267... | Line 263... | ||
267 | struct drm_crtc *crtc; |
263 | struct drm_crtc *crtc; |
268 | struct drm_crtc_state *crtc_state; |
264 | struct drm_crtc_state *crtc_state; |
269 | struct drm_connector *connector; |
265 | struct drm_connector *connector; |
270 | struct drm_connector_state *conn_state; |
266 | struct drm_connector_state *conn_state; |
271 | int i; |
267 | int i; |
272 | bool ret; |
268 | int ret; |
Line 273... | Line 269... | ||
273 | 269 | ||
274 | for_each_crtc_in_state(state, crtc, crtc_state, i) { |
270 | for_each_crtc_in_state(state, crtc, crtc_state, i) { |
275 | if (!crtc_state->mode_changed && |
271 | if (!crtc_state->mode_changed && |
276 | !crtc_state->connectors_changed) |
272 | !crtc_state->connectors_changed) |