Rev 6937 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6937 | Rev 7144 | ||
|---|---|---|---|
| Line 150... | Line 150... | ||
| 150 | 150 | ||
| 151 | /* Clip all planes to CRTC size, or 0x0 if CRTC is disabled */ |
151 | /* Clip all planes to CRTC size, or 0x0 if CRTC is disabled */ |
| 152 | intel_state->clip.x1 = 0; |
152 | intel_state->clip.x1 = 0; |
| 153 | intel_state->clip.y1 = 0; |
153 | intel_state->clip.y1 = 0; |
| 154 | intel_state->clip.x2 = |
154 | intel_state->clip.x2 = |
| 155 | crtc_state->base.active ? crtc_state->pipe_src_w : 0; |
155 | crtc_state->base.enable ? crtc_state->pipe_src_w : 0; |
| 156 | intel_state->clip.y2 = |
156 | intel_state->clip.y2 = |
| Line 157... | Line 157... | ||
| 157 | crtc_state->base.active ? crtc_state->pipe_src_h : 0; |
157 | crtc_state->base.enable ? crtc_state->pipe_src_h : 0; |
| 158 | 158 | ||
| 159 | if (state->fb && intel_rotation_90_or_270(state->rotation)) { |
159 | if (state->fb && intel_rotation_90_or_270(state->rotation)) { |
| 160 | if (!(state->fb->modifier[0] == I915_FORMAT_MOD_Y_TILED || |
160 | if (!(state->fb->modifier[0] == I915_FORMAT_MOD_Y_TILED || |
| Line 192... | Line 192... | ||
| 192 | struct drm_plane_state *old_state) |
192 | struct drm_plane_state *old_state) |
| 193 | { |
193 | { |
| 194 | struct intel_plane *intel_plane = to_intel_plane(plane); |
194 | struct intel_plane *intel_plane = to_intel_plane(plane); |
| 195 | struct intel_plane_state *intel_state = |
195 | struct intel_plane_state *intel_state = |
| 196 | to_intel_plane_state(plane->state); |
196 | to_intel_plane_state(plane->state); |
| - | 197 | struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc; |
|
| Line -... | Line 198... | ||
| - | 198 | ||
| - | 199 | if (intel_state->visible) |
|
| - | 200 | intel_plane->update_plane(plane, |
|
| - | 201 | to_intel_crtc_state(crtc->state), |
|
| - | 202 | intel_state); |
|
| 197 | 203 | else |
|
| 198 | intel_plane->commit_plane(plane, intel_state); |
204 | intel_plane->disable_plane(plane, crtc); |
| Line 199... | Line 205... | ||
| 199 | } |
205 | } |
| 200 | 206 | ||
| 201 | const struct drm_plane_helper_funcs intel_plane_helper_funcs = { |
207 | const struct drm_plane_helper_funcs intel_plane_helper_funcs = { |