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

Commit 23010e43 authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

drm/i915: introduce to_intel_bo helper 



This is a purely cosmetic change to make changes in this area easier.
And hey, it's not only clearer and typechecked, but actually shorter,
too!

[anholt: To clarify, this is a change to let us later make
drm_i915_gem_object subclass drm_gem_object, instead of having
drm_gem_object have a pointer to i915's private data]

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 8d06a1e1

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) 
		} else {

			struct drm_i915_gem_object *obj_priv;



			obj_priv = obj->driver_private;

			obj_priv = to_intel_bo(obj);

			seq_printf(m, "Fenced object[%2d] = %p: %s "

				   "%08x %08zx %08x %s %08x %08x %d",

				   i, obj, get_pin_flag(obj_priv),

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ int i965_reset(struct drm_device *dev, u8 flags) 
	    !dev_priv->mm.suspended) {

		drm_i915_ring_buffer_t *ring = &dev_priv->ring;

		struct drm_gem_object *obj = ring->ring_obj;

		struct drm_i915_gem_object *obj_priv = obj->driver_private;

		struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

		dev_priv->mm.suspended = 0;



		/* Stop the ring if it's running. */

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -731,6 +731,8 @@ struct drm_i915_gem_object { 
	atomic_t pending_flip;

};



#define to_intel_bo(x) ((struct drm_i915_gem_object *) (x)->driver_private)



/**

 * Request queue structure.

 *

drivers/gpu/drm/i915/i915_gem.c

+66 −66

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_gem_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void 
i915_gem_dump_object(struct drm_gem_object *obj, int len,

		     const char *where, uint32_t mark)

{

	struct drm_i915_gem_object *obj_priv = obj->driver_private;

	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);
@@ -137,7 +137,7 @@ void 
i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)

{

	struct drm_device *dev = obj->dev;

	struct drm_i915_gem_object *obj_priv = obj->driver_private;

	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

	int page;

	uint32_t *gtt_mapping;

	uint32_t *backing_map = NULL;