geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: drm_intel_bo_gem_create_from_* on platforms w/o HW tiling 

Platforms without a HW detiler doesn't support the get_tiling IOCTL.
Fix the drm_intel_bo_gem_create_from_* functions assuming the default
no-tiling, no-swizzling setting for the GEM buffer in this case.

v2:
- Add the missing gem handle IOCTL parameter. (Eric)

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
main
Imre Deak 2020-01-22 11:31:22 +02:00
parent 074947ee4b
commit 933729720b
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
intel/intel_bufmgr_gem.c
View File

@ -1069,6 +1069,28 @@ check_bo_alloc_userptr(drm_intel_bufmgr *bufmgr,
tiling_mode, stride, size, flags); tiling_mode, stride, size, flags);
} }
static int get_tiling_mode(drm_intel_bufmgr_gem *bufmgr_gem,
uint32_t gem_handle,
uint32_t *tiling_mode,
uint32_t *swizzle_mode)
{
struct drm_i915_gem_get_tiling get_tiling = {
.handle = gem_handle,
};
int ret;
ret = drmIoctl(bufmgr_gem->fd,
DRM_IOCTL_I915_GEM_GET_TILING,
&get_tiling);
if (ret != 0 && errno != EOPNOTSUPP)
return ret;
*tiling_mode = get_tiling.tiling_mode;
*swizzle_mode = get_tiling.swizzle_mode;
return 0;
}
/** /**
* Returns a drm_intel_bo wrapping the given buffer object handle. * Returns a drm_intel_bo wrapping the given buffer object handle.
* *
@ -1084,7 +1106,6 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
drm_intel_bo_gem *bo_gem; drm_intel_bo_gem *bo_gem;
int ret; int ret;
struct drm_gem_open open_arg; struct drm_gem_open open_arg;
struct drm_i915_gem_get_tiling get_tiling;
/* At the moment most applications only have a few named bo. /* At the moment most applications only have a few named bo.
* For instance, in a DRI client only the render buffers passed * For instance, in a DRI client only the render buffers passed
@ -1146,16 +1167,11 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
HASH_ADD(name_hh, bufmgr_gem->name_table, HASH_ADD(name_hh, bufmgr_gem->name_table,
global_name, sizeof(bo_gem->global_name), bo_gem); global_name, sizeof(bo_gem->global_name), bo_gem);
memclear(get_tiling); ret = get_tiling_mode(bufmgr_gem, bo_gem->gem_handle,
get_tiling.handle = bo_gem->gem_handle; &bo_gem->tiling_mode, &bo_gem->swizzle_mode);
ret = drmIoctl(bufmgr_gem->fd,
DRM_IOCTL_I915_GEM_GET_TILING,
&get_tiling);
if (ret != 0) if (ret != 0)
goto err_unref; goto err_unref;
bo_gem->tiling_mode = get_tiling.tiling_mode;
bo_gem->swizzle_mode = get_tiling.swizzle_mode;
/* XXX stride is unknown */ /* XXX stride is unknown */
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);
DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name); DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
@ -2634,7 +2650,6 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
int ret; int ret;
uint32_t handle; uint32_t handle;
drm_intel_bo_gem *bo_gem; drm_intel_bo_gem *bo_gem;
struct drm_i915_gem_get_tiling get_tiling;
pthread_mutex_lock(&bufmgr_gem->lock); pthread_mutex_lock(&bufmgr_gem->lock);
ret = drmPrimeFDToHandle(bufmgr_gem->fd, prime_fd, &handle); ret = drmPrimeFDToHandle(bufmgr_gem->fd, prime_fd, &handle);
@ -2688,15 +2703,11 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
bo_gem->has_error = false; bo_gem->has_error = false;
bo_gem->reusable = false; bo_gem->reusable = false;
memclear(get_tiling); ret = get_tiling_mode(bufmgr_gem, handle,
get_tiling.handle = bo_gem->gem_handle; &bo_gem->tiling_mode, &bo_gem->swizzle_mode);
if (drmIoctl(bufmgr_gem->fd, if (ret)
DRM_IOCTL_I915_GEM_GET_TILING,
&get_tiling))
goto err; goto err;
bo_gem->tiling_mode = get_tiling.tiling_mode;
bo_gem->swizzle_mode = get_tiling.swizzle_mode;
/* XXX stride is unknown */ /* XXX stride is unknown */
drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0); drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem, 0);