Commit bc609f48 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2023-08-24' of... 

Merge tag 'drm-misc-next-fixes-2023-08-24' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

 * gpuva: Cleanups

 * kunit: Documentation fixes

 * nouveau:
   * UAPI: Avoid implicit NO_PREFETCH flag
   * Scheduler fixes
   * Fix remap

 * ttm: Fix type conversion in tests

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230824181241.GA6386@linux-uq9g.hotspot.internet-for-guests.com
parents 38f88732 cdf4100e

drivers/gpu/drm/drm_gpuva_mgr.c

+4 −6
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, 
		   u64 req_addr, u64 req_range,

		   struct drm_gem_object *req_obj, u64 req_offset)

{

	struct drm_gpuva *va, *next, *prev = NULL;

	struct drm_gpuva *va, *next;

	u64 req_end = req_addr + req_range;

	int ret;
@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, 
				ret = op_unmap_cb(ops, priv, va, merge);

				if (ret)

					return ret;

				goto next;

				continue;

			}



			if (end > req_end) {
@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, 
				ret = op_remap_cb(ops, priv, &p, NULL, &u);

				if (ret)

					return ret;

				goto next;

				continue;

			}



			if (end > req_end) {
@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, 
				ret = op_unmap_cb(ops, priv, va, merge);

				if (ret)

					return ret;

				goto next;

				continue;

			}



			if (end > req_end) {
@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, 
				break;

			}

		}

next:

		prev = va;

	}



	return op_map_cb(ops, priv,

drivers/gpu/drm/nouveau/nouveau_dma.c

+5 −2
Original line number Diff line number Diff line
@@ -69,16 +69,19 @@ READ_GET(struct nouveau_channel *chan, uint64_t *prev_get, int *timeout) 
}



void

nv50_dma_push(struct nouveau_channel *chan, u64 offset, int length)

nv50_dma_push(struct nouveau_channel *chan, u64 offset, u32 length,

	      bool no_prefetch)

{

	struct nvif_user *user = &chan->drm->client.device.user;

	struct nouveau_bo *pb = chan->push.buffer;

	int ip = (chan->dma.ib_put * 2) + chan->dma.ib_base;



	BUG_ON(chan->dma.ib_free < 1);

	WARN_ON(length > NV50_DMA_PUSH_MAX_LENGTH);



	nouveau_bo_wr32(pb, ip++, lower_32_bits(offset));

	nouveau_bo_wr32(pb, ip++, upper_32_bits(offset) | length << 8);

	nouveau_bo_wr32(pb, ip++, upper_32_bits(offset) | length << 8 |

			(no_prefetch ? (1 << 31) : 0));



	chan->dma.ib_put = (chan->dma.ib_put + 1) & chan->dma.ib_max;

drivers/gpu/drm/nouveau/nouveau_dma.h

+6 −2
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
#include "nouveau_chan.h"



int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);

void nv50_dma_push(struct nouveau_channel *, u64 addr, int length);

void nv50_dma_push(struct nouveau_channel *, u64 addr, u32 length,

		   bool no_prefetch);



/*

 * There's a hw race condition where you can't jump to your PUT offset,
@@ -45,6 +46,9 @@ void nv50_dma_push(struct nouveau_channel *, u64 addr, int length); 
 */

#define NOUVEAU_DMA_SKIPS (128 / 4)



/* Maximum push buffer size. */

#define NV50_DMA_PUSH_MAX_LENGTH 0x7fffff



/* Object handles - for stuff that's doesn't use handle == oclass. */

enum {

	NvDmaFB		= 0x80000002,
@@ -89,7 +93,7 @@ FIRE_RING(struct nouveau_channel *chan) 


	if (chan->dma.ib_max) {

		nv50_dma_push(chan, chan->push.addr + (chan->dma.put << 2),

			      (chan->dma.cur - chan->dma.put) << 2);

			      (chan->dma.cur - chan->dma.put) << 2, false);

	} else {

		WRITE_PUT(chan->dma.cur);

	}

drivers/gpu/drm/nouveau/nouveau_exec.c

+16 −3
Original line number Diff line number Diff line
@@ -164,8 +164,10 @@ nouveau_exec_job_run(struct nouveau_job *job) 
	}



	for (i = 0; i < exec_job->push.count; i++) {

		nv50_dma_push(chan, exec_job->push.s[i].va,

			      exec_job->push.s[i].va_len);

		struct drm_nouveau_exec_push *p = &exec_job->push.s[i];

		bool no_prefetch = p->flags & DRM_NOUVEAU_EXEC_PUSH_NO_PREFETCH;



		nv50_dma_push(chan, p->va, p->va_len, no_prefetch);

	}



	ret = nouveau_fence_emit(fence, chan);
@@ -223,7 +225,18 @@ nouveau_exec_job_init(struct nouveau_exec_job **pjob, 
{

	struct nouveau_exec_job *job;

	struct nouveau_job_args args = {};

	int ret;

	int i, ret;



	for (i = 0; i < __args->push.count; i++) {

		struct drm_nouveau_exec_push *p = &__args->push.s[i];



		if (unlikely(p->va_len > NV50_DMA_PUSH_MAX_LENGTH)) {

			NV_PRINTK(err, nouveau_cli(__args->file_priv),

				  "pushbuf size exceeds limit: 0x%x max 0x%x\n",

				  p->va_len, NV50_DMA_PUSH_MAX_LENGTH);

			return -EINVAL;

		}

	}



	job = *pjob = kzalloc(sizeof(*job), GFP_KERNEL);

	if (!job)

drivers/gpu/drm/nouveau/nouveau_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -856,9 +856,11 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
		for (i = 0; i < req->nr_push; i++) {

			struct nouveau_vma *vma = (void *)(unsigned long)

				bo[push[i].bo_index].user_priv;

			u64 addr = vma->addr + push[i].offset;

			u32 length = push[i].length & ~NOUVEAU_GEM_PUSHBUF_NO_PREFETCH;

			bool no_prefetch = push[i].length & NOUVEAU_GEM_PUSHBUF_NO_PREFETCH;



			nv50_dma_push(chan, vma->addr + push[i].offset,

				      push[i].length);

			nv50_dma_push(chan, addr, length, no_prefetch);

		}

	} else

	if (drm->client.device.info.chipset >= 0x25) {