Commit c6af6053 authored by Francisco Jerez's avatar Francisco Jerez Committed by Dave Airlie
Browse files

drm/nouveau: Fix "general protection fault" in the flipd/flips eviction path. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
parent 73cb9276

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 


	placement.fpfn = placement.lpfn = 0;

	placement.num_placement = placement.num_busy_placement = 1;

	placement.placement = &placement_memtype;

	placement.placement = placement.busy_placement = &placement_memtype;



	tmp_mem = *new_mem;

	tmp_mem.mm_node = NULL;
@@ -622,7 +622,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, 


	placement.fpfn = placement.lpfn = 0;

	placement.num_placement = placement.num_busy_placement = 1;

	placement.placement = &placement_memtype;

	placement.placement = placement.busy_placement = &placement_memtype;



	tmp_mem = *new_mem;

	tmp_mem.mm_node = NULL;