diff options
author | Akshay Joshi <me@akshayjoshi.com> | 2011-08-16 15:34:10 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-09-19 21:01:47 -0400 |
commit | 0206e353a0416ad63ce07f53c807c2c725633b87 (patch) | |
tree | 4b3233535d2f3b9cf408c823b7a32773a8d971e7 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) |
Drivers: i915: Fix all space related issues.
Various issues involved with the space character were generating
warnings in the checkpatch.pl file. This patch removes most of those
warnings.
Signed-off-by: Akshay Joshi <me@akshayjoshi.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index c30626ea9f93..a40f3456448d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1026,7 +1026,7 @@ static const struct intel_ring_buffer render_ring = { | |||
1026 | .irq_get = render_ring_get_irq, | 1026 | .irq_get = render_ring_get_irq, |
1027 | .irq_put = render_ring_put_irq, | 1027 | .irq_put = render_ring_put_irq, |
1028 | .dispatch_execbuffer = render_ring_dispatch_execbuffer, | 1028 | .dispatch_execbuffer = render_ring_dispatch_execbuffer, |
1029 | .cleanup = render_ring_cleanup, | 1029 | .cleanup = render_ring_cleanup, |
1030 | }; | 1030 | }; |
1031 | 1031 | ||
1032 | /* ring buffer for bit-stream decoder */ | 1032 | /* ring buffer for bit-stream decoder */ |
@@ -1050,23 +1050,23 @@ static const struct intel_ring_buffer bsd_ring = { | |||
1050 | static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring, | 1050 | static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring, |
1051 | u32 value) | 1051 | u32 value) |
1052 | { | 1052 | { |
1053 | drm_i915_private_t *dev_priv = ring->dev->dev_private; | 1053 | drm_i915_private_t *dev_priv = ring->dev->dev_private; |
1054 | 1054 | ||
1055 | /* Every tail move must follow the sequence below */ | 1055 | /* Every tail move must follow the sequence below */ |
1056 | I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL, | 1056 | I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL, |
1057 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK | | 1057 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK | |
1058 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE); | 1058 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE); |
1059 | I915_WRITE(GEN6_BSD_RNCID, 0x0); | 1059 | I915_WRITE(GEN6_BSD_RNCID, 0x0); |
1060 | 1060 | ||
1061 | if (wait_for((I915_READ(GEN6_BSD_SLEEP_PSMI_CONTROL) & | 1061 | if (wait_for((I915_READ(GEN6_BSD_SLEEP_PSMI_CONTROL) & |
1062 | GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR) == 0, | 1062 | GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR) == 0, |
1063 | 50)) | 1063 | 50)) |
1064 | DRM_ERROR("timed out waiting for IDLE Indicator\n"); | 1064 | DRM_ERROR("timed out waiting for IDLE Indicator\n"); |
1065 | 1065 | ||
1066 | I915_WRITE_TAIL(ring, value); | 1066 | I915_WRITE_TAIL(ring, value); |
1067 | I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL, | 1067 | I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL, |
1068 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK | | 1068 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK | |
1069 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE); | 1069 | GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE); |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | static int gen6_ring_flush(struct intel_ring_buffer *ring, | 1072 | static int gen6_ring_flush(struct intel_ring_buffer *ring, |
@@ -1094,18 +1094,18 @@ static int | |||
1094 | gen6_ring_dispatch_execbuffer(struct intel_ring_buffer *ring, | 1094 | gen6_ring_dispatch_execbuffer(struct intel_ring_buffer *ring, |
1095 | u32 offset, u32 len) | 1095 | u32 offset, u32 len) |
1096 | { | 1096 | { |
1097 | int ret; | 1097 | int ret; |
1098 | 1098 | ||
1099 | ret = intel_ring_begin(ring, 2); | 1099 | ret = intel_ring_begin(ring, 2); |
1100 | if (ret) | 1100 | if (ret) |
1101 | return ret; | 1101 | return ret; |
1102 | 1102 | ||
1103 | intel_ring_emit(ring, MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965); | 1103 | intel_ring_emit(ring, MI_BATCH_BUFFER_START | MI_BATCH_NON_SECURE_I965); |
1104 | /* bit0-7 is the length on GEN6+ */ | 1104 | /* bit0-7 is the length on GEN6+ */ |
1105 | intel_ring_emit(ring, offset); | 1105 | intel_ring_emit(ring, offset); |
1106 | intel_ring_advance(ring); | 1106 | intel_ring_advance(ring); |
1107 | 1107 | ||
1108 | return 0; | 1108 | return 0; |
1109 | } | 1109 | } |
1110 | 1110 | ||
1111 | static bool | 1111 | static bool |
@@ -1272,19 +1272,19 @@ static void blt_ring_cleanup(struct intel_ring_buffer *ring) | |||
1272 | } | 1272 | } |
1273 | 1273 | ||
1274 | static const struct intel_ring_buffer gen6_blt_ring = { | 1274 | static const struct intel_ring_buffer gen6_blt_ring = { |
1275 | .name = "blt ring", | 1275 | .name = "blt ring", |
1276 | .id = RING_BLT, | 1276 | .id = RING_BLT, |
1277 | .mmio_base = BLT_RING_BASE, | 1277 | .mmio_base = BLT_RING_BASE, |
1278 | .size = 32 * PAGE_SIZE, | 1278 | .size = 32 * PAGE_SIZE, |
1279 | .init = blt_ring_init, | 1279 | .init = blt_ring_init, |
1280 | .write_tail = ring_write_tail, | 1280 | .write_tail = ring_write_tail, |
1281 | .flush = blt_ring_flush, | 1281 | .flush = blt_ring_flush, |
1282 | .add_request = gen6_add_request, | 1282 | .add_request = gen6_add_request, |
1283 | .get_seqno = ring_get_seqno, | 1283 | .get_seqno = ring_get_seqno, |
1284 | .irq_get = blt_ring_get_irq, | 1284 | .irq_get = blt_ring_get_irq, |
1285 | .irq_put = blt_ring_put_irq, | 1285 | .irq_put = blt_ring_put_irq, |
1286 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, | 1286 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, |
1287 | .cleanup = blt_ring_cleanup, | 1287 | .cleanup = blt_ring_cleanup, |
1288 | }; | 1288 | }; |
1289 | 1289 | ||
1290 | int intel_init_render_ring_buffer(struct drm_device *dev) | 1290 | int intel_init_render_ring_buffer(struct drm_device *dev) |