diff options
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index f9a0f1dc15f9..c8e3f702ced7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c | |||
@@ -592,7 +592,7 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) | |||
592 | if (!nouveau_fb || !nouveau_fb->nvbo) | 592 | if (!nouveau_fb || !nouveau_fb->nvbo) |
593 | continue; | 593 | continue; |
594 | 594 | ||
595 | ret = nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM, false); | 595 | ret = nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM, true); |
596 | if (ret) | 596 | if (ret) |
597 | NV_ERROR(drm, "Could not pin framebuffer\n"); | 597 | NV_ERROR(drm, "Could not pin framebuffer\n"); |
598 | } | 598 | } |
@@ -600,7 +600,7 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) | |||
600 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 600 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
601 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | 601 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); |
602 | 602 | ||
603 | ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM, false); | 603 | ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM, true); |
604 | if (!ret) | 604 | if (!ret) |
605 | ret = nouveau_bo_map(nv_crtc->cursor.nvbo); | 605 | ret = nouveau_bo_map(nv_crtc->cursor.nvbo); |
606 | if (ret) | 606 | if (ret) |
@@ -713,7 +713,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, | |||
713 | return -ENOMEM; | 713 | return -ENOMEM; |
714 | 714 | ||
715 | if (new_bo != old_bo) { | 715 | if (new_bo != old_bo) { |
716 | ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM, false); | 716 | ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM, true); |
717 | if (ret) | 717 | if (ret) |
718 | goto fail_free; | 718 | goto fail_free; |
719 | } | 719 | } |
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 2b5aefb3b9e5..89bf8ce317c4 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -1073,7 +1073,7 @@ nv50_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb) | |||
1073 | struct nv50_head *head = nv50_head(crtc); | 1073 | struct nv50_head *head = nv50_head(crtc); |
1074 | int ret; | 1074 | int ret; |
1075 | 1075 | ||
1076 | ret = nouveau_bo_pin(nvfb->nvbo, TTM_PL_FLAG_VRAM, false); | 1076 | ret = nouveau_bo_pin(nvfb->nvbo, TTM_PL_FLAG_VRAM, true); |
1077 | if (ret == 0) { | 1077 | if (ret == 0) { |
1078 | if (head->image) | 1078 | if (head->image) |
1079 | nouveau_bo_unpin(head->image); | 1079 | nouveau_bo_unpin(head->image); |
@@ -1402,7 +1402,7 @@ nv50_crtc_create(struct drm_device *dev, int index) | |||
1402 | ret = nouveau_bo_new(dev, 8192, 0x100, TTM_PL_FLAG_VRAM, | 1402 | ret = nouveau_bo_new(dev, 8192, 0x100, TTM_PL_FLAG_VRAM, |
1403 | 0, 0x0000, NULL, NULL, &head->base.lut.nvbo); | 1403 | 0, 0x0000, NULL, NULL, &head->base.lut.nvbo); |
1404 | if (!ret) { | 1404 | if (!ret) { |
1405 | ret = nouveau_bo_pin(head->base.lut.nvbo, TTM_PL_FLAG_VRAM, false); | 1405 | ret = nouveau_bo_pin(head->base.lut.nvbo, TTM_PL_FLAG_VRAM, true); |
1406 | if (!ret) { | 1406 | if (!ret) { |
1407 | ret = nouveau_bo_map(head->base.lut.nvbo); | 1407 | ret = nouveau_bo_map(head->base.lut.nvbo); |
1408 | if (ret) | 1408 | if (ret) |
@@ -1425,7 +1425,7 @@ nv50_crtc_create(struct drm_device *dev, int index) | |||
1425 | ret = nouveau_bo_new(dev, 64 * 64 * 4, 0x100, TTM_PL_FLAG_VRAM, | 1425 | ret = nouveau_bo_new(dev, 64 * 64 * 4, 0x100, TTM_PL_FLAG_VRAM, |
1426 | 0, 0x0000, NULL, NULL, &head->base.cursor.nvbo); | 1426 | 0, 0x0000, NULL, NULL, &head->base.cursor.nvbo); |
1427 | if (!ret) { | 1427 | if (!ret) { |
1428 | ret = nouveau_bo_pin(head->base.cursor.nvbo, TTM_PL_FLAG_VRAM, false); | 1428 | ret = nouveau_bo_pin(head->base.cursor.nvbo, TTM_PL_FLAG_VRAM, true); |
1429 | if (!ret) { | 1429 | if (!ret) { |
1430 | ret = nouveau_bo_map(head->base.cursor.nvbo); | 1430 | ret = nouveau_bo_map(head->base.cursor.nvbo); |
1431 | if (ret) | 1431 | if (ret) |
@@ -2487,7 +2487,7 @@ nv50_display_create(struct drm_device *dev) | |||
2487 | ret = nouveau_bo_new(dev, 4096, 0x1000, TTM_PL_FLAG_VRAM, | 2487 | ret = nouveau_bo_new(dev, 4096, 0x1000, TTM_PL_FLAG_VRAM, |
2488 | 0, 0x0000, NULL, NULL, &disp->sync); | 2488 | 0, 0x0000, NULL, NULL, &disp->sync); |
2489 | if (!ret) { | 2489 | if (!ret) { |
2490 | ret = nouveau_bo_pin(disp->sync, TTM_PL_FLAG_VRAM, false); | 2490 | ret = nouveau_bo_pin(disp->sync, TTM_PL_FLAG_VRAM, true); |
2491 | if (!ret) { | 2491 | if (!ret) { |
2492 | ret = nouveau_bo_map(disp->sync); | 2492 | ret = nouveau_bo_map(disp->sync); |
2493 | if (ret) | 2493 | if (ret) |