Commit 0dc9b286 authored by Nirmoy Das's avatar Nirmoy Das Committed by Christian König
Browse files

drm/nouveau: don't use ttm bo->offset v3 



Store ttm bo->offset in struct nouveau_bo instead.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/372932/


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 0b17fc08

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

+3 −3
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
		fb = nouveau_framebuffer(crtc->primary->fb);

	}



	nv_crtc->fb.offset = fb->nvbo->bo.offset;

	nv_crtc->fb.offset = fb->nvbo->offset;



	if (nv_crtc->lut.depth != drm_fb->format->depth) {

		nv_crtc->lut.depth = drm_fb->format->depth;
@@ -1013,7 +1013,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, 
		nv04_cursor_upload(dev, cursor, nv_crtc->cursor.nvbo);



	nouveau_bo_unmap(cursor);

	nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->bo.offset;

	nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->offset;

	nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);

	nv_crtc->cursor.show(nv_crtc, true);

out:
@@ -1191,7 +1191,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
	/* Initialize a page flip struct */

	*s = (struct nv04_page_flip_state)

		{ { }, event, crtc, fb->format->cpp[0] * 8, fb->pitches[0],

		  new_bo->bo.offset };

		  new_bo->offset };



	/* Keep vblanks on during flip, for the target crtc of this flip */

	drm_crtc_vblank_get(crtc);

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

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime) 
			continue;



		if (nv_crtc->cursor.set_offset)

			nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.nvbo->bo.offset);

			nv_crtc->cursor.set_offset(nv_crtc,

						   nv_crtc->cursor.nvbo->offset);

		nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x,

						 nv_crtc->cursor_saved_y);

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	nvif_mask(dev, NV_PCRTC_ENGINE_CTRL + soff2, NV_CRTC_FSEL_OVERLAY, 0);



	nvif_wr32(dev, NV_PVIDEO_BASE(flip), 0);

	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nv_fb->nvbo->bo.offset);

	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nv_fb->nvbo->offset);

	nvif_wr32(dev, NV_PVIDEO_SIZE_IN(flip), src_h << 16 | src_w);

	nvif_wr32(dev, NV_PVIDEO_POINT_IN(flip), src_y << 16 | src_x);

	nvif_wr32(dev, NV_PVIDEO_DS_DX(flip), (src_w << 20) / crtc_w);
@@ -172,7 +172,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	if (format & NV_PVIDEO_FORMAT_PLANAR) {

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_BASE(flip), 0);

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_OFFSET_BUFF(flip),

			nv_fb->nvbo->bo.offset + fb->offsets[1]);

			nv_fb->nvbo->offset + fb->offsets[1]);

	}

	nvif_wr32(dev, NV_PVIDEO_FORMAT(flip), format | fb->pitches[0]);

	nvif_wr32(dev, NV_PVIDEO_STOP, 0);
@@ -396,7 +396,7 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 


	for (i = 0; i < 2; i++) {

		nvif_wr32(dev, NV_PVIDEO_BUFF0_START_ADDRESS + 4 * i,

			  nv_fb->nvbo->bo.offset);

			  nv_fb->nvbo->offset);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_PITCH_LENGTH + 4 * i,

			  fb->pitches[0]);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_OFFSET + 4 * i, 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format, 


	ret = nv50_dmac_create(&drm->client.device, &disp->disp->object,

			       &oclass, head, &args, sizeof(args),

			       disp->sync->bo.offset, &wndw->wndw);

			       disp->sync->offset, &wndw->wndw);

	if (ret) {

		NV_ERROR(drm, "base%04x allocation failed: %d\n", oclass, ret);

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm, 


	ret = nv50_dmac_create(&drm->client.device, &disp->disp->object,

			       &oclass, 0, &args, sizeof(args),

			       disp->sync->bo.offset, &core->chan);

			       disp->sync->offset, &core->chan);

	if (ret) {

		NV_ERROR(drm, "core%04x allocation failed: %d\n", oclass, ret);

		return ret;