convert intel_ring_begin count to dword
Subsystems (2)
PATCH 1/1 convert intel_ring_begin count to dword
convert intel_ring_begin count to dword,
fix some wrong intel_ring_begin size.
Signed-off-by Zou Nan hai <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1075,7 +1075,7 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);drm_i915_private_t *dev_priv = dev->dev_private; \if (I915_VERBOSE ) \DRM_DEBUG (" BEGIN_LP_RING %x\n" , (int )(n)); \ -intel_ring_begin (dev, &dev_priv->render_ring,4 *(n)); \ +intel_ring_begin (dev, &dev_priv->render_ring, (n)); \ }while (0 )
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -6
@@ -94,7 +94,7 @@ render_ring_flush(struct drm_device *dev,#if WATCH_EXEC DRM_INFO ("%s: queue flush %08x to ring\n" , __func__, cmd);#endif -intel_ring_begin (dev, ring,8 ); +intel_ring_begin (dev, ring,2 );intel_ring_emit (dev, ring, cmd);intel_ring_emit (dev, ring,MI_NOOP );intel_ring_advance (dev, ring);
@@ -358,7 +358,7 @@ bsd_ring_flush(struct drm_device *dev,u32 invalidate_domains, u32 flush_domains) { - intel_ring_begin(dev, ring, 8); + intel_ring_begin(dev, ring, 2);intel_ring_emit (dev, ring,MI_FLUSH );intel_ring_emit (dev, ring,MI_NOOP );intel_ring_advance (dev, ring);
@@ -723,10 +723,10 @@ int intel_wait_ring_buffer(struct drm_device *dev,void intel_ring_begin (struct drm_device *dev,struct intel_ring_buffer *ring,int n) { -if (unlikely (ring->tail + n > ring->size)) +if (unlikely (ring->tail +4 *n > ring->size))intel_wrap_ring_buffer (dev, ring); -if (unlikely (ring->space < n)) -intel_wait_ring_buffer (dev, ring, n); +if (unlikely (ring->space <4 *n)) +intel_wait_ring_buffer (dev, ring,4 *n); } void intel_ring_emit(struct drm_device *dev,
@@ -752,7 +752,7 @@ void intel_fill_struct(struct drm_device *dev, {unsigned int *virt = ring->virtual_start + ring->tail;BUG_ON ((len&~(4 -1 )) !=0 ); -intel_ring_begin (dev, ring, len); +intel_ring_begin (dev, ring, len/4 );memcpy (virt, data, len); ring->tail += len; ring->tail &= ring->size -1 ;
Signature · 1 line
1.7.1
drivers/gpu/drm/i915/intel_ringbuffer.c int intel_wait_ring_buffer(struct drm_device *dev, · line 724
Quoted 8 lines · Zou Nan hai
convert
intel_ring_begincount to dword,
fix some wrongintel_ring_beginsize.Signed-off-by Zou Nan hai <[email protected]>---
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -723,10 +723,10 @@ int intel_wait_ring_buffer(struct drm_device *dev,void intel_ring_begin (struct drm_device *dev,struct intel_ring_buffer *ring,int n)
Let's make the prototype a little clearer and s/n/num_dwords/...
Review int intel_wait_ring_buffer(struct drm_device *dev, · line 725
Quoted 1 line
(quoted diff) +0
-0{
And then: int n = 4 * num_dwords;
Quoted 11 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-3-if (unlikely (ring->tail + n > ring->size)) +if (unlikely (ring->tail +4 *n > ring->size))intel_wrap_ring_buffer (dev, ring); -if (unlikely (ring->space < n)) -intel_wait_ring_buffer (dev, ring, n); +if (unlikely (ring->space <4 *n)) +intel_wait_ring_buffer (dev, ring,4 *n); } void intel_ring_emit(struct drm_device *dev,
drivers/gpu/drm/i915/intel_ringbuffer.c void intel_fill_struct(struct drm_device *dev, · line 755
Quoted 5 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -752,7 +752,7 @@ void intel_fill_struct(struct drm_device *dev, {unsigned int *virt = ring->virtual_start + ring->tail;BUG_ON ((len&~(4 -1 )) !=0 ); -intel_ring_begin (dev, ring, len); +intel_ring_begin (dev, ring, len/4 );
Admittedly this is the fly in the ointment.
-ickle
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre