load_cursor_argb is supposed to return a Bool, not void
PATCH 1/1 load_cursor_argb is supposed to return a Bool, not void
By mis-declaring this function, we ended up using software cursors because the value seen by the caller was 0.
--- src/sna/sna_display.c | 8 ++++++-- src/sna/sna_display_fake.c | 3 ++- src/uxa/intel_display.c | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-)
src/sna/sna_display.c +6 -2
@@ -1681,11 +1681,12 @@ sna_crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y) (void )drmIoctl (to_sna (crtc->scrn)->kgem.fd,DRM_IOCTL_MODE_CURSOR , &arg); } -static void +static Bool sna_crtc_load_cursor_argb (xf86CrtcPtr crtc,CARD32 *image) {struct sna *sna =to_sna (crtc->scrn);struct drm_i915_gem_pwrite pwrite; +int ret;__DBG (("%s: CRTC:%d\n" , __FUNCTION__,to_sna_crtc (crtc)->id));
@@ -1694,7 +1695,10 @@ sna_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) pwrite.offset =0 ; pwrite.size = sna->mode.cursor_width*sna->mode.cursor_height*4 ; pwrite.data_ptr = (uintptr_t )image; - (void )drmIoctl (sna->kgem.fd,DRM_IOCTL_I915_GEM_PWRITE , &pwrite); + ret =drmIoctl (sna->kgem.fd,DRM_IOCTL_I915_GEM_PWRITE , &pwrite); +if (ret !=0 ) +return FALSE; +return TRUE; } static void
src/sna/sna_display_fake.c +2 -1
@@ -115,9 +115,10 @@ sna_crtc_show_cursor(xf86CrtcPtr crtc) { } -static void +static Bool sna_crtc_load_cursor_argb (xf86CrtcPtr crtc,CARD32 *image) { +return TRUE; } static void
src/uxa/intel_display.c +5 -2
@@ -432,16 +432,19 @@ intel_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)drmModeMoveCursor (mode->fd,crtc_id (intel_crtc), x, y); } -static void +static Bool intel_crtc_load_cursor_argb (xf86CrtcPtr crtc,CARD32 *image) {struct intel_crtc *intel_crtc = crtc->driver_private;int ret; ret =dri_bo_subdata (intel_crtc->cursor,0 ,64 *64 *4 , image); -if (ret) +if (ret) {xf86DrvMsg (crtc->scrn->scrnIndex,X_ERROR ,"failed to set cursor: %s\n" ,strerror (-ret)); +return FALSE; + } +return TRUE; } static void
Signature · 6 lines
1.9.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
A message that is not in the archive (sent off-list or not yet received): 1397499723-19704-1-git-send-email-keithp-aN4HjG94KOLQT0dZR+AlfA@public.gmane.org
Quoted 10 lines · Keith Packard
By mis-declaring this function, we ended up using software cursors because the value seen by the caller was 0.
Signed-off-by Keith Packard <[email protected]>--- src/sna/sna_display.c | 8 ++++++-- src/sna/sna_display_fake.c | 3 ++- src/uxa/intel_display.c | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-)
Only since
http://cgit.freedesktop.org/xorg/xserver/commit/?id=901fbfbbbd71c0d82080957f8ba09eebbc786f2b
Which could probably have used a different name to avoid silent breakage.
Cheers,
Julien
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
A message that is not in the archive (sent off-list or not yet received): 20140414183554.GM4433-DH0RHqKap0bQFgiFqc9mtSKrdGxDUCcD@public.gmane.org
Quoted 5 lines · Julien Cristau
Only since
http://cgit.freedesktop.org/xorg/xserver/commit/?id=901fbfbbbd71c0d82080957f8ba09eebbc786f2bWhich could probably have used a different name to avoid silent breakage.
Yeah, that probably would have been a better change.
Signature · 1 line
[email protected]
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel