diff options
| author | Daniel Stone <daniels@collabora.com> | 2017-05-02 19:44:38 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2017-05-02 19:55:13 +0100 |
| commit | 80ac89a952930f068a058a9eee3c2536832b10c9 (patch) | |
| tree | 1f8d11ed8496e865caf761384ed81d2854702647 | |
| parent | fba6559a1e76a22135b14490fdf5a6f1de1ae272 (diff) | |
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@collabora.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |