Mesa (master): gbm/dri: Fix sign-extension in modifier query

[Daniel Stone]

Module: Mesa
Branch: master
Commit: 80ac89a952930f068a058a9eee3c2536832b10c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80ac89a952930f068a058a9eee3c2536832b10c9

Author: Daniel Stone <daniels at collabora.com>
Date:   Tue May  2 19:44:38 2017 +0100

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 <daniels at collabora.com>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>

---

 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 71590d7110..8cca35e0e0 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;
 }