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

Commit be91bfeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/nouveau: allocate kernel's notifier object at end of block
parents e9e3d724 73412c38

drivers/gpu/drm/nouveau/nouveau_dma.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,8 @@ nouveau_dma_init(struct nouveau_channel *chan) 
		return ret;

		return ret;





	/* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */

	/* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */

	ret = nouveau_notifier_alloc(chan, NvNotify0, 32, &chan->m2mf_ntfy);

	ret = nouveau_notifier_alloc(chan, NvNotify0, 32, 0xfd0, 0x1000,

				     &chan->m2mf_ntfy);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/gpu/drm/nouveau/nouveau_drv.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -852,7 +852,8 @@ extern const struct ttm_mem_type_manager_func nouveau_vram_manager; 
extern int  nouveau_notifier_init_channel(struct nouveau_channel *);

extern int  nouveau_notifier_init_channel(struct nouveau_channel *);

extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);

extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);

extern int  nouveau_notifier_alloc(struct nouveau_channel *, uint32_t handle,

extern int  nouveau_notifier_alloc(struct nouveau_channel *, uint32_t handle,

				   int cout, uint32_t *offset);

				   int cout, uint32_t start, uint32_t end,

				   uint32_t *offset);

extern int  nouveau_notifier_offset(struct nouveau_gpuobj *, uint32_t *);

extern int  nouveau_notifier_offset(struct nouveau_gpuobj *, uint32_t *);

extern int  nouveau_ioctl_notifier_alloc(struct drm_device *, void *data,

extern int  nouveau_ioctl_notifier_alloc(struct drm_device *, void *data,

					 struct drm_file *);

					 struct drm_file *);

drivers/gpu/drm/nouveau/nouveau_notifier.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -96,7 +96,8 @@ nouveau_notifier_gpuobj_dtor(struct drm_device *dev, 




int

int

nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,

nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,

		       int size, uint32_t *b_offset)

		       int size, uint32_t start, uint32_t end,

		       uint32_t *b_offset)

{

{

	struct drm_device *dev = chan->dev;

	struct drm_device *dev = chan->dev;

	struct nouveau_gpuobj *nobj = NULL;

	struct nouveau_gpuobj *nobj = NULL;
@@ -104,9 +105,10 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle, 
	uint32_t offset;

	uint32_t offset;

	int target, ret;

	int target, ret;





	mem = drm_mm_search_free(&chan->notifier_heap, size, 0, 0);

	mem = drm_mm_search_free_in_range(&chan->notifier_heap, size, 0,

					  start, end, 0);

	if (mem)

	if (mem)

		mem = drm_mm_get_block(mem, size, 0);

		mem = drm_mm_get_block_range(mem, size, 0, start, end);

	if (!mem) {

	if (!mem) {

		NV_ERROR(dev, "Channel %d notifier block full\n", chan->id);

		NV_ERROR(dev, "Channel %d notifier block full\n", chan->id);

		return -ENOMEM;

		return -ENOMEM;
@@ -177,7 +179,8 @@ nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data, 
	if (IS_ERR(chan))

	if (IS_ERR(chan))

		return PTR_ERR(chan);

		return PTR_ERR(chan);





	ret = nouveau_notifier_alloc(chan, na->handle, na->size, &na->offset);

	ret = nouveau_notifier_alloc(chan, na->handle, na->size, 0, 0x1000,

				     &na->offset);

	nouveau_channel_put(&chan);

	nouveau_channel_put(&chan);

	return ret;

	return ret;

}
 
}