01c57eca43
This was introduced in a partial MR, where the later commits in the new multi-GPU MR fully fix it, but the initially cherry-picked ones don't. Signed-off-by: Daniel Stone <daniels@collabora.com>