From: Michel Dänzer <michel.daen...@amd.com> v2: Rename struct radeon_drm_queue to struct radeon_drm_queue_event, thanks to Richard Wilbur <richard.wil...@gmail.com> for the suggestion. Also changed the corresponding parameter and local variable names from 'q' to 'e'.
Signed-off-by: Michel Dänzer <michel.daen...@amd.com> --- src/Makefile.am | 5 +- src/radeon_drm_queue.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++ src/radeon_drm_queue.h | 56 +++++++++++++++ src/radeon_kms.c | 4 ++ 4 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 src/radeon_drm_queue.c create mode 100644 src/radeon_drm_queue.h diff --git a/src/Makefile.am b/src/Makefile.am index 708f2ad..9cc8a2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,8 +29,8 @@ ati_drv_la_LIBADD = $(PCIACCESS_LIBS) radeon_drv_la_LIBADD = $(LIBDRM_RADEON_LIBS) $(PCIACCESS_LIBS) -RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c \ - radeon_bo_helper.c +RADEON_KMS_SRCS=radeon_dri2.c radeon_drm_queue.c radeon_kms.c drmmode_display.c \ + radeon_vbo.c radeon_bo_helper.c RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c r600_shader.c radeon_exa_shared.c \ evergreen_exa.c evergreen_accel.c evergreen_shader.c evergreen_textured_videofuncs.c cayman_accel.c cayman_shader.c @@ -88,6 +88,7 @@ EXTRA_DIST = \ bicubic_table.h \ bicubic_table.py \ radeon_bo_helper.h \ + radeon_drm_queue.h \ radeon_exa_render.c \ radeon_exa_funcs.c \ radeon_exa_shared.h \ diff --git a/src/radeon_drm_queue.c b/src/radeon_drm_queue.c new file mode 100644 index 0000000..5e54ef8 --- /dev/null +++ b/src/radeon_drm_queue.c @@ -0,0 +1,181 @@ +/* + * Copyright © 2007 Red Hat, Inc. + * Copyright © 2015 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Dave Airlie <airl...@redhat.com> + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <xorg-server.h> + +#include "radeon.h" +#include "radeon_drm_queue.h" +#include "radeon_list.h" + + +struct radeon_drm_queue_entry { + struct xorg_list list; + uint64_t id; + void *data; + ClientPtr client; + ScrnInfoPtr scrn; + radeon_drm_handler_proc handler; + radeon_drm_abort_proc abort; +}; + +static int radeon_drm_queue_refcnt; +static struct xorg_list radeon_drm_queue; + + +/* + * Handle a DRM event + */ +void +radeon_drm_queue_handler(int fd, unsigned int frame, unsigned int sec, + unsigned int usec, void *user_ptr) +{ + struct radeon_drm_queue_entry *user_data = user_ptr; + struct radeon_drm_queue_entry *e, *tmp; + + xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { + if (e == user_data) { + xorg_list_del(&e->list); + e->handler(e->scrn, frame, + (uint64_t)sec * 1000000 + usec, e->data); + free(e); + break; + } + } +} + +/* + * Enqueue a potential drm response; when the associated response + * appears, we've got data to pass to the handler from here + */ +struct radeon_drm_queue_entry * +radeon_drm_queue_alloc(ScrnInfoPtr scrn, ClientPtr client, + uint64_t id, void *data, + radeon_drm_handler_proc handler, + radeon_drm_abort_proc abort) +{ + struct radeon_drm_queue_entry *e; + + e = calloc(1, sizeof(struct radeon_drm_queue_entry)); + if (!e) + return NULL; + + e->client = client; + e->scrn = scrn; + e->id = id; + e->data = data; + e->handler = handler; + e->abort = abort; + + xorg_list_add(&e->list, &radeon_drm_queue); + + return e; +} + +/* + * Abort one queued DRM entry, removing it + * from the list, calling the abort function and + * freeing the memory + */ +static void +radeon_drm_abort_one(struct radeon_drm_queue_entry *e) +{ + xorg_list_del(&e->list); + e->abort(e->scrn, e->data); + free(e); +} + +/* + * Abort drm queue entries for a client + */ +void +radeon_drm_abort_client(ClientPtr client) +{ + struct radeon_drm_queue_entry *e, *tmp; + + xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { + if (e->client == client) + radeon_drm_abort_one(e); + } +} + +/* + * Abort specific drm queue entry + */ +void +radeon_drm_abort_entry(struct radeon_drm_queue_entry *entry) +{ + radeon_drm_abort_one(entry); +} + +/* + * Abort specific drm queue entry by ID + */ +void +radeon_drm_abort_id(uint64_t id) +{ + struct radeon_drm_queue_entry *e, *tmp; + + xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { + if (e->id == id) { + radeon_drm_abort_one(e); + break; + } + } +} + +/* + * Initialize the DRM event queue + */ +void +radeon_drm_queue_init() +{ + if (radeon_drm_queue_refcnt++) + return; + + xorg_list_init(&radeon_drm_queue); +} + +/* + * Deinitialize the DRM event queue + */ +void +radeon_drm_queue_close(ScrnInfoPtr scrn) +{ + struct radeon_drm_queue_entry *e, *tmp; + + xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { + if (e->scrn == scrn) + radeon_drm_abort_one(e); + } + + radeon_drm_queue_refcnt--; +} diff --git a/src/radeon_drm_queue.h b/src/radeon_drm_queue.h new file mode 100644 index 0000000..8fc1c42 --- /dev/null +++ b/src/radeon_drm_queue.h @@ -0,0 +1,56 @@ +/* + * Copyright © 2007 Red Hat, Inc. + * Copyright © 2015 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Dave Airlie <airl...@redhat.com> + * + */ + +#ifndef _RADEON_DRM_QUEUE_H_ +#define _RADEON_DRM_QUEUE_H_ + +#define RADEON_DRM_QUEUE_CLIENT_DEFAULT serverClient +#define RADEON_DRM_QUEUE_ID_DEFAULT ~0ULL + +struct radeon_drm_queue_entry; + +typedef void (*radeon_drm_handler_proc)(ScrnInfoPtr scrn, uint32_t seq, + uint64_t usec, void *data); +typedef void (*radeon_drm_abort_proc)(ScrnInfoPtr scrn, void *data); + +void radeon_drm_queue_handler(int fd, unsigned int frame, + unsigned int tv_sec, unsigned int tv_usec, + void *user_ptr); +struct radeon_drm_queue_entry *radeon_drm_queue_alloc(ScrnInfoPtr scrn, + ClientPtr client, + uint64_t id, + void *data, + radeon_drm_handler_proc handler, + radeon_drm_abort_proc abort); +void radeon_drm_abort_client(ClientPtr client); +void radeon_drm_abort_entry(struct radeon_drm_queue_entry *entry); +void radeon_drm_abort_id(uint64_t id); +void radeon_drm_queue_init(); +void radeon_drm_queue_close(ScrnInfoPtr scrn); + +#endif /* _RADEON_DRM_QUEUE_H_ */ diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 62364d9..ced3594 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -32,6 +32,7 @@ #include <sys/ioctl.h> /* Driver data structures */ #include "radeon.h" +#include "radeon_drm_queue.h" #include "radeon_reg.h" #include "radeon_probe.h" #include "micmap.h" @@ -876,6 +877,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) if (!RADEONPreInitAccel_KMS(pScrn)) goto fail; + radeon_drm_queue_init(); + info->allowColorTiling2D = FALSE; RADEONSetupCapabilities(pScrn); @@ -1173,6 +1176,7 @@ static Bool RADEONCloseScreen_KMS(CLOSE_SCREEN_ARGS_DECL) "RADEONCloseScreen\n"); drmmode_uevent_fini(pScrn, &info->drmmode); + radeon_drm_queue_close(pScrn); radeon_cs_flush_indirect(pScrn); DeleteCallback(&FlushCallback, radeon_flush_callback, pScrn); -- 2.1.4 _______________________________________________ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati