drm/vmwgfx: Refactor vmw_gb_surface_define_ioctl()
Refactored vmw_gb_surface_define_ioctl() and made the surface definition part a separate function. This way other parts of vmwgfx can use it to allocate kernel-visible GB surfaces. Signed-off-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
parent
7b64115fc7
commit
233826a748
|
@ -1043,6 +1043,15 @@ extern int vmw_surface_check(struct vmw_private *dev_priv,
|
||||||
uint32_t handle, int *id);
|
uint32_t handle, int *id);
|
||||||
extern int vmw_surface_validate(struct vmw_private *dev_priv,
|
extern int vmw_surface_validate(struct vmw_private *dev_priv,
|
||||||
struct vmw_surface *srf);
|
struct vmw_surface *srf);
|
||||||
|
int vmw_surface_gb_priv_define(struct drm_device *dev,
|
||||||
|
uint32_t user_accounting_size,
|
||||||
|
uint32_t svga3d_flags,
|
||||||
|
SVGA3dSurfaceFormat format,
|
||||||
|
bool for_scanout,
|
||||||
|
uint32_t num_mip_levels,
|
||||||
|
uint32_t multisample_count,
|
||||||
|
struct drm_vmw_size size,
|
||||||
|
struct vmw_surface **srf_out);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Shader management - vmwgfx_shader.c
|
* Shader management - vmwgfx_shader.c
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
*
|
*
|
||||||
* Copyright © 2009-2012 VMware, Inc., Palo Alto, CA., USA
|
* Copyright © 2009-2014 VMware, Inc., Palo Alto, CA., USA
|
||||||
* All Rights Reserved.
|
* All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
* @base: The TTM base object handling user-space visibility.
|
* @base: The TTM base object handling user-space visibility.
|
||||||
* @srf: The surface metadata.
|
* @srf: The surface metadata.
|
||||||
* @size: TTM accounting size for the surface.
|
* @size: TTM accounting size for the surface.
|
||||||
* @master: master of the creating client. Used for security check.
|
* @master: master of the creating client. Used for security check.
|
||||||
*/
|
*/
|
||||||
struct vmw_user_surface {
|
struct vmw_user_surface {
|
||||||
struct ttm_prime_object prime;
|
struct ttm_prime_object prime;
|
||||||
|
@ -1218,6 +1218,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* vmw_gb_surface_define_ioctl - Ioctl function implementing
|
* vmw_gb_surface_define_ioctl - Ioctl function implementing
|
||||||
* the user surface define functionality.
|
* the user surface define functionality.
|
||||||
|
@ -1241,77 +1242,43 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
|
||||||
struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
|
struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
|
||||||
int ret;
|
int ret;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
const struct svga3d_surface_desc *desc;
|
|
||||||
uint32_t backup_handle;
|
uint32_t backup_handle;
|
||||||
|
|
||||||
|
|
||||||
if (unlikely(vmw_user_surface_size == 0))
|
if (unlikely(vmw_user_surface_size == 0))
|
||||||
vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +
|
vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +
|
||||||
128;
|
128;
|
||||||
|
|
||||||
size = vmw_user_surface_size + 128;
|
size = vmw_user_surface_size + 128;
|
||||||
|
|
||||||
desc = svga3dsurface_get_desc(req->format);
|
/* Define a surface based on the parameters. */
|
||||||
if (unlikely(desc->block_desc == SVGA3DBLOCKDESC_NONE)) {
|
ret = vmw_surface_gb_priv_define(dev,
|
||||||
DRM_ERROR("Invalid surface format for surface creation.\n");
|
size,
|
||||||
return -EINVAL;
|
req->svga3d_flags,
|
||||||
}
|
req->format,
|
||||||
|
req->drm_surface_flags & drm_vmw_surface_flag_scanout,
|
||||||
|
req->mip_levels,
|
||||||
|
req->multisample_count,
|
||||||
|
req->base_size,
|
||||||
|
&srf);
|
||||||
|
if (unlikely(ret != 0))
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
user_srf = container_of(srf, struct vmw_user_surface, srf);
|
||||||
|
if (drm_is_primary_client(file_priv))
|
||||||
|
user_srf->master = drm_master_get(file_priv->master);
|
||||||
|
|
||||||
ret = ttm_read_lock(&dev_priv->reservation_sem, true);
|
ret = ttm_read_lock(&dev_priv->reservation_sem, true);
|
||||||
if (unlikely(ret != 0))
|
if (unlikely(ret != 0))
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = ttm_mem_global_alloc(vmw_mem_glob(dev_priv),
|
res = &user_srf->srf.res;
|
||||||
size, false, true);
|
|
||||||
if (unlikely(ret != 0)) {
|
|
||||||
if (ret != -ERESTARTSYS)
|
|
||||||
DRM_ERROR("Out of graphics memory for surface"
|
|
||||||
" creation.\n");
|
|
||||||
goto out_unlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);
|
|
||||||
if (unlikely(user_srf == NULL)) {
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto out_no_user_srf;
|
|
||||||
}
|
|
||||||
|
|
||||||
srf = &user_srf->srf;
|
if (req->buffer_handle != SVGA3D_INVALID_ID)
|
||||||
res = &srf->res;
|
|
||||||
|
|
||||||
srf->flags = req->svga3d_flags;
|
|
||||||
srf->format = req->format;
|
|
||||||
srf->scanout = req->drm_surface_flags & drm_vmw_surface_flag_scanout;
|
|
||||||
srf->mip_levels[0] = req->mip_levels;
|
|
||||||
srf->num_sizes = 1;
|
|
||||||
srf->sizes = NULL;
|
|
||||||
srf->offsets = NULL;
|
|
||||||
user_srf->size = size;
|
|
||||||
srf->base_size = req->base_size;
|
|
||||||
srf->autogen_filter = SVGA3D_TEX_FILTER_NONE;
|
|
||||||
srf->multisample_count = req->multisample_count;
|
|
||||||
res->backup_size = svga3dsurface_get_serialized_size
|
|
||||||
(srf->format, srf->base_size, srf->mip_levels[0],
|
|
||||||
srf->flags & SVGA3D_SURFACE_CUBEMAP);
|
|
||||||
|
|
||||||
user_srf->prime.base.shareable = false;
|
|
||||||
user_srf->prime.base.tfile = NULL;
|
|
||||||
if (drm_is_primary_client(file_priv))
|
|
||||||
user_srf->master = drm_master_get(file_priv->master);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* From this point, the generic resource management functions
|
|
||||||
* destroy the object on failure.
|
|
||||||
*/
|
|
||||||
|
|
||||||
ret = vmw_surface_init(dev_priv, srf, vmw_user_surface_free);
|
|
||||||
if (unlikely(ret != 0))
|
|
||||||
goto out_unlock;
|
|
||||||
|
|
||||||
if (req->buffer_handle != SVGA3D_INVALID_ID) {
|
|
||||||
ret = vmw_user_dmabuf_lookup(tfile, req->buffer_handle,
|
ret = vmw_user_dmabuf_lookup(tfile, req->buffer_handle,
|
||||||
&res->backup);
|
&res->backup);
|
||||||
} else if (req->drm_surface_flags &
|
else if (req->drm_surface_flags & drm_vmw_surface_flag_create_buffer)
|
||||||
drm_vmw_surface_flag_create_buffer)
|
|
||||||
ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
|
ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
|
||||||
res->backup_size,
|
res->backup_size,
|
||||||
req->drm_surface_flags &
|
req->drm_surface_flags &
|
||||||
|
@ -1324,7 +1291,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp = vmw_resource_reference(&srf->res);
|
tmp = vmw_resource_reference(res);
|
||||||
ret = ttm_prime_object_init(tfile, res->backup_size, &user_srf->prime,
|
ret = ttm_prime_object_init(tfile, res->backup_size, &user_srf->prime,
|
||||||
req->drm_surface_flags &
|
req->drm_surface_flags &
|
||||||
drm_vmw_surface_flag_shareable,
|
drm_vmw_surface_flag_shareable,
|
||||||
|
@ -1337,7 +1304,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
rep->handle = user_srf->prime.base.hash.key;
|
rep->handle = user_srf->prime.base.hash.key;
|
||||||
rep->backup_size = res->backup_size;
|
rep->backup_size = res->backup_size;
|
||||||
if (res->backup) {
|
if (res->backup) {
|
||||||
rep->buffer_map_handle =
|
rep->buffer_map_handle =
|
||||||
|
@ -1352,10 +1319,6 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
|
||||||
|
|
||||||
vmw_resource_unreference(&res);
|
vmw_resource_unreference(&res);
|
||||||
|
|
||||||
ttm_read_unlock(&dev_priv->reservation_sem);
|
|
||||||
return 0;
|
|
||||||
out_no_user_srf:
|
|
||||||
ttm_mem_global_free(vmw_mem_glob(dev_priv), size);
|
|
||||||
out_unlock:
|
out_unlock:
|
||||||
ttm_read_unlock(&dev_priv->reservation_sem);
|
ttm_read_unlock(&dev_priv->reservation_sem);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1429,3 +1392,113 @@ out_bad_resource:
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* vmw_surface_gb_priv_define - Define a private GB surface
|
||||||
|
*
|
||||||
|
* @dev: Pointer to a struct drm_device
|
||||||
|
* @user_accounting_size: Used to track user-space memory usage, set
|
||||||
|
* to 0 for kernel mode only memory
|
||||||
|
* @svga3d_flags: SVGA3d surface flags for the device
|
||||||
|
* @format: requested surface format
|
||||||
|
* @for_scanout: true if inteded to be used for scanout buffer
|
||||||
|
* @num_mip_levels: number of MIP levels
|
||||||
|
* @multisample_count:
|
||||||
|
* @size: width, heigh, depth of the surface requested
|
||||||
|
* @user_srf_out: allocated user_srf. Set to NULL on failure.
|
||||||
|
*
|
||||||
|
* GB surfaces allocated by this function will not have a user mode handle, and
|
||||||
|
* thus will only be visible to vmwgfx. For optimization reasons the
|
||||||
|
* surface may later be given a user mode handle by another function to make
|
||||||
|
* it available to user mode drivers.
|
||||||
|
*/
|
||||||
|
int vmw_surface_gb_priv_define(struct drm_device *dev,
|
||||||
|
uint32_t user_accounting_size,
|
||||||
|
uint32_t svga3d_flags,
|
||||||
|
SVGA3dSurfaceFormat format,
|
||||||
|
bool for_scanout,
|
||||||
|
uint32_t num_mip_levels,
|
||||||
|
uint32_t multisample_count,
|
||||||
|
struct drm_vmw_size size,
|
||||||
|
struct vmw_surface **srf_out)
|
||||||
|
{
|
||||||
|
struct vmw_private *dev_priv = vmw_priv(dev);
|
||||||
|
struct vmw_user_surface *user_srf;
|
||||||
|
struct vmw_surface *srf;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
|
||||||
|
*srf_out = NULL;
|
||||||
|
|
||||||
|
if (for_scanout) {
|
||||||
|
if (!svga3dsurface_is_screen_target_format(format)) {
|
||||||
|
DRM_ERROR("Invalid Screen Target surface format.");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const struct svga3d_surface_desc *desc;
|
||||||
|
|
||||||
|
desc = svga3dsurface_get_desc(format);
|
||||||
|
if (unlikely(desc->block_desc == SVGA3DBLOCKDESC_NONE)) {
|
||||||
|
DRM_ERROR("Invalid surface format.\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = ttm_read_lock(&dev_priv->reservation_sem, true);
|
||||||
|
if (unlikely(ret != 0))
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = ttm_mem_global_alloc(vmw_mem_glob(dev_priv),
|
||||||
|
user_accounting_size, false, true);
|
||||||
|
if (unlikely(ret != 0)) {
|
||||||
|
if (ret != -ERESTARTSYS)
|
||||||
|
DRM_ERROR("Out of graphics memory for surface"
|
||||||
|
" creation.\n");
|
||||||
|
goto out_unlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);
|
||||||
|
if (unlikely(user_srf == NULL)) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto out_no_user_srf;
|
||||||
|
}
|
||||||
|
|
||||||
|
*srf_out = &user_srf->srf;
|
||||||
|
user_srf->size = user_accounting_size;
|
||||||
|
user_srf->prime.base.shareable = false;
|
||||||
|
user_srf->prime.base.tfile = NULL;
|
||||||
|
|
||||||
|
srf = &user_srf->srf;
|
||||||
|
srf->flags = svga3d_flags;
|
||||||
|
srf->format = format;
|
||||||
|
srf->scanout = for_scanout;
|
||||||
|
srf->mip_levels[0] = num_mip_levels;
|
||||||
|
srf->num_sizes = 1;
|
||||||
|
srf->sizes = NULL;
|
||||||
|
srf->offsets = NULL;
|
||||||
|
srf->base_size = size;
|
||||||
|
srf->autogen_filter = SVGA3D_TEX_FILTER_NONE;
|
||||||
|
srf->multisample_count = multisample_count;
|
||||||
|
|
||||||
|
srf->res.backup_size = svga3dsurface_get_serialized_size(srf->format,
|
||||||
|
srf->base_size,
|
||||||
|
srf->mip_levels[0],
|
||||||
|
srf->flags & SVGA3D_SURFACE_CUBEMAP);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* From this point, the generic resource management functions
|
||||||
|
* destroy the object on failure.
|
||||||
|
*/
|
||||||
|
ret = vmw_surface_init(dev_priv, srf, vmw_user_surface_free);
|
||||||
|
|
||||||
|
ttm_read_unlock(&dev_priv->reservation_sem);
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
out_no_user_srf:
|
||||||
|
ttm_mem_global_free(vmw_mem_glob(dev_priv), user_accounting_size);
|
||||||
|
|
||||||
|
out_unlock:
|
||||||
|
ttm_read_unlock(&dev_priv->reservation_sem);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue