Rev 6296 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6296 | Rev 7144 | ||
---|---|---|---|
Line 18... | Line 18... | ||
18 | crtc->cursor_y = y; |
18 | crtc->cursor_y = y; |
Line 19... | Line 19... | ||
19 | 19 | ||
20 | cursor_state->crtc_x = x; |
20 | cursor_state->crtc_x = x; |
Line 21... | Line 21... | ||
21 | cursor_state->crtc_y = y; |
21 | cursor_state->crtc_y = y; |
22 | 22 | ||
Line 23... | Line 23... | ||
23 | intel_crtc_update_cursor(crtc, 1); |
23 | intel_crtc_update_cursor(crtc, cursor_state); |
24 | }; |
24 | }; |
25 | 25 | ||
26 | static cursor_t* __stdcall select_cursor_kms(cursor_t *cursor) |
26 | static cursor_t* __stdcall select_cursor_kms(cursor_t *cursor) |
27 | { |
27 | { |
- | 28 | struct drm_i915_private *dev_priv = os_display->ddev->dev_private; |
|
- | 29 | struct drm_crtc *crtc = os_display->crtc; |
|
Line 28... | Line 30... | ||
28 | struct drm_i915_private *dev_priv = os_display->ddev->dev_private; |
30 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); |
Line 29... | Line 31... | ||
29 | struct drm_crtc *crtc = os_display->crtc; |
31 | struct drm_plane *cursor_plane = crtc->cursor; |
Line 40... | Line 42... | ||
40 | if (!dev_priv->info.cursor_needs_physical) |
42 | if (!dev_priv->info.cursor_needs_physical) |
41 | intel_crtc->cursor_addr = i915_gem_obj_ggtt_offset(cursor->cobj); |
43 | intel_crtc->cursor_addr = i915_gem_obj_ggtt_offset(cursor->cobj); |
42 | else |
44 | else |
43 | intel_crtc->cursor_addr = (addr_t)cursor->cobj; |
45 | intel_crtc->cursor_addr = (addr_t)cursor->cobj; |
Line -... | Line 46... | ||
- | 46 | ||
- | 47 | cursor_state->visible = 1; |
|
44 | 48 | ||
45 | intel_crtc->base.cursor->state->crtc_w = 64; |
49 | cursor_plane->state->crtc_w = 64; |
46 | intel_crtc->base.cursor->state->crtc_h = 64; |
50 | cursor_plane->state->crtc_h = 64; |
- | 51 | cursor_plane->state->rotation = 0; |
|
47 | intel_crtc->base.cursor->state->rotation = 0; |
52 | |
Line 48... | Line 53... | ||
48 | mutex_unlock(&cursor_lock); |
53 | mutex_unlock(&cursor_lock); |
49 | 54 | ||
50 | move_cursor_kms(cursor, crtc->cursor_x, crtc->cursor_y); |
55 | move_cursor_kms(cursor, crtc->cursor_x, crtc->cursor_y); |