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

Commit 50227e1c authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: prefer struct drm_i915_private to drm_i915_private_t 



Remove the rest of the references to drm_i915_private_t. No functional
changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
[danvet: Drop hunk in i915_cmd_parser.c]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d5d45cc5

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ int i915_resume(struct drm_device *dev) 
 */

int i915_reset(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	bool simulated;

	int ret;

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -2128,11 +2128,11 @@ extern void intel_uncore_check_errors(struct drm_device *dev); 
extern void intel_uncore_fini(struct drm_device *dev);



void

i915_enable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe,

i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,

		     u32 status_mask);



void

i915_disable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe,

i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,

		      u32 status_mask);



void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv);
@@ -2502,7 +2502,7 @@ void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj); 
/* i915_gem_tiling.c */

static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)

{

	drm_i915_private_t *dev_priv = obj->base.dev->dev_private;

	struct drm_i915_private *dev_priv = obj->base.dev->dev_private;



	return dev_priv->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&

		obj->tiling_mode != I915_TILING_NONE;

drivers/gpu/drm/i915/i915_gem_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int 
i915_verify_lists(struct drm_device *dev)

{

	static int warned;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj;

	int err = 0;

drivers/gpu/drm/i915/i915_gem_evict.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm, 
			 int min_size, unsigned alignment, unsigned cache_level,

			 unsigned flags)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct list_head eviction_list, unwind_list;

	struct i915_vma *vma;

	int ret = 0;
@@ -243,7 +243,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle) 
int

i915_gem_evict_everything(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct i915_address_space *vm;

	bool lists_empty = true;

	int ret;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ static int 
i915_reset_gen7_sol_offsets(struct drm_device *dev,

			    struct intel_ring_buffer *ring)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret, i;



	if (!IS_GEN7(dev) || ring != &dev_priv->ring[RCS])
@@ -1005,7 +1005,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
		       struct drm_i915_gem_execbuffer2 *args,

		       struct drm_i915_gem_exec_object2 *exec)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct eb_vmas *eb;

	struct drm_i915_gem_object *batch_obj;

	struct drm_clip_rect *cliprects = NULL;