lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915: Remove stored gtt_alignment

Browse Source 
There is no need to store the gtt_alignment as it is either explicitly
set according to the hardware requirements (e.g. scanout) or the
minimum alignment is computed on demand.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Chris Wilson
2009-09-14 16:50:26 +01:00
committed by Jesse Barnes
parent 4960aaca14
commit e67b8ce1b5
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_drv.h
View File

@@ -510,10 +510,7 @@ struct drm_i915_gem_object {
* This is the same as gtt_space->start * This is the same as gtt_space->start
*/ */
uint32_t gtt_offset; uint32_t gtt_offset;
/**
* Required alignment for the object
*/
uint32_t gtt_alignment;
/** /**
* Fake offset for use by mmap(2) * Fake offset for use by mmap(2)
*/ */

14
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -1155,7 +1155,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
/* Now bind it into the GTT if needed */ /* Now bind it into the GTT if needed */
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
if (!obj_priv->gtt_space) { if (!obj_priv->gtt_space) {
ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment); ret = i915_gem_object_bind_to_gtt(obj, 0);
if (ret) { if (ret) {
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
@@ -1398,22 +1398,12 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
args->offset = obj_priv->mmap_offset; args->offset = obj_priv->mmap_offset;
obj_priv->gtt_alignment = i915_gem_get_gtt_alignment(obj);
/* Make sure the alignment is correct for fence regs etc */
if (obj_priv->agp_mem &&
(obj_priv->gtt_offset & (obj_priv->gtt_alignment - 1))) {
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return -EINVAL;
}
/* /*
* Pull it into the GTT so that we have a page list (makes the * Pull it into the GTT so that we have a page list (makes the
* initial fault faster and any subsequent flushing possible). * initial fault faster and any subsequent flushing possible).
*/ */
if (!obj_priv->agp_mem) { if (!obj_priv->agp_mem) {
ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment); ret = i915_gem_object_bind_to_gtt(obj, 0);
if (ret) { if (ret) {
drm_gem_object_unreference(obj); drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);