Commit 55fb74ad authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm/nouveau: embed gem object in nouveau_bo 



There is no reason to keep the gem object separately allocated. nouveau is
the last user of gem_obj->driver_private, so if we embed it, we can get
rid of 8bytes per gem-object.

The implementation follows the radeon driver. bo->gem is only valid, iff
the bo was created via the gem helpers _and_ iff the user holds a valid
gem reference. That is, as the gem object holds a reference to the
nouveau_bo. If you use nouveau_ref() to gain a bo reference, you are not
guaranteed to also hold a gem reference. The gem object might get
destroyed after the last user drops the gem-ref via
drm_gem_object_unreference(). Use drm_gem_object_reference() to gain a
gem-reference.

For debugging, we can use bo->gem.filp != NULL to test whether a gem-bo is
valid. However, this shouldn't be used for real functionality to avoid
gem-internal dependencies.

Note that the implementation follows the previous style. However, we no
longer can check for bo->gem != NULL to test for a valid gem object. This
wasn't done before, so we should be safe now.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 51bbd276

drivers/gpu/drm/nouveau/nouveau_abi16.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, 
	if (chan->ntfy) {

		nouveau_bo_vma_del(chan->ntfy, &chan->ntfy_vma);

		nouveau_bo_unpin(chan->ntfy);

		drm_gem_object_unreference_unlocked(chan->ntfy->gem);

		drm_gem_object_unreference_unlocked(&chan->ntfy->gem);

	}



	if (chan->heap.block_size)
@@ -320,7 +320,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) 
			goto done;

	}



	ret = drm_gem_handle_create(file_priv, chan->ntfy->gem,

	ret = drm_gem_handle_create(file_priv, &chan->ntfy->gem,

				    &init->notifier_handle);

	if (ret)

		goto done;

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) 
	struct drm_device *dev = drm->dev;

	struct nouveau_bo *nvbo = nouveau_bo(bo);



	if (unlikely(nvbo->gem))

	if (unlikely(nvbo->gem.filp))

		DRM_ERROR("bo %p still attached to GEM object\n", bo);

	WARN_ON(nvbo->pin_refcnt > 0);

	nv10_bo_put_tile_region(dev, nvbo->tile, NULL);
@@ -1267,7 +1267,7 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) 
{

	struct nouveau_bo *nvbo = nouveau_bo(bo);



	return drm_vma_node_verify_access(&nvbo->gem->vma_node, filp);

	return drm_vma_node_verify_access(&nvbo->gem.vma_node, filp);

}



static int

drivers/gpu/drm/nouveau/nouveau_bo.h

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ struct nouveau_bo { 
	u32 tile_flags;

	struct nouveau_drm_tile *tile;



	struct drm_gem_object *gem;

	/* Only valid if allocated via nouveau_gem_new() and iff you hold a

	 * gem reference to it! For debugging, use gem.filp != NULL to test

	 * whether it is valid. */

	struct drm_gem_object gem;



	/* protect by the ttm reservation lock */

	int pin_refcnt;

drivers/gpu/drm/nouveau/nouveau_display.c

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) 
	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);



	if (fb->nvbo)

		drm_gem_object_unreference_unlocked(fb->nvbo->gem);

		drm_gem_object_unreference_unlocked(&fb->nvbo->gem);



	drm_framebuffer_cleanup(drm_fb);

	kfree(fb);
@@ -63,7 +63,7 @@ nouveau_user_framebuffer_create_handle(struct drm_framebuffer *drm_fb, 
{

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);



	return drm_gem_handle_create(file_priv, fb->nvbo->gem, handle);

	return drm_gem_handle_create(file_priv, &fb->nvbo->gem, handle);

}



static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = {
@@ -674,8 +674,8 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev, 
	if (ret)

		return ret;



	ret = drm_gem_handle_create(file_priv, bo->gem, &args->handle);

	drm_gem_object_unreference_unlocked(bo->gem);

	ret = drm_gem_handle_create(file_priv, &bo->gem, &args->handle);

	drm_gem_object_unreference_unlocked(&bo->gem);

	return ret;

}
@@ -688,7 +688,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv, 


	gem = drm_gem_object_lookup(dev, file_priv, handle);

	if (gem) {

		struct nouveau_bo *bo = gem->driver_private;

		struct nouveau_bo *bo = nouveau_gem_object(gem);

		*poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);

		drm_gem_object_unreference_unlocked(gem);

		return 0;

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon) 
		nouveau_bo_unmap(nouveau_fb->nvbo);

		nouveau_bo_vma_del(nouveau_fb->nvbo, &nouveau_fb->vma);

		nouveau_bo_unpin(nouveau_fb->nvbo);

		drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);

		drm_gem_object_unreference_unlocked(&nouveau_fb->nvbo->gem);

		nouveau_fb->nvbo = NULL;

	}

	drm_fb_helper_fini(&fbcon->helper);

CRA Git | Maintained and supported by SUSTech CRA and CCSE