Commit ab6f8e32 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/ringbuffer: whitespace cleanup 



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

drivers/gpu/drm/i915/intel_ringbuffer.c

+64 −59
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static void render_setup_status_page(struct drm_device *dev, 


}



void

static void

bsd_ring_flush(struct drm_device *dev,

		struct intel_ring_buffer *ring,

		u32     invalidate_domains,
@@ -374,7 +374,7 @@ bsd_ring_flush(struct drm_device *dev, 
	intel_ring_advance(dev, ring);

}



static inline unsigned int bsd_ring_get_active_head(struct drm_device *dev,

static unsigned int bsd_ring_get_active_head(struct drm_device *dev,

					     struct intel_ring_buffer *ring)

{

	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -584,7 +584,6 @@ static int init_status_page(struct drm_device *dev, 
	return ret;

}





int intel_init_ring_buffer(struct drm_device *dev,

			   struct intel_ring_buffer *ring)

{
@@ -672,7 +671,7 @@ void intel_cleanup_ring_buffer(struct drm_device *dev, 
	cleanup_status_page(dev, ring);

}



int intel_wrap_ring_buffer(struct drm_device *dev,

static int intel_wrap_ring_buffer(struct drm_device *dev,

				  struct intel_ring_buffer *ring)

{

	unsigned int *virt;
@@ -729,7 +728,8 @@ int intel_wait_ring_buffer(struct drm_device *dev, 
}



void intel_ring_begin(struct drm_device *dev,

		struct intel_ring_buffer *ring, int num_dwords)

		      struct intel_ring_buffer *ring,

		      int num_dwords)

{

	int n = 4*num_dwords;

	if (unlikely(ring->tail + n > ring->size))
@@ -807,7 +807,7 @@ static void gen6_bsd_setup_status_page(struct drm_device *dev, 
       I915_READ(GEN6_BSD_HWS_PGA);

}



static inline void gen6_bsd_ring_set_tail(struct drm_device *dev,

static void gen6_bsd_ring_set_tail(struct drm_device *dev,

				   struct intel_ring_buffer *ring,

				   u32 value)

{
@@ -830,7 +830,7 @@ static inline void gen6_bsd_ring_set_tail(struct drm_device *dev, 
	       GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE);

}



static inline unsigned int gen6_bsd_ring_get_active_head(struct drm_device *dev,

static unsigned int gen6_bsd_ring_get_active_head(struct drm_device *dev,

						  struct intel_ring_buffer *ring)

{

       drm_i915_private_t *dev_priv = dev->dev_private;
@@ -858,11 +858,16 @@ gen6_bsd_ring_dispatch_gem_execbuffer(struct drm_device *dev, 
				      uint64_t exec_offset)

{

       uint32_t exec_start;



       exec_start = (uint32_t) exec_offset + exec->batch_start_offset;



       intel_ring_begin(dev, ring, 2);

       intel_ring_emit(dev, ring, MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965); /* bit0-7 is the length on GEN6+ */

       intel_ring_emit(dev, ring,

		       MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965);

       /* bit0-7 is the length on GEN6+ */

       intel_ring_emit(dev, ring, exec_start);

       intel_ring_advance(dev, ring);



       return 0;

}

drivers/gpu/drm/i915/intel_ringbuffer.h

+4 −6
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ void intel_cleanup_ring_buffer(struct drm_device *dev, 
			       struct intel_ring_buffer *ring);

int intel_wait_ring_buffer(struct drm_device *dev,

			   struct intel_ring_buffer *ring, int n);

int intel_wrap_ring_buffer(struct drm_device *dev,

		struct intel_ring_buffer *ring);

void intel_ring_begin(struct drm_device *dev,

		      struct intel_ring_buffer *ring, int n);