Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05394f39 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Use drm_i915_gem_object as the preferred type 



A glorified s/obj_priv/obj/ with a net reduction of over a 100 lines and
many characters!

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 185cbcb3

drivers/gpu/drm/i915/i915_debugfs.c

+30 −34
Original line number Diff line number Diff line
@@ -87,19 +87,19 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	return 0;

}



static const char *get_pin_flag(struct drm_i915_gem_object *obj_priv)

static const char *get_pin_flag(struct drm_i915_gem_object *obj)

{

	if (obj_priv->user_pin_count > 0)

	if (obj->user_pin_count > 0)

		return "P";

	else if (obj_priv->pin_count > 0)

	else if (obj->pin_count > 0)

		return "p";

	else

		return " ";

}



static const char *get_tiling_flag(struct drm_i915_gem_object *obj_priv)

static const char *get_tiling_flag(struct drm_i915_gem_object *obj)

{

    switch (obj_priv->tiling_mode) {

    switch (obj->tiling_mode) {

    default:

    case I915_TILING_NONE: return " ";

    case I915_TILING_X: return "X";
@@ -140,7 +140,7 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
	struct list_head *head;

	struct drm_device *dev = node->minor->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj_priv;

	struct drm_i915_gem_object *obj;

	size_t total_obj_size, total_gtt_size;

	int count, ret;
@@ -175,12 +175,12 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
	}



	total_obj_size = total_gtt_size = count = 0;

	list_for_each_entry(obj_priv, head, mm_list) {

	list_for_each_entry(obj, head, mm_list) {

		seq_printf(m, "   ");

		describe_obj(m, obj_priv);

		describe_obj(m, obj);

		seq_printf(m, "\n");

		total_obj_size += obj_priv->base.size;

		total_gtt_size += obj_priv->gtt_space->size;

		total_obj_size += obj->base.size;

		total_gtt_size += obj->gtt_space->size;

		count++;

	}

	mutex_unlock(&dev->struct_mutex);
@@ -251,14 +251,14 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) 
			seq_printf(m, "%d prepares\n", work->pending);



			if (work->old_fb_obj) {

				struct drm_i915_gem_object *obj_priv = to_intel_bo(work->old_fb_obj);

				if(obj_priv)

					seq_printf(m, "Old framebuffer gtt_offset 0x%08x\n", obj_priv->gtt_offset );

				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);

			}

			if (work->pending_flip_obj) {

				struct drm_i915_gem_object *obj_priv = to_intel_bo(work->pending_flip_obj);

				if(obj_priv)

					seq_printf(m, "New framebuffer gtt_offset 0x%08x\n", obj_priv->gtt_offset );

				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);

			}

		}

		spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -421,17 +421,17 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) 
	seq_printf(m, "Reserved fences = %d\n", dev_priv->fence_reg_start);

	seq_printf(m, "Total fences = %d\n", dev_priv->num_fence_regs);

	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_gem_object *obj = dev_priv->fence_regs[i].obj;

		struct drm_i915_gem_object *obj = dev_priv->fence_regs[i].obj;



		seq_printf(m, "Fenced object[%2d] = ", i);

		if (obj == NULL)

			seq_printf(m, "unused");

		else

			describe_obj(m, to_intel_bo(obj));

			describe_obj(m, obj);

		seq_printf(m, "\n");

	}

	mutex_unlock(&dev->struct_mutex);



	mutex_unlock(&dev->struct_mutex);

	return 0;

}
@@ -465,14 +465,14 @@ static int i915_hws_info(struct seq_file *m, void *data) 


static void i915_dump_object(struct seq_file *m,

			     struct io_mapping *mapping,

			     struct drm_i915_gem_object *obj_priv)

			     struct drm_i915_gem_object *obj)

{

	int page, page_count, i;



	page_count = obj_priv->base.size / PAGE_SIZE;

	page_count = obj->base.size / PAGE_SIZE;

	for (page = 0; page < page_count; page++) {

		u32 *mem = io_mapping_map_wc(mapping,

					     obj_priv->gtt_offset + page * PAGE_SIZE);

					     obj->gtt_offset + page * PAGE_SIZE);

