Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 180cc306 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: convert bo.mem.start usage to bo.offset 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 07533ea5

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
				     TTM_MEMTYPE_FLAG_CMA;

				     TTM_MEMTYPE_FLAG_CMA;

			man->available_caching = TTM_PL_MASK_CACHING;

			man->available_caching = TTM_PL_MASK_CACHING;

			man->default_caching = TTM_PL_FLAG_CACHED;

			man->default_caching = TTM_PL_FLAG_CACHED;

			man->gpu_offset = dev_priv->gart_info.aper_base;

			break;

			break;

		default:

		default:

			NV_ERROR(dev, "Unknown GART type: %d\n",

			NV_ERROR(dev, "Unknown GART type: %d\n",

drivers/gpu/drm/nouveau/nouveau_channel.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ nouveau_channel_pushbuf_init(struct nouveau_channel *chan) 
	 * buffer resides, userspace can submit its own push buffers from

	 * buffer resides, userspace can submit its own push buffers from

	 * anywhere within the same memtype.

	 * anywhere within the same memtype.

	 */

	 */

	chan->pushbuf_base = chan->pushbuf_bo->bo.mem.start << PAGE_SHIFT;

	chan->pushbuf_base = chan->pushbuf_bo->bo.offset;

	if (dev_priv->card_type >= NV_50) {

	if (dev_priv->card_type >= NV_50) {

		if (dev_priv->card_type < NV_C0) {

		if (dev_priv->card_type < NV_C0) {

			ret = nouveau_gpuobj_dma_new(chan,

			ret = nouveau_gpuobj_dma_new(chan,

drivers/gpu/drm/nouveau/nouveau_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -358,7 +358,7 @@ nouveau_pci_resume(struct pci_dev *pdev) 




	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

		u32 offset = nv_crtc->cursor.nvbo->bo.mem.start << PAGE_SHIFT;

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





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

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

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

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

drivers/gpu/drm/nouveau/nouveau_notifier.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle, 
			target = NV_MEM_TARGET_VRAM;

			target = NV_MEM_TARGET_VRAM;

		else

		else

			target = NV_MEM_TARGET_GART;

			target = NV_MEM_TARGET_GART;

		offset  = chan->notifier_bo->bo.mem.start << PAGE_SHIFT;

		offset  = chan->notifier_bo->bo.offset;

	} else {

	} else {

		target = NV_MEM_TARGET_VM;

		target = NV_MEM_TARGET_VM;

		offset = chan->notifier_bo->vma.offset;

		offset = chan->notifier_bo->vma.offset;

drivers/gpu/drm/nouveau/nouveau_object.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -768,7 +768,7 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan, 
			struct nouveau_gpuobj *sem = NULL;

			struct nouveau_gpuobj *sem = NULL;

			struct nv50_display_crtc *dispc =

			struct nv50_display_crtc *dispc =

				&nv50_display(dev)->crtc[i];

				&nv50_display(dev)->crtc[i];

			u64 offset = dispc->sem.bo->bo.mem.start << PAGE_SHIFT;

			u64 offset = dispc->sem.bo->bo.offset;





			ret = nouveau_gpuobj_dma_new(chan, 0x3d, offset, 0xfff,

			ret = nouveau_gpuobj_dma_new(chan, 0x3d, offset, 0xfff,

						     NV_MEM_ACCESS_RW,

						     NV_MEM_ACCESS_RW,