diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/crtc.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/crtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c index fca6a1f9c20c..38402ade6835 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <drm/drmP.h> | 27 | #include <drm/drmP.h> |
| 28 | #include <drm/drm_crtc_helper.h> | 28 | #include <drm/drm_crtc_helper.h> |
| 29 | #include <drm/drm_plane_helper.h> | ||
| 29 | 30 | ||
| 30 | #include "nouveau_drm.h" | 31 | #include "nouveau_drm.h" |
| 31 | #include "nouveau_reg.h" | 32 | #include "nouveau_reg.h" |
| @@ -613,7 +614,7 @@ nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb) | |||
| 613 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | 614 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); |
| 614 | int ret; | 615 | int ret; |
| 615 | 616 | ||
| 616 | ret = nouveau_bo_pin(nvfb->nvbo, TTM_PL_FLAG_VRAM); | 617 | ret = nouveau_bo_pin(nvfb->nvbo, TTM_PL_FLAG_VRAM, false); |
| 617 | if (ret == 0) { | 618 | if (ret == 0) { |
| 618 | if (disp->image[nv_crtc->index]) | 619 | if (disp->image[nv_crtc->index]) |
| 619 | nouveau_bo_unpin(disp->image[nv_crtc->index]); | 620 | nouveau_bo_unpin(disp->image[nv_crtc->index]); |
| @@ -1129,7 +1130,7 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num) | |||
| 1129 | ret = nouveau_bo_new(dev, 64*64*4, 0x100, TTM_PL_FLAG_VRAM, | 1130 | ret = nouveau_bo_new(dev, 64*64*4, 0x100, TTM_PL_FLAG_VRAM, |
| 1130 | 0, 0x0000, NULL, NULL, &nv_crtc->cursor.nvbo); | 1131 | 0, 0x0000, NULL, NULL, &nv_crtc->cursor.nvbo); |
| 1131 | if (!ret) { | 1132 | if (!ret) { |
| 1132 | ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM); | 1133 | ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM, false); |
| 1133 | if (!ret) { | 1134 | if (!ret) { |
| 1134 | ret = nouveau_bo_map(nv_crtc->cursor.nvbo); | 1135 | ret = nouveau_bo_map(nv_crtc->cursor.nvbo); |
| 1135 | if (ret) | 1136 | if (ret) |
