History

Merge tag 'drm-fixes-for-v4.10-final' of git://people.freedesktop.org/~airlied/linux

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

Linus Torvalds committed 9 years ago

Commit 0722f572 parents 558e8e2 18a0de82 files · +3 −3Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/drm_dp_mst_topology.c +1 −1
  2. drivers/gpu/drm/radeon/radeon_cursor.c +2 −2
drivers/gpu/drm/drm_dp_mst_topology.c+1−1
@@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) · 1816 unmodified lines
18171817 mgr->payloads[i].vcpi = req_payload.vcpi;
18181818 } else if (mgr->payloads[i].num_slots) {
18191819 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]);
18211821 req_payload.payload_state = mgr->payloads[i].payload_state;
18221822 mgr->payloads[i].start_slot = 0;
18231823 }
drivers/gpu/drm/radeon/radeon_cursor.c+2−2
@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) · 204 unmodified lines
205205 }
206206
207207 if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) ||
208− x >= (crtc->x + crtc->mode.crtc_hdisplay) ||
209− y >= (crtc->y + crtc->mode.crtc_vdisplay))
208+ x >= (crtc->x + crtc->mode.hdisplay) ||
209+ y >= (crtc->y + crtc->mode.vdisplay))
210210 goto out_of_bounds;
211211
212212 x += xorigin;