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

Commit 4640c4ff authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915/ringbuffer: prefer struct drm_i915_private to drm_i915_private_t 



No functional changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fbee40df

drivers/gpu/drm/i915/intel_ringbuffer.c

+19 −19
Original line number Original line Diff line number Diff line
@@ -406,13 +406,13 @@ gen8_render_ring_flush(struct intel_ring_buffer *ring, 
static void ring_write_tail(struct intel_ring_buffer *ring,

static void ring_write_tail(struct intel_ring_buffer *ring,

			    u32 value)

			    u32 value)

{

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	I915_WRITE_TAIL(ring, value);

	I915_WRITE_TAIL(ring, value);

}

}





u64 intel_ring_get_active_head(struct intel_ring_buffer *ring)

u64 intel_ring_get_active_head(struct intel_ring_buffer *ring)

{

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	u64 acthd;

	u64 acthd;





	if (INTEL_INFO(ring->dev)->gen >= 8)

	if (INTEL_INFO(ring->dev)->gen >= 8)
@@ -440,7 +440,7 @@ static void ring_setup_phys_status_page(struct intel_ring_buffer *ring) 
static int init_ring_common(struct intel_ring_buffer *ring)

static int init_ring_common(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj = ring->obj;

	struct drm_i915_gem_object *obj = ring->obj;

	int ret = 0;

	int ret = 0;

	u32 head;

	u32 head;
@@ -857,7 +857,7 @@ static bool 
gen5_ring_get_irq(struct intel_ring_buffer *ring)

gen5_ring_get_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	if (!dev->irq_enabled)

	if (!dev->irq_enabled)
@@ -875,7 +875,7 @@ static void 
gen5_ring_put_irq(struct intel_ring_buffer *ring)

gen5_ring_put_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&dev_priv->irq_lock, flags);

	spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -888,7 +888,7 @@ static bool 
i9xx_ring_get_irq(struct intel_ring_buffer *ring)

i9xx_ring_get_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	if (!dev->irq_enabled)

	if (!dev->irq_enabled)
@@ -909,7 +909,7 @@ static void 
i9xx_ring_put_irq(struct intel_ring_buffer *ring)

i9xx_ring_put_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&dev_priv->irq_lock, flags);

	spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -925,7 +925,7 @@ static bool 
i8xx_ring_get_irq(struct intel_ring_buffer *ring)

i8xx_ring_get_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	if (!dev->irq_enabled)

	if (!dev->irq_enabled)
@@ -946,7 +946,7 @@ static void 
i8xx_ring_put_irq(struct intel_ring_buffer *ring)

i8xx_ring_put_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&dev_priv->irq_lock, flags);

	spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -961,7 +961,7 @@ i8xx_ring_put_irq(struct intel_ring_buffer *ring) 
void intel_ring_setup_status_page(struct intel_ring_buffer *ring)

void intel_ring_setup_status_page(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	u32 mmio = 0;

	u32 mmio = 0;





	/* The ring status page addresses are no longer next to the rest of

	/* The ring status page addresses are no longer next to the rest of
@@ -1054,7 +1054,7 @@ static bool 
gen6_ring_get_irq(struct intel_ring_buffer *ring)

gen6_ring_get_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	if (!dev->irq_enabled)

	if (!dev->irq_enabled)
@@ -1079,7 +1079,7 @@ static void 
gen6_ring_put_irq(struct intel_ring_buffer *ring)

gen6_ring_put_irq(struct intel_ring_buffer *ring)

{

{

	struct drm_device *dev = ring->dev;

	struct drm_device *dev = ring->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&dev_priv->irq_lock, flags);

	spin_lock_irqsave(&dev_priv->irq_lock, flags);
@@ -1646,7 +1646,7 @@ static int __intel_ring_prepare(struct intel_ring_buffer *ring, 
int intel_ring_begin(struct intel_ring_buffer *ring,

int intel_ring_begin(struct intel_ring_buffer *ring,

		     int num_dwords)

		     int num_dwords)

{

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

	int ret;

	int ret;





	ret = i915_gem_check_wedge(&dev_priv->gpu_error,

	ret = i915_gem_check_wedge(&dev_priv->gpu_error,
@@ -1708,7 +1708,7 @@ void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno) 
static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring,

static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring,

				     u32 value)

				     u32 value)

{

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	struct drm_i915_private *dev_priv = ring->dev->dev_private;





       /* Every tail move must follow the sequence below */

       /* Every tail move must follow the sequence below */
@@ -1883,7 +1883,7 @@ static int gen6_ring_flush(struct intel_ring_buffer *ring, 




int intel_init_render_ring_buffer(struct drm_device *dev)

int intel_init_render_ring_buffer(struct drm_device *dev)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = &dev_priv->ring[RCS];

	struct intel_ring_buffer *ring = &dev_priv->ring[RCS];





	ring->name = "render ring";

	ring->name = "render ring";
@@ -1984,7 +1984,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) 




int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)

int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = &dev_priv->ring[RCS];

	struct intel_ring_buffer *ring = &dev_priv->ring[RCS];

	int ret;

	int ret;
@@ -2052,7 +2052,7 @@ int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size) 




int intel_init_bsd_ring_buffer(struct drm_device *dev)

int intel_init_bsd_ring_buffer(struct drm_device *dev)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = &dev_priv->ring[VCS];

	struct intel_ring_buffer *ring = &dev_priv->ring[VCS];





	ring->name = "bsd ring";

	ring->name = "bsd ring";
@@ -2115,7 +2115,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) 




int intel_init_blt_ring_buffer(struct drm_device *dev)

int intel_init_blt_ring_buffer(struct drm_device *dev)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = &dev_priv->ring[BCS];

	struct intel_ring_buffer *ring = &dev_priv->ring[BCS];





	ring->name = "blitter ring";

	ring->name = "blitter ring";
@@ -2155,7 +2155,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) 




int intel_init_vebox_ring_buffer(struct drm_device *dev)

int intel_init_vebox_ring_buffer(struct drm_device *dev)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = &dev_priv->ring[VECS];

	struct intel_ring_buffer *ring = &dev_priv->ring[VECS];





	ring->name = "video enhancement ring";

	ring->name = "video enhancement ring";