diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2018-12-21 17:54:36 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2018-12-28 12:09:09 +0100 |
| commit | 92df709786830d4e30a106dd49d8e0355c50c8f0 (patch) | |
| tree | c22292c14d6d52ca4f7b731b77c5bf8f7a52f0bf | |
| parent | e14c3d2f86c7be2b5c3d06a47bf0abe954207d0b (diff) | |
Use drmIoctl in drmmode_show_cursor
This should be functionally equivalent to what drmModeSetCursor(2) do
behind the scenes, but allows for new tricks in following changes.
(Ported from amdgpu commit b344e1559e936046ef02c777fc4f6bcefa3830bc)
| -rw-r--r-- | src/drmmode_display.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index ef235bd2..c2a59da7 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1202,8 +1202,16 @@ drmmode_show_cursor (xf86CrtcPtr crtc) RADEONInfoPtr info = RADEONPTR(pScrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - uint32_t handle = drmmode_crtc->cursor_bo->handle; static Bool use_set_cursor2 = TRUE; + struct drm_mode_cursor2 arg; + + memset(&arg, 0, sizeof(arg)); + + arg.handle = drmmode_crtc->cursor_bo->handle; + arg.flags = DRM_MODE_CURSOR_BO; + arg.crtc_id = drmmode_crtc->mode_crtc->crtc_id; + arg.width = info->cursor_w; + arg.height = info->cursor_h; if (use_set_cursor2) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); @@ -1240,18 +1248,17 @@ drmmode_show_cursor (xf86CrtcPtr crtc) } } - ret = - drmModeSetCursor2(pRADEONEnt->fd, drmmode_crtc->mode_crtc->crtc_id, - handle, info->cursor_w, info->cursor_h, - xhot, yhot); + arg.hot_x = xhot; + arg.hot_y = yhot; + + ret = drmIoctl(pRADEONEnt->fd, DRM_IOCTL_MODE_CURSOR2, &arg); if (ret == -EINVAL) use_set_cursor2 = FALSE; else return; } - drmModeSetCursor(pRADEONEnt->fd, drmmode_crtc->mode_crtc->crtc_id, handle, - info->cursor_w, info->cursor_h); + drmIoctl(pRADEONEnt->fd, DRM_IOCTL_MODE_CURSOR, &arg); } /* Xorg expects a non-NULL return value from drmmode_crtc_shadow_allocate, and |