diff options
author | Frediano Ziglio <fziglio@redhat.com> | 2019-01-18 13:20:01 +0100 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-01-28 14:24:52 +0100 |
commit | a8dc42142a0ebbb5fade13f3e48d89399499d297 (patch) | |
tree | 50dceb13e58b97fb87e72623f3d188065e4f2249 /drivers/gpu/drm/qxl | |
parent | 2ec6bd67b76ea0afc97eaa22f369738f1a7ad7f3 (diff) | |
download | linux-stable-a8dc42142a0ebbb5fade13f3e48d89399499d297.tar.gz linux-stable-a8dc42142a0ebbb5fade13f3e48d89399499d297.tar.bz2 linux-stable-a8dc42142a0ebbb5fade13f3e48d89399499d297.zip |
drm/qxl: change the way slot is detected
Instead of relaying on surface type use the actual placement.
This allow to have different placement for a single type of
surface.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-5-kraxel@redhat.com
[ kraxel: rebased, adapted to upstream changes ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/qxl')
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index f9dddfe7d988..d015d4fff158 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -311,7 +311,8 @@ static inline uint64_t qxl_bo_physical_address(struct qxl_device *qdev, struct qxl_bo *bo, unsigned long offset) { - struct qxl_memslot *slot = bo->type == QXL_GEM_DOMAIN_VRAM + struct qxl_memslot *slot = + (bo->tbo.mem.mem_type == TTM_PL_VRAM) ? &qdev->main_slot : &qdev->surfaces_slot; /* TODO - need to hold one of the locks to read tbo.offset */ |