diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2009-12-16 13:05:00 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-10 23:41:05 -0500 |
| commit | c6af6053be60840dcbb037c3798557cbf71cbb08 (patch) | |
| tree | e827f729d308235b181f5b13509de853402cb6a1 /drivers/gpu | |
| parent | 73cb9276fd189c19558a97600456bd13fa5debe8 (diff) | |
drm/nouveau: Fix "general protection fault" in the flipd/flips eviction path.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 1d6036fabd5d..365fc6508173 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
| @@ -584,7 +584,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, | |||
| 584 | 584 | ||
| 585 | placement.fpfn = placement.lpfn = 0; | 585 | placement.fpfn = placement.lpfn = 0; |
| 586 | placement.num_placement = placement.num_busy_placement = 1; | 586 | placement.num_placement = placement.num_busy_placement = 1; |
| 587 | placement.placement = &placement_memtype; | 587 | placement.placement = placement.busy_placement = &placement_memtype; |
| 588 | 588 | ||
| 589 | tmp_mem = *new_mem; | 589 | tmp_mem = *new_mem; |
| 590 | tmp_mem.mm_node = NULL; | 590 | tmp_mem.mm_node = NULL; |
| @@ -622,7 +622,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, | |||
| 622 | 622 | ||
| 623 | placement.fpfn = placement.lpfn = 0; | 623 | placement.fpfn = placement.lpfn = 0; |
| 624 | placement.num_placement = placement.num_busy_placement = 1; | 624 | placement.num_placement = placement.num_busy_placement = 1; |
| 625 | placement.placement = &placement_memtype; | 625 | placement.placement = placement.busy_placement = &placement_memtype; |
| 626 | 626 | ||
| 627 | tmp_mem = *new_mem; | 627 | tmp_mem = *new_mem; |
| 628 | tmp_mem.mm_node = NULL; | 628 | tmp_mem.mm_node = NULL; |