Pull drm fixes from Dave Airlie: "Just two last minute fixes, one for DP MST oopses and one for a radeon regression" * tag 'drm-fixes-for-v4.10-final' of git://people.freedesktop.org/~airlied/linux: drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor drm/dp/mst: fix kernel oops when turning off secondary monitor
Unified · Split
| @@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) · 1816 unmodified lines | |||
| 1817 | mgr->payloads[i].vcpi = req_payload.vcpi; | 1817 | mgr->payloads[i].vcpi = req_payload.vcpi; |
| 1818 | } else if (mgr->payloads[i].num_slots) { | 1818 | } else if (mgr->payloads[i].num_slots) { |
| 1819 | mgr->payloads[i].num_slots = 0; | 1819 | mgr->payloads[i].num_slots = 0; |
| 1820 | drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); | 1820 | drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); |
| 1821 | req_payload.payload_state = mgr->payloads[i].payload_state; | 1821 | req_payload.payload_state = mgr->payloads[i].payload_state; |
| 1822 | mgr->payloads[i].start_slot = 0; | 1822 | mgr->payloads[i].start_slot = 0; |
| 1823 | } | 1823 | } |
| @@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) · 204 unmodified lines | |||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) || | 207 | if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) || |
| 208 | x >= (crtc->x + crtc->mode.crtc_hdisplay) || | 208 | x >= (crtc->x + crtc->mode.hdisplay) || |
| 209 | y >= (crtc->y + crtc->mode.crtc_vdisplay)) | 209 | y >= (crtc->y + crtc->mode.vdisplay)) |
| 210 | goto out_of_bounds; | 210 | goto out_of_bounds; |
| 211 | 211 | ||
| 212 | x += xorigin; | 212 | x += xorigin; |