diff options
| -rw-r--r-- | driver/xf86-video-amdgpu/src/amdgpu_present.c | 2 | ||||
| -rw-r--r-- | driver/xf86-video-amdgpu/src/drmmode_display.h | 2 | ||||
| -rw-r--r-- | xserver/glamor/glamor.h | 2 | ||||
| -rw-r--r-- | xserver/glamor/glamor_egl.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/driver/xf86-video-amdgpu/src/amdgpu_present.c b/driver/xf86-video-amdgpu/src/amdgpu_present.c index ca905d130..6c19867cb 100644 --- a/driver/xf86-video-amdgpu/src/amdgpu_present.c +++ b/driver/xf86-video-amdgpu/src/amdgpu_present.c @@ -62,7 +62,7 @@ amdgpu_present_get_crtc(WindowPtr window) } static int -amdgpu_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc) +amdgpu_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc) { xf86CrtcPtr xf86_crtc = crtc->devPrivate; drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; diff --git a/driver/xf86-video-amdgpu/src/drmmode_display.h b/driver/xf86-video-amdgpu/src/drmmode_display.h index 634b897d7..023a384ff 100644 --- a/driver/xf86-video-amdgpu/src/drmmode_display.h +++ b/driver/xf86-video-amdgpu/src/drmmode_display.h @@ -284,7 +284,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, amdgpu_drm_abort_proc abort, enum drmmode_flip_sync flip_sync, uint32_t target_msc); -int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc); +int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc); int drmmode_get_current_ust(int drm_fd, CARD64 * ust); void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled); diff --git a/xserver/glamor/glamor.h b/xserver/glamor/glamor.h index 31157471d..220160cf7 100644 --- a/xserver/glamor/glamor.h +++ b/xserver/glamor/glamor.h @@ -276,7 +276,7 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen, const CARD32 *offsets, CARD8 depth, CARD8 bpp, - uint64_t modifier); + CARD64 modifier); /* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd. * diff --git a/xserver/glamor/glamor_egl.c b/xserver/glamor/glamor_egl.c index 8028add63..4832d068a 100644 --- a/xserver/glamor/glamor_egl.c +++ b/xserver/glamor/glamor_egl.c @@ -552,7 +552,7 @@ glamor_pixmap_from_fds(ScreenPtr screen, CARD16 width, CARD16 height, const CARD32 *strides, const CARD32 *offsets, CARD8 depth, CARD8 bpp, - uint64_t modifier) + CARD64 modifier) { PixmapPtr pixmap; struct glamor_egl_screen_private *glamor_egl; |