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

drm/i915: no more agp for gem

Browse Source 
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Daniel Vetter
2010-11-06 12:12:35 +01:00
committed by Chris Wilson
parent 4080775b60
commit 185cbcb304
2 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -791,11 +791,14 @@ struct drm_i915_gem_object {
unsigned int fault_mappable : 1; unsigned int fault_mappable : 1;
unsigned int pin_mappable : 1; unsigned int pin_mappable : 1;
/** AGP memory structure for our GTT binding. */
DRM_AGP_MEM *agp_mem;
struct page **pages; struct page **pages;
/**
* DMAR support
*/
struct scatterlist *sg_list;
int num_sg;
/** /**
* Current offset of the object in GTT space. * Current offset of the object in GTT space.
* *

63
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@@ -33,15 +33,24 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv; struct drm_i915_gem_object *obj_priv;
int ret;
list_for_each_entry(obj_priv, list_for_each_entry(obj_priv,
&dev_priv->mm.gtt_list, &dev_priv->mm.gtt_list,
gtt_list) { gtt_list) {
/* Hack to force agp to reinsert buffer object. */ if (dev_priv->mm.gtt->needs_dmar) {
obj_priv->agp_mem->is_bound = false; BUG_ON(!obj_priv->sg_list);
ret = agp_bind_memory(obj_priv->agp_mem, obj_priv->gtt_space->start / PAGE_SIZE);
BUG_ON(ret != 0); intel_gtt_insert_sg_entries(obj_priv->sg_list,
obj_priv->num_sg,
obj_priv->gtt_space->start
>> PAGE_SHIFT,
obj_priv->agp_type);
} else
intel_gtt_insert_pages(obj_priv->gtt_space->start
>> PAGE_SHIFT,
obj_priv->base.size >> PAGE_SHIFT,
obj_priv->pages,
obj_priv->agp_type);
} }
/* Be paranoid and flush the chipset cache. */ /* Be paranoid and flush the chipset cache. */
@@ -51,27 +60,43 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
int i915_gem_gtt_bind_object(struct drm_gem_object *obj) int i915_gem_gtt_bind_object(struct drm_gem_object *obj)
{ {
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
int ret;
/* Create an AGP memory structure pointing at our pages, and bind it if (dev_priv->mm.gtt->needs_dmar) {
* into the GTT. ret = intel_gtt_map_memory(obj_priv->pages,
*/ obj->size >> PAGE_SHIFT,
obj_priv->agp_mem = drm_agp_bind_pages(dev, &obj_priv->sg_list,
obj_priv->pages, &obj_priv->num_sg);
obj->size >> PAGE_SHIFT, if (ret != 0)
obj_priv->gtt_space->start, return ret;
obj_priv->agp_type);
if (obj_priv->agp_mem) intel_gtt_insert_sg_entries(obj_priv->sg_list, obj_priv->num_sg,
return 0; obj_priv->gtt_space->start
else >> PAGE_SHIFT,
return -ENOMEM; obj_priv->agp_type);
} else
intel_gtt_insert_pages(obj_priv->gtt_space->start >> PAGE_SHIFT,
obj->size >> PAGE_SHIFT,
obj_priv->pages,
obj_priv->agp_type);
return 0;
} }
void i915_gem_gtt_unbind_object(struct drm_gem_object *obj) void i915_gem_gtt_unbind_object(struct drm_gem_object *obj)
{ {
struct drm_device *dev = obj->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
drm_unbind_agp(obj_priv->agp_mem); if (dev_priv->mm.gtt->needs_dmar) {
drm_free_agp(obj_priv->agp_mem, obj->size / PAGE_SIZE); intel_gtt_unmap_memory(obj_priv->sg_list, obj_priv->num_sg);
obj_priv->sg_list = NULL;
obj_priv->num_sg = 0;
}
intel_gtt_clear_range(obj_priv->gtt_space->start >> PAGE_SHIFT,
obj->size >> PAGE_SHIFT);
} }