projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_fb.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index b031b48dbb3cdcbbd48824096ac82650aa08ec87..0a474f391fad0157d8a51e5aa2e50d6c4aec69ec 100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@
-374,10
+374,16
@@
static int vmw_fb_create_bo(struct vmw_private *vmw_priv,
size_t size, struct vmw_dma_buffer **out)
{
struct vmw_dma_buffer *vmw_bo;
size_t size, struct vmw_dma_buffer **out)
{
struct vmw_dma_buffer *vmw_bo;
- struct ttm_placement ne_placement = vmw_vram_ne_placement;
+ struct ttm_place ne_place = vmw_vram_ne_placement.placement[0];
+ struct ttm_placement ne_placement;
int ret;
int ret;
- ne_placement.lpfn = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ ne_placement.num_placement = 1;
+ ne_placement.placement = &ne_place;
+ ne_placement.num_busy_placement = 1;
+ ne_placement.busy_placement = &ne_place;
+
+ ne_place.lpfn = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
(void) ttm_write_lock(&vmw_priv->reservation_sem, false);
(void) ttm_write_lock(&vmw_priv->reservation_sem, false);