summaryrefslogtreecommitdiff
path: root/src/radeon_drm_queue.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-07-06 12:46:01 +0900
committerMichel Dänzer <michel@daenzer.net>2016-07-22 19:08:38 +0900
commita37af701768b12d86868a831a79f1e02ee4968cf (patch)
tree438daae31206b52bf0eb8406360d042dd8ed2cca /src/radeon_drm_queue.c
parent024afff27eb9f4c60043214099ddb42bbfb3d289 (diff)
Add explicit RADEON_DRM_QUEUE_ERROR define
Should make the radeon_drm_queue_alloc error handling clearer, and gets rid of a compile warning about it returning NULL. Reviewed-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Diffstat (limited to 'src/radeon_drm_queue.c')
-rw-r--r--src/radeon_drm_queue.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/radeon_drm_queue.c b/src/radeon_drm_queue.c
index 0d999dde..31f24350 100644
--- a/src/radeon_drm_queue.c
+++ b/src/radeon_drm_queue.c
@@ -92,10 +92,11 @@ radeon_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr client,
e = calloc(1, sizeof(struct radeon_drm_queue_entry));
if (!e)
- return NULL;
+ return RADEON_DRM_QUEUE_ERROR;
+
+ if (_X_UNLIKELY(radeon_drm_queue_seq == RADEON_DRM_QUEUE_ERROR))
+ radeon_drm_queue_seq++;
- if (!radeon_drm_queue_seq)
- radeon_drm_queue_seq = 1;
e->seq = radeon_drm_queue_seq++;
e->client = client;
e->crtc = crtc;