diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-06-27 19:15:18 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2017-06-30 17:40:12 +0900 |
| commit | df88d51c5005476e6fbfca3f31b54be079ec5aaa (patch) | |
| tree | 20380d231166e1ef17c8c86ed4570099aaf74813 /src/radeon_present.c | |
| parent | 19626bce4e5e31c863eedb503ea3884ac3f60bea (diff) | |
Use pRADEONEnt->fd exclusively for the DRM file descriptor
This brings us closer to amdgpu.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_present.c')
| -rw-r--r-- | src/radeon_present.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/radeon_present.c b/src/radeon_present.c index 635d1086..e637d786 100644 --- a/src/radeon_present.c +++ b/src/radeon_present.c @@ -105,10 +105,11 @@ static Bool radeon_present_flush_drm_events(ScreenPtr screen) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[0]->driver_private; drmmode_ptr drmmode = drmmode_crtc->drmmode; - struct pollfd p = { .fd = drmmode->fd, .events = POLLIN }; + struct pollfd p = { .fd = pRADEONEnt->fd, .events = POLLIN }; int r; do { @@ -118,7 +119,7 @@ radeon_present_flush_drm_events(ScreenPtr screen) if (r <= 0) return 0; - return drmHandleEvent(drmmode->fd, &drmmode->event_context) >= 0; + return drmHandleEvent(pRADEONEnt->fd, &drmmode->event_context) >= 0; } /* @@ -155,7 +156,7 @@ radeon_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc) xf86CrtcPtr xf86_crtc = crtc->devPrivate; ScreenPtr screen = crtc->pScreen; ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONInfoPtr info = RADEONPTR(scrn); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); int crtc_id = drmmode_get_crtc_id(xf86_crtc); struct radeon_present_vblank_event *event; uintptr_t drm_queue_seq; @@ -180,7 +181,7 @@ radeon_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc) vbl.request.sequence = msc; vbl.request.signal = drm_queue_seq; for (;;) { - ret = drmWaitVBlank(info->dri2.drm_fd, &vbl); + ret = drmWaitVBlank(pRADEONEnt->fd, &vbl); if (!ret) break; if (errno != EBUSY || !radeon_present_flush_drm_events(screen)) { @@ -435,11 +436,11 @@ radeon_present_has_async_flip(ScreenPtr screen) { #ifdef DRM_CAP_ASYNC_PAGE_FLIP ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONInfoPtr info = RADEONPTR(scrn); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); int ret; uint64_t value; - ret = drmGetCap(info->dri2.drm_fd, DRM_CAP_ASYNC_PAGE_FLIP, &value); + ret = drmGetCap(pRADEONEnt->fd, DRM_CAP_ASYNC_PAGE_FLIP, &value); if (ret == 0) return value == 1; #endif |