drm/i915: Getter/setter for object attributes (f343c5f6) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_debugfs.c

+14 −12

Original line number	Diff line number	Diff line
		@@ -122,9 +122,9 @@ describe_obj(struct seq_file m, struct drm_i915_gem_object obj)
		seq_printf(m, " (pinned x %d)", obj->pin_count);
		if (obj->fence_reg != I915_FENCE_REG_NONE)
		seq_printf(m, " (fence: %d)", obj->fence_reg);
		if (obj->gtt_space != NULL)
		seq_printf(m, " (gtt offset: %08x, size: %08x)",
		obj->gtt_offset, (unsigned int)obj->gtt_space->size);
		if (i915_gem_obj_ggtt_bound(obj))
		seq_printf(m, " (gtt offset: %08lx, size: %08x)",
		i915_gem_obj_ggtt_offset(obj), (unsigned int)i915_gem_obj_ggtt_size(obj));
		if (obj->stolen)
		seq_printf(m, " (stolen: %08lx)", obj->stolen->start);
		if (obj->pin_mappable \|\| obj->fault_mappable) {
		@@ -175,7 +175,7 @@ static int i915_gem_object_list_info(struct seq_file m, void data)
		describe_obj(m, obj);
		seq_putc(m, '\n');
		total_obj_size += obj->base.size;
		total_gtt_size += obj->gtt_space->size;
		total_gtt_size += i915_gem_obj_ggtt_size(obj);
		count++;
		}
		mutex_unlock(&dev->struct_mutex);
		@@ -187,10 +187,10 @@ static int i915_gem_object_list_info(struct seq_file m, void data)

		#define count_objects(list, member) do { \
		list_for_each_entry(obj, list, member) { \
		size += obj->gtt_space->size; \
		size += i915_gem_obj_ggtt_size(obj); \
		++count; \
		if (obj->map_and_fenceable) { \
		mappable_size += obj->gtt_space->size; \
		mappable_size += i915_gem_obj_ggtt_size(obj); \
		++mappable_count; \
		} \
		} \
		@@ -209,7 +209,7 @@ static int per_file_stats(int id, void ptr, void data)
		stats->count++;
		stats->total += obj->base.size;

		if (obj->gtt_space) {
		if (i915_gem_obj_ggtt_bound(obj)) {
		if (!list_empty(&obj->ring_list))
		stats->active += obj->base.size;
		else
		@@ -267,11 +267,11 @@ static int i915_gem_object_info(struct seq_file m, void data)
		size = count = mappable_size = mappable_count = 0;
		list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
		if (obj->fault_mappable) {
		size += obj->gtt_space->size;
		size += i915_gem_obj_ggtt_size(obj);
		++count;
		}
		if (obj->pin_mappable) {
		mappable_size += obj->gtt_space->size;
		mappable_size += i915_gem_obj_ggtt_size(obj);
		++mappable_count;
		}
		if (obj->madv == I915_MADV_DONTNEED) {
		@@ -333,7 +333,7 @@ static int i915_gem_gtt_info(struct seq_file m, void data)
		describe_obj(m, obj);
		seq_putc(m, '\n');
		total_obj_size += obj->base.size;
		total_gtt_size += obj->gtt_space->size;
		total_gtt_size += i915_gem_obj_ggtt_size(obj);
		count++;
		}

		@@ -379,12 +379,14 @@ static int i915_gem_pageflip_info(struct seq_file m, void data)
		if (work->old_fb_obj) {
		struct drm_i915_gem_object *obj = work->old_fb_obj;
		if (obj)
		seq_printf(m, "Old framebuffer gtt_offset 0x%08x\n", obj->gtt_offset);
		seq_printf(m, "Old framebuffer gtt_offset 0x%08lx\n",
		i915_gem_obj_ggtt_offset(obj));
		}
		if (work->pending_flip_obj) {
		struct drm_i915_gem_object *obj = work->pending_flip_obj;
		if (obj)
		seq_printf(m, "New framebuffer gtt_offset 0x%08x\n", obj->gtt_offset);
		seq_printf(m, "New framebuffer gtt_offset 0x%08lx\n",
		i915_gem_obj_ggtt_offset(obj));
		}
		}
		spin_unlock_irqrestore(&dev->event_lock, flags);

drivers/gpu/drm/i915/i915_drv.h

+31 −0

Original line number	Diff line number	Diff line
		@@ -1361,6 +1361,37 @@ struct drm_i915_gem_object {

		#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)

		/* Offset of the first PTE pointing to this object */
		static inline unsigned long
		i915_gem_obj_ggtt_offset(struct drm_i915_gem_object *o)
		{
		return o->gtt_space->start;
		}

		/* Whether or not this object is currently mapped by the translation tables */
		static inline bool
		i915_gem_obj_ggtt_bound(struct drm_i915_gem_object *o)
		{
		return o->gtt_space != NULL;
		}

		/* The size used in the translation tables may be larger than the actual size of
		* the object on GEN2/GEN3 because of the way tiling is handled. See
		* i915_gem_get_gtt_size() for more details.
		*/
		static inline unsigned long
		i915_gem_obj_ggtt_size(struct drm_i915_gem_object *o)
		{
		return o->gtt_space->size;
		}

		static inline void
		i915_gem_obj_ggtt_set_color(struct drm_i915_gem_object *o,
		enum i915_cache_level color)
		{
		o->gtt_space->color = color;
		}

		/**
		* Request queue structure.
		*

drivers/gpu/drm/i915/i915_gem.c

+45 −44

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ int i915_mutex_lock_interruptible(struct drm_device *dev)
		static inline bool
		i915_gem_object_is_inactive(struct drm_i915_gem_object *obj)
		{
		return obj->gtt_space && !obj->active;
		return i915_gem_obj_ggtt_bound(obj) && !obj->active;
		}

		int
		@@ -178,7 +178,7 @@ i915_gem_get_aperture_ioctl(struct drm_device dev, void data,
		mutex_lock(&dev->struct_mutex);
		list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list)
		if (obj->pin_count)
		pinned += obj->gtt_space->size;
		pinned += i915_gem_obj_ggtt_size(obj);
		mutex_unlock(&dev->struct_mutex);

		args->aper_size = dev_priv->gtt.total;
		@@ -422,7 +422,7 @@ i915_gem_shmem_pread(struct drm_device *dev,
		* anyway again before the next pread happens. */
		if (obj->cache_level == I915_CACHE_NONE)
		needs_clflush = 1;
		if (obj->gtt_space) {
		if (i915_gem_obj_ggtt_bound(obj)) {
		ret = i915_gem_object_set_to_gtt_domain(obj, false);
		if (ret)
		return ret;
		@@ -609,7 +609,7 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev,
		user_data = to_user_ptr(args->data_ptr);
		remain = args->size;

		offset = obj->gtt_offset + args->offset;
		offset = i915_gem_obj_ggtt_offset(obj) + args->offset;

		while (remain > 0) {
		/* Operation in this page
		@@ -739,7 +739,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
		* right away and we therefore have to clflush anyway. */
		if (obj->cache_level == I915_CACHE_NONE)
		needs_clflush_after = 1;
		if (obj->gtt_space) {
		if (i915_gem_obj_ggtt_bound(obj)) {
		ret = i915_gem_object_set_to_gtt_domain(obj, true);
		if (ret)
		return ret;
		@@ -1360,8 +1360,9 @@ int i915_gem_fault(struct vm_area_struct vma, struct vm_fault vmf)

		obj->fault_mappable = true;

		pfn = ((dev_priv->gtt.mappable_base + obj->gtt_offset) >> PAGE_SHIFT) +
		page_offset;
		pfn = dev_priv->gtt.mappable_base + i915_gem_obj_ggtt_offset(obj);
		pfn >>= PAGE_SHIFT;
		pfn += page_offset;

		/* Finally, remap it using the new GTT offset */
		ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
		@@ -1667,7 +1668,7 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
		if (obj->pages == NULL)
		return 0;

		BUG_ON(obj->gtt_space);
		BUG_ON(i915_gem_obj_ggtt_bound(obj));

		if (obj->pages_pin_count)
		return -EBUSY;
		@@ -2117,8 +2118,8 @@ i915_gem_request_remove_from_client(struct drm_i915_gem_request *request)

		static bool i915_head_inside_object(u32 acthd, struct drm_i915_gem_object *obj)
		{
		if (acthd >= obj->gtt_offset &&
		acthd < obj->gtt_offset + obj->base.size)
		if (acthd >= i915_gem_obj_ggtt_offset(obj) &&
		acthd < i915_gem_obj_ggtt_offset(obj) + obj->base.size)
		return true;

		return false;
		@@ -2176,11 +2177,11 @@ static void i915_set_reset_status(struct intel_ring_buffer *ring,

		if (ring->hangcheck.action != wait &&
		i915_request_guilty(request, acthd, &inside)) {
		DRM_ERROR("%s hung %s bo (0x%x ctx %d) at 0x%x\n",
		DRM_ERROR("%s hung %s bo (0x%lx ctx %d) at 0x%x\n",
		ring->name,
		inside ? "inside" : "flushing",
		request->batch_obj ?
		request->batch_obj->gtt_offset : 0,
		i915_gem_obj_ggtt_offset(request->batch_obj) : 0,
		request->ctx ? request->ctx->id : 0,
		acthd);

		@@ -2592,7 +2593,7 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
		drm_i915_private_t *dev_priv = obj->base.dev->dev_private;
		int ret;

		if (obj->gtt_space == NULL)
		if (!i915_gem_obj_ggtt_bound(obj))
		return 0;

		if (obj->pin_count)
		@@ -2675,11 +2676,11 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,
		}

		if (obj) {
		u32 size = obj->gtt_space->size;
		u32 size = i915_gem_obj_ggtt_size(obj);

		val = (uint64_t)((obj->gtt_offset + size - 4096) &
		val = (uint64_t)((i915_gem_obj_ggtt_offset(obj) + size - 4096) &
		0xfffff000) << 32;
		val \|= obj->gtt_offset & 0xfffff000;
		val \|= i915_gem_obj_ggtt_offset(obj) & 0xfffff000;
		val \|= (uint64_t)((obj->stride / 128) - 1) << fence_pitch_shift;
		if (obj->tiling_mode == I915_TILING_Y)
		val \|= 1 << I965_FENCE_TILING_Y_SHIFT;
		@@ -2699,15 +2700,15 @@ static void i915_write_fence_reg(struct drm_device *dev, int reg,
		u32 val;

		if (obj) {
		u32 size = obj->gtt_space->size;
		u32 size = i915_gem_obj_ggtt_size(obj);
		int pitch_val;
		int tile_width;

		WARN((obj->gtt_offset & ~I915_FENCE_START_MASK) \|\|
		WARN((i915_gem_obj_ggtt_offset(obj) & ~I915_FENCE_START_MASK) \|\|
		(size & -size) != size \|\|
		(obj->gtt_offset & (size - 1)),
		"object 0x%08x [fenceable? %d] not 1M or pot-size (0x%08x) aligned\n",
		obj->gtt_offset, obj->map_and_fenceable, size);
		(i915_gem_obj_ggtt_offset(obj) & (size - 1)),
		"object 0x%08lx [fenceable? %d] not 1M or pot-size (0x%08x) aligned\n",
		i915_gem_obj_ggtt_offset(obj), obj->map_and_fenceable, size);

		if (obj->tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev))
		tile_width = 128;
		@@ -2718,7 +2719,7 @@ static void i915_write_fence_reg(struct drm_device *dev, int reg,
		pitch_val = obj->stride / tile_width;
		pitch_val = ffs(pitch_val) - 1;

		val = obj->gtt_offset;
		val = i915_gem_obj_ggtt_offset(obj);
		if (obj->tiling_mode == I915_TILING_Y)
		val \|= 1 << I830_FENCE_TILING_Y_SHIFT;
		val \|= I915_FENCE_SIZE_BITS(size);
		@@ -2743,19 +2744,19 @@ static void i830_write_fence_reg(struct drm_device *dev, int reg,
		uint32_t val;

		if (obj) {
		u32 size = obj->gtt_space->size;
		u32 size = i915_gem_obj_ggtt_size(obj);
		uint32_t pitch_val;

		WARN((obj->gtt_offset & ~I830_FENCE_START_MASK) \|\|
		WARN((i915_gem_obj_ggtt_offset(obj) & ~I830_FENCE_START_MASK) \|\|
		(size & -size) != size \|\|
		(obj->gtt_offset & (size - 1)),
		"object 0x%08x not 512K or pot-size 0x%08x aligned\n",
		obj->gtt_offset, size);
		(i915_gem_obj_ggtt_offset(obj) & (size - 1)),
		"object 0x%08lx not 512K or pot-size 0x%08x aligned\n",
		i915_gem_obj_ggtt_offset(obj), size);

		pitch_val = obj->stride / 128;
		pitch_val = ffs(pitch_val) - 1;

		val = obj->gtt_offset;
		val = i915_gem_obj_ggtt_offset(obj);
		if (obj->tiling_mode == I915_TILING_Y)
		val \|= 1 << I830_FENCE_TILING_Y_SHIFT;
		val \|= I830_FENCE_SIZE_BITS(size);
		@@ -3044,8 +3045,8 @@ static void i915_gem_verify_gtt(struct drm_device *dev)

		if (obj->cache_level != obj->gtt_space->color) {
		printk(KERN_ERR "object reserved space [%08lx, %08lx] with wrong color, cache_level=%x, color=%lx\n",
		obj->gtt_space->start,
		obj->gtt_space->start + obj->gtt_space->size,
		i915_gem_obj_ggtt_offset(obj),
		i915_gem_obj_ggtt_offset(obj) + i915_gem_obj_ggtt_size(obj),
		obj->cache_level,
		obj->gtt_space->color);
		err++;
		@@ -3056,8 +3057,8 @@ static void i915_gem_verify_gtt(struct drm_device *dev)
		obj->gtt_space,
		obj->cache_level)) {
		printk(KERN_ERR "invalid GTT space found at [%08lx, %08lx] - color=%x\n",
		obj->gtt_space->start,
		obj->gtt_space->start + obj->gtt_space->size,
		i915_gem_obj_ggtt_offset(obj),
		i915_gem_obj_ggtt_offset(obj) + i915_gem_obj_ggtt_size(obj),
		obj->cache_level);
		err++;
		continue;
		@@ -3169,8 +3170,8 @@ search_free:
		node->size == fence_size &&
		(node->start & (fence_alignment - 1)) == 0;

		mappable =
		obj->gtt_offset + obj->base.size <= dev_priv->gtt.mappable_end;
		mappable = i915_gem_obj_ggtt_offset(obj) + obj->base.size <=
		dev_priv->gtt.mappable_end;

		obj->map_and_fenceable = mappable && fenceable;

		@@ -3272,7 +3273,7 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write)
		int ret;

		/* Not valid to be called on unbound objects. */
		if (obj->gtt_space == NULL)
		if (!i915_gem_obj_ggtt_bound(obj))
		return -EINVAL;

		if (obj->base.write_domain == I915_GEM_DOMAIN_GTT)
		@@ -3337,7 +3338,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
		return ret;
		}

		if (obj->gtt_space) {
		if (i915_gem_obj_ggtt_bound(obj)) {
		ret = i915_gem_object_finish_gpu(obj);
		if (ret)
		return ret;
		@@ -3360,7 +3361,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
		i915_ppgtt_bind_object(dev_priv->mm.aliasing_ppgtt,
		obj, cache_level);

		obj->gtt_space->color = cache_level;
		i915_gem_obj_ggtt_set_color(obj, cache_level);
		}

		if (cache_level == I915_CACHE_NONE) {
		@@ -3641,14 +3642,14 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
		if (WARN_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT))
		return -EBUSY;

		if (obj->gtt_space != NULL) {
		if ((alignment && obj->gtt_offset & (alignment - 1)) \|\|
		if (i915_gem_obj_ggtt_bound(obj)) {
		if ((alignment && i915_gem_obj_ggtt_offset(obj) & (alignment - 1)) \|\|
		(map_and_fenceable && !obj->map_and_fenceable)) {
		WARN(obj->pin_count,
		"bo is already pinned with incorrect alignment:"
		" offset=%x, req.alignment=%x, req.map_and_fenceable=%d,"
		" offset=%lx, req.alignment=%x, req.map_and_fenceable=%d,"
		" obj->map_and_fenceable=%d\n",
		obj->gtt_offset, alignment,
		i915_gem_obj_ggtt_offset(obj), alignment,
		map_and_fenceable,
		obj->map_and_fenceable);
		ret = i915_gem_object_unbind(obj);
		@@ -3657,7 +3658,7 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
		}
		}

		if (obj->gtt_space == NULL) {
		if (!i915_gem_obj_ggtt_bound(obj)) {
		struct drm_i915_private *dev_priv = obj->base.dev->dev_private;

		ret = i915_gem_object_bind_to_gtt(obj, alignment,
		@@ -3683,7 +3684,7 @@ void
		i915_gem_object_unpin(struct drm_i915_gem_object *obj)
		{
		BUG_ON(obj->pin_count == 0);
		BUG_ON(obj->gtt_space == NULL);
		BUG_ON(!i915_gem_obj_ggtt_bound(obj));

		if (--obj->pin_count == 0)
		obj->pin_mappable = false;
		@@ -3733,7 +3734,7 @@ i915_gem_pin_ioctl(struct drm_device dev, void data,
		* as the X server doesn't manage domains yet
		*/
		i915_gem_object_flush_cpu_write_domain(obj);
		args->offset = obj->gtt_offset;
		args->offset = i915_gem_obj_ggtt_offset(obj);
		out:
		drm_gem_object_unreference(&obj->base);
		unlock:

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ mi_set_context(struct intel_ring_buffer *ring,

		intel_ring_emit(ring, MI_NOOP);
		intel_ring_emit(ring, MI_SET_CONTEXT);
		intel_ring_emit(ring, new_context->obj->gtt_offset \|
		intel_ring_emit(ring, i915_gem_obj_ggtt_offset(new_context->obj) \|
		MI_MM_SPACE_GTT \|
		MI_SAVE_EXT_STATE_EN \|
		MI_RESTORE_EXT_STATE_EN \|

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,
		return -ENOENT;

		target_i915_obj = to_intel_bo(target_obj);
		target_offset = target_i915_obj->gtt_offset;
		target_offset = i915_gem_obj_ggtt_offset(target_i915_obj);

		/* Sandybridge PPGTT errata: We need a global gtt mapping for MI and
		* pipe_control writes because the gpu doesn't properly redirect them
		@@ -280,7 +280,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,
		return ret;

		/* Map the page containing the relocation we're going to perform. */
		reloc->offset += obj->gtt_offset;
		reloc->offset += i915_gem_obj_ggtt_offset(obj);
		reloc_page = io_mapping_map_atomic_wc(dev_priv->gtt.mappable,
		reloc->offset & PAGE_MASK);
		reloc_entry = (uint32_t __iomem *)
		@@ -436,8 +436,8 @@ i915_gem_execbuffer_reserve_object(struct drm_i915_gem_object *obj,
		obj->has_aliasing_ppgtt_mapping = 1;
		}

		if (entry->offset != obj->gtt_offset) {
		entry->offset = obj->gtt_offset;
		if (entry->offset != i915_gem_obj_ggtt_offset(obj)) {
		entry->offset = i915_gem_obj_ggtt_offset(obj);
		*need_reloc = true;
		}

		@@ -458,7 +458,7 @@ i915_gem_execbuffer_unreserve_object(struct drm_i915_gem_object *obj)
		{
		struct drm_i915_gem_exec_object2 *entry;

		if (!obj->gtt_space)
		if (!i915_gem_obj_ggtt_bound(obj))
		return;

		entry = obj->exec_entry;
		@@ -530,7 +530,7 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,
		struct drm_i915_gem_exec_object2 *entry = obj->exec_entry;
		bool need_fence, need_mappable;

		if (!obj->gtt_space)
		if (!i915_gem_obj_ggtt_bound(obj))
		continue;

		need_fence =
		@@ -539,7 +539,8 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,
		obj->tiling_mode != I915_TILING_NONE;
		need_mappable = need_fence \|\| need_reloc_mappable(obj);

		if ((entry->alignment && obj->gtt_offset & (entry->alignment - 1)) \|\|
		if ((entry->alignment &&
		i915_gem_obj_ggtt_offset(obj) & (entry->alignment - 1)) \|\|
		(need_mappable && !obj->map_and_fenceable))
		ret = i915_gem_object_unbind(obj);
		else
		@@ -550,7 +551,7 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,

		/* Bind fresh objects */
		list_for_each_entry(obj, objects, exec_list) {
		if (obj->gtt_space)
		if (i915_gem_obj_ggtt_bound(obj))
		continue;

		ret = i915_gem_execbuffer_reserve_object(obj, ring, need_relocs);
		@@ -1058,7 +1059,7 @@ i915_gem_do_execbuffer(struct drm_device dev, void data,
		goto err;
		}

		exec_start = batch_obj->gtt_offset + args->batch_start_offset;
		exec_start = i915_gem_obj_ggtt_offset(batch_obj) + args->batch_start_offset;
		exec_len = args->batch_len;
		if (cliprects) {
		for (i = 0; i < args->num_cliprects; i++) {

Admin message