55fb74adc6
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: David Herrmann <dh.herrmann@gmail.com> Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
105 lines
2.9 KiB
C
105 lines
2.9 KiB
C
/*
|
|
* Copyright 2011 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Dave Airlie
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include "nouveau_drm.h"
|
|
#include "nouveau_gem.h"
|
|
|
|
struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj)
|
|
{
|
|
struct nouveau_bo *nvbo = nouveau_gem_object(obj);
|
|
int npages = nvbo->bo.num_pages;
|
|
|
|
return drm_prime_pages_to_sg(nvbo->bo.ttm->pages, npages);
|
|
}
|
|
|
|
void *nouveau_gem_prime_vmap(struct drm_gem_object *obj)
|
|
{
|
|
struct nouveau_bo *nvbo = nouveau_gem_object(obj);
|
|
int ret;
|
|
|
|
ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.num_pages,
|
|
&nvbo->dma_buf_vmap);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
|
|
return nvbo->dma_buf_vmap.virtual;
|
|
}
|
|
|
|
void nouveau_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
|
|
{
|
|
struct nouveau_bo *nvbo = nouveau_gem_object(obj);
|
|
|
|
ttm_bo_kunmap(&nvbo->dma_buf_vmap);
|
|
}
|
|
|
|
struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,
|
|
size_t size,
|
|
struct sg_table *sg)
|
|
{
|
|
struct nouveau_bo *nvbo;
|
|
u32 flags = 0;
|
|
int ret;
|
|
|
|
flags = TTM_PL_FLAG_TT;
|
|
|
|
ret = nouveau_bo_new(dev, size, 0, flags, 0, 0,
|
|
sg, &nvbo);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
|
|
nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART;
|
|
|
|
/* Initialize the embedded gem-object. We return a single gem-reference
|
|
* to the caller, instead of a normal nouveau_bo ttm reference. */
|
|
ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size);
|
|
if (ret) {
|
|
nouveau_bo_ref(NULL, &nvbo);
|
|
return ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
return &nvbo->gem;
|
|
}
|
|
|
|
int nouveau_gem_prime_pin(struct drm_gem_object *obj)
|
|
{
|
|
struct nouveau_bo *nvbo = nouveau_gem_object(obj);
|
|
int ret;
|
|
|
|
/* pin buffer into GTT */
|
|
ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_TT);
|
|
if (ret)
|
|
return -EINVAL;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void nouveau_gem_prime_unpin(struct drm_gem_object *obj)
|
|
{
|
|
struct nouveau_bo *nvbo = nouveau_gem_object(obj);
|
|
|
|
nouveau_bo_unpin(nvbo);
|
|
}
|