Commit 81b61579 authored by Christian König's avatar Christian König
Browse files

drm/nouveau: stop using TTM placement flags 



Those are going to be removed, stop using them here.

Instead use the GEM flags from the UAPI.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/389825/?series=81551&rev=1
parent 7053e0ea

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+5 −4
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb) 
	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	int ret;



	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	ret = nouveau_bo_pin(nvbo, NOUVEAU_GEM_DOMAIN_VRAM, false);

	if (ret == 0) {

		if (disp->image[nv_crtc->index])

			nouveau_bo_unpin(disp->image[nv_crtc->index]);
@@ -1172,7 +1172,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
		return -ENOMEM;



	if (new_bo != old_bo) {

		ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM, true);

		ret = nouveau_bo_pin(new_bo, NOUVEAU_GEM_DOMAIN_VRAM, true);

		if (ret)

			goto fail_free;

	}
@@ -1336,10 +1336,11 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num) 
	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);



	ret = nouveau_bo_new(&nouveau_drm(dev)->client, 64*64*4, 0x100,

			     TTM_PL_FLAG_VRAM, 0, 0x0000, NULL, NULL,

			     NOUVEAU_GEM_DOMAIN_VRAM, 0, 0x0000, NULL, NULL,

			     &nv_crtc->cursor.nvbo);

	if (!ret) {

		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM, false);

		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo,

				     NOUVEAU_GEM_DOMAIN_VRAM, false);

		if (!ret) {

			ret = nouveau_bo_map(nv_crtc->cursor.nvbo);

			if (ret)

drivers/gpu/drm/nouveau/dispnv04/disp.c

+3 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime) 
		if (!fb || !fb->obj[0])

			continue;

		nvbo = nouveau_gem_object(fb->obj[0]);

		ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, true);

		ret = nouveau_bo_pin(nvbo, NOUVEAU_GEM_DOMAIN_VRAM, true);

		if (ret)

			NV_ERROR(drm, "Could not pin framebuffer\n");

	}
@@ -122,7 +122,8 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime) 
		if (!nv_crtc->cursor.nvbo)

			continue;



		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM, true);

		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo,

				     NOUVEAU_GEM_DOMAIN_VRAM, true);

		if (!ret && nv_crtc->cursor.set_offset)

			ret = nouveau_bo_map(nv_crtc->cursor.nvbo);

		if (ret)

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
		return ret;



	nvbo = nouveau_gem_object(fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	ret = nouveau_bo_pin(nvbo, NOUVEAU_GEM_DOMAIN_VRAM, false);

	if (ret)

		return ret;
@@ -387,7 +387,7 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
		return ret;



	nvbo = nouveau_gem_object(fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, false);

	ret = nouveau_bo_pin(nvbo, NOUVEAU_GEM_DOMAIN_VRAM, false);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/dispnv50/disp.c

+3 −2
Original line number Diff line number Diff line
@@ -2581,10 +2581,11 @@ nv50_display_create(struct drm_device *dev) 
	dev->mode_config.normalize_zpos = true;



	/* small shared memory area we use for notifiers and semaphores */

	ret = nouveau_bo_new(&drm->client, 4096, 0x1000, TTM_PL_FLAG_VRAM,

	ret = nouveau_bo_new(&drm->client, 4096, 0x1000,

			     NOUVEAU_GEM_DOMAIN_VRAM,

			     0, 0x0000, NULL, NULL, &disp->sync);

	if (!ret) {

		ret = nouveau_bo_pin(disp->sync, TTM_PL_FLAG_VRAM, true);

		ret = nouveau_bo_pin(disp->sync, NOUVEAU_GEM_DOMAIN_VRAM, true);

		if (!ret) {

			ret = nouveau_bo_map(disp->sync);

			if (ret)

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) 
		return 0;



	nvbo = nouveau_gem_object(fb->obj[0]);

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_VRAM, true);

	ret = nouveau_bo_pin(nvbo, NOUVEAU_GEM_DOMAIN_VRAM, true);

	if (ret)

		return ret;