From 80ac89a952930f068a058a9eee3c2536832b10c9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 2 May 2017 19:44:38 +0100 Subject: [PATCH] gbm/dri: Fix sign-extension in modifier query When we were assembling the unsigned 64-bit query return from its two signed 32-bit component parts, the lower half was getting sign-extended into the top half. Be more explicit about what we want to do. Fixes gbm_bo_get_modifier() returning ((1 << 64) - 1) rather than ((1 << 56) - 1), i.e. DRM_FORMAT_MOD_INVALID. Signed-off-by: Daniel Stone Reviewed-by: Ben Widawsky --- src/gbm/backends/dri/gbm_dri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 71590d71103..8cca35e0e06 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -772,7 +772,7 @@ gbm_dri_bo_get_modifier(struct gbm_bo *_bo) &mod)) return DRM_FORMAT_MOD_INVALID; - ret |= mod; + ret |= (uint64_t)(mod & 0xffffffff); return ret; } -- 2.30.2