		for (i = 0; i < PAGE_SIZE; i += 4)

			seq_printf(m, "%08x :  %08x\n", i, mem[i / 4]);

		io_mapping_unmap(mem);
@@ -484,25 +484,21 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data) 
	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_gem_object *obj;

	struct drm_i915_gem_object *obj_priv;

	struct drm_i915_gem_object *obj;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	list_for_each_entry(obj_priv, &dev_priv->mm.active_list, mm_list) {

		obj = &obj_priv->base;

		if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {

		    seq_printf(m, "--- gtt_offset = 0x%08x\n",

			       obj_priv->gtt_offset);

		    i915_dump_object(m, dev_priv->mm.gtt_mapping, obj_priv);

	list_for_each_entry(obj, &dev_priv->mm.active_list, mm_list) {

		if (obj->base.read_domains & I915_GEM_DOMAIN_COMMAND) {

		    seq_printf(m, "--- gtt_offset = 0x%08x\n", obj->gtt_offset);

		    i915_dump_object(m, dev_priv->mm.gtt_mapping, obj);

		}

	}



	mutex_unlock(&dev->struct_mutex);



	return 0;

}
@@ -525,7 +521,7 @@ static int i915_ringbuffer_data(struct seq_file *m, void *data) 
	if (ret)

		return ret;



	if (!ring->gem_object) {

	if (!ring->obj) {

		seq_printf(m, "No ringbuffer setup\n");

	} else {

		u8 *virt = ring->virtual_start;
@@ -983,7 +979,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) 
		   fb->base.height,

		   fb->base.depth,

		   fb->base.bits_per_pixel);

	describe_obj(m, to_intel_bo(fb->obj));

	describe_obj(m, fb->obj);

	seq_printf(m, "\n");



	list_for_each_entry(fb, &dev->mode_config.fb_list, base.head) {
@@ -995,7 +991,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) 
			   fb->base.height,

			   fb->base.depth,

			   fb->base.bits_per_pixel);

		describe_obj(m, to_intel_bo(fb->obj));

		describe_obj(m, fb->obj);

		seq_printf(m, "\n");

	}

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) 
	}



	if (init->ring_size != 0) {

		if (dev_priv->render_ring.gem_object != NULL) {

		if (dev_priv->render_ring.obj != NULL) {

			i915_dma_cleanup(dev);

			DRM_ERROR("Client tried to initialize ringbuffer in "

				  "GEM mode\n");

drivers/gpu/drm/i915/i915_drv.h

+43 −41
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include "i915_reg.h"

#include "intel_bios.h"

#include "i915_trace.h"

#include "intel_ringbuffer.h"

#include <linux/io-mapping.h>

#include <linux/i2c.h>
@@ -90,7 +89,7 @@ struct drm_i915_gem_phys_object { 
	int id;

	struct page **page_list;

	drm_dma_handle_t *handle;

	struct drm_gem_object *cur_obj;

	struct drm_i915_gem_object *cur_obj;

};



struct mem_block {
@@ -125,7 +124,7 @@ struct drm_i915_master_private { 
#define I915_FENCE_REG_NONE -1



struct drm_i915_fence_reg {

	struct drm_gem_object *obj;

	struct drm_i915_gem_object *obj;

	struct list_head lru_list;

	bool gpu;

};
@@ -280,9 +279,9 @@ typedef struct drm_i915_private { 
	uint32_t counter;

	unsigned int seqno_gfx_addr;

	drm_local_map_t hws_map;

	struct drm_gem_object *seqno_obj;

	struct drm_gem_object *pwrctx;

	struct drm_gem_object *renderctx;

	struct drm_i915_gem_object *seqno_obj;

	struct drm_i915_gem_object *pwrctx;

	struct drm_i915_gem_object *renderctx;



	struct resource mch_res;
@@ -711,7 +710,6 @@ typedef struct drm_i915_private { 
	struct intel_fbdev *fbdev;

} drm_i915_private_t;



/** driver private structure attached to each drm_gem_object */

struct drm_i915_gem_object {

	struct drm_gem_object base;
@@ -947,6 +945,8 @@ enum intel_chip_family { 
#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)

#define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)



#include "i915_trace.h"



extern struct drm_ioctl_desc i915_ioctls[];

extern int i915_max_ioctl;

extern unsigned int i915_fbpercrtc;
@@ -1085,14 +1085,15 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 
				struct drm_file *file_priv);

void i915_gem_load(struct drm_device *dev);

int i915_gem_init_object(struct drm_gem_object *obj);

struct drm_gem_object * i915_gem_alloc_object(struct drm_device *dev,

struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,

						  size_t size);

void i915_gem_free_object(struct drm_gem_object *obj);

int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment,

int i915_gem_object_pin(struct drm_i915_gem_object *obj,

			uint32_t alignment,

			bool map_and_fenceable);

void i915_gem_object_unpin(struct drm_gem_object *obj);

int i915_gem_object_unbind(struct drm_gem_object *obj);

void i915_gem_release_mmap(struct drm_gem_object *obj);

void i915_gem_object_unpin(struct drm_i915_gem_object *obj);

int i915_gem_object_unbind(struct drm_i915_gem_object *obj);

void i915_gem_release_mmap(struct drm_i915_gem_object *obj);

void i915_gem_lastclose(struct drm_device *dev);



/**
@@ -1104,14 +1105,14 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2) 
	return (int32_t)(seq1 - seq2) >= 0;

}



int i915_gem_object_get_fence_reg(struct drm_gem_object *obj,

int i915_gem_object_get_fence_reg(struct drm_i915_gem_object *obj,

				  bool interruptible);

int i915_gem_object_put_fence_reg(struct drm_gem_object *obj,

int i915_gem_object_put_fence_reg(struct drm_i915_gem_object *obj,

				  bool interruptible);

void i915_gem_retire_requests(struct drm_device *dev);

void i915_gem_reset(struct drm_device *dev);

void i915_gem_clflush_object(struct drm_gem_object *obj);

int i915_gem_object_set_domain(struct drm_gem_object *obj,

void i915_gem_clflush_object(struct drm_i915_gem_object *obj);

int i915_gem_object_set_domain(struct drm_i915_gem_object *obj,

			       uint32_t read_domains,

			       uint32_t write_domain);

int i915_gem_object_flush_gpu(struct drm_i915_gem_object *obj,
@@ -1131,23 +1132,23 @@ int i915_do_wait_request(struct drm_device *dev, 
			 bool interruptible,

			 struct intel_ring_buffer *ring);

int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,

int i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,

				      int write);

int i915_gem_object_set_to_display_plane(struct drm_gem_object *obj,

int i915_gem_object_set_to_display_plane(struct drm_i915_gem_object *obj,

					 bool pipelined);

int i915_gem_attach_phys_object(struct drm_device *dev,

				struct drm_gem_object *obj,

				struct drm_i915_gem_object *obj,

				int id,

				int align);

void i915_gem_detach_phys_object(struct drm_device *dev,

				 struct drm_gem_object *obj);

				 struct drm_i915_gem_object *obj);

void i915_gem_free_all_phys_object(struct drm_device *dev);

void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);

void i915_gem_release(struct drm_device *dev, struct drm_file *file);



/* i915_gem_gtt.c */

void i915_gem_restore_gtt_mappings(struct drm_device *dev);

int i915_gem_gtt_bind_object(struct drm_gem_object *obj);

void i915_gem_gtt_unbind_object(struct drm_gem_object *obj);

int i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj);

void i915_gem_gtt_unbind_object(struct drm_i915_gem_object *obj);



/* i915_gem_evict.c */

int i915_gem_evict_something(struct drm_device *dev, int min_size,
@@ -1157,19 +1158,20 @@ int i915_gem_evict_inactive(struct drm_device *dev, bool purgeable_only); 


/* i915_gem_tiling.c */

void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);

void i915_gem_object_do_bit_17_swizzle(struct drm_gem_object *obj);

void i915_gem_object_save_bit_17_swizzle(struct drm_gem_object *obj);

void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj);

void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj);



/* i915_gem_debug.c */

void i915_gem_dump_object(struct drm_gem_object *obj, int len,

void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,

			  const char *where, uint32_t mark);

#if WATCH_LISTS

int i915_verify_lists(struct drm_device *dev);

#else

#define i915_verify_lists(dev) 0

#endif

void i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle);

void i915_gem_dump_object(struct drm_gem_object *obj, int len,

void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj,

				     int handle);

void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,

			  const char *where, uint32_t mark);



/* i915_debugfs.c */
@@ -1251,10 +1253,10 @@ extern void intel_display_print_error_state(struct seq_file *m, 
 * In that case, we don't need to do it when GEM is initialized as nobody else

 * has access to the ring.

 */

#define RING_LOCK_TEST_WITH_RETURN(dev, file_priv) do {			\

	if (((drm_i915_private_t *)dev->dev_private)->render_ring.gem_object \

#define RING_LOCK_TEST_WITH_RETURN(dev, file) do {			\

	if (((drm_i915_private_t *)dev->dev_private)->render_ring.obj \

			== NULL)					\

		LOCK_TEST_WITH_RETURN(dev, file_priv);			\

		LOCK_TEST_WITH_RETURN(dev, file);			\

} while (0)

drivers/gpu/drm/i915/i915_gem.c

+595 −673

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_gem_debug.c

+10 −13
Original line number Diff line number Diff line
@@ -152,13 +152,12 @@ i915_gem_dump_page(struct page *page, uint32_t start, uint32_t end, 
}



void

i915_gem_dump_object(struct drm_gem_object *obj, int len,

i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,

		     const char *where, uint32_t mark)

{

	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

	int page;



	DRM_INFO("%s: object at offset %08x\n", where, obj_priv->gtt_offset);

	DRM_INFO("%s: object at offset %08x\n", where, obj->gtt_offset);

	for (page = 0; page < (len + PAGE_SIZE-1) / PAGE_SIZE; page++) {

		int page_len, chunk, chunk_len;
@@ -170,9 +169,9 @@ i915_gem_dump_object(struct drm_gem_object *obj, int len, 
			chunk_len = page_len - chunk;

			if (chunk_len > 128)

				chunk_len = 128;

			i915_gem_dump_page(obj_priv->pages[page],

			i915_gem_dump_page(obj->pages[page],

					   chunk, chunk + chunk_len,

					   obj_priv->gtt_offset +

					   obj->gtt_offset +

					   page * PAGE_SIZE,

					   mark);

		}
@@ -182,21 +181,19 @@ i915_gem_dump_object(struct drm_gem_object *obj, int len, 


#if WATCH_COHERENCY

void

i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)

i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle)

{

	struct drm_device *dev = obj->dev;

	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

	struct drm_device *dev = obj->base.dev;

	int page;

	uint32_t *gtt_mapping;

	uint32_t *backing_map = NULL;

	int bad_count = 0;



	DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %zdkb):\n",

		 __func__, obj, obj_priv->gtt_offset, handle,

		 __func__, obj, obj->gtt_offset, handle,

		 obj->size / 1024);



	gtt_mapping = ioremap(dev->agp->base + obj_priv->gtt_offset,

			      obj->size);

	gtt_mapping = ioremap(dev->agp->base + obj->gtt_offset, obj->base.size);

	if (gtt_mapping == NULL) {

		DRM_ERROR("failed to map GTT space\n");

		return;
@@ -205,7 +202,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle) 
	for (page = 0; page < obj->size / PAGE_SIZE; page++) {

		int i;



		backing_map = kmap_atomic(obj_priv->pages[page], KM_USER0);

		backing_map = kmap_atomic(obj->pages[page], KM_USER0);



		if (backing_map == NULL) {

			DRM_ERROR("failed to map backing page\n");
@@ -220,7 +217,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle) 
			if (cpuval != gttval) {

				DRM_INFO("incoherent CPU vs GPU at 0x%08x: "

					 "0x%08x vs 0x%08x\n",

					 (int)(obj_priv->gtt_offset +

					 (int)(obj->gtt_offset +

					       page * PAGE_SIZE + i * 4),

					 cpuval, gttval);

				if (bad_count++ >= 8) {