aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorAkshay Joshi <me@akshayjoshi.com>2011-08-16 15:34:10 -0400
committerKeith Packard <keithp@keithp.com>2011-09-19 21:01:47 -0400
commit0206e353a0416ad63ce07f53c807c2c725633b87 (patch)
tree4b3233535d2f3b9cf408c823b7a32773a8d971e7 /drivers/gpu/drm/i915/i915_drv.h
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb (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/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h70
1 files changed, 35 insertions, 35 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7916bd97d5c1..32de06f0b172 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -226,26 +226,26 @@ struct drm_i915_display_funcs {
226 226
227struct intel_device_info { 227struct intel_device_info {
228 u8 gen; 228 u8 gen;
229 u8 is_mobile : 1; 229 u8 is_mobile:1;
230 u8 is_i85x : 1; 230 u8 is_i85x:1;
231 u8 is_i915g : 1; 231 u8 is_i915g:1;
232 u8 is_i945gm : 1; 232 u8 is_i945gm:1;
233 u8 is_g33 : 1; 233 u8 is_g33:1;
234 u8 need_gfx_hws : 1; 234 u8 need_gfx_hws:1;
235 u8 is_g4x : 1; 235 u8 is_g4x:1;
236 u8 is_pineview : 1; 236 u8 is_pineview:1;
237 u8 is_broadwater : 1; 237 u8 is_broadwater:1;
238 u8 is_crestline : 1; 238 u8 is_crestline:1;
239 u8 is_ivybridge : 1; 239 u8 is_ivybridge:1;
240 u8 has_fbc : 1; 240 u8 has_fbc:1;
241 u8 has_pipe_cxsr : 1; 241 u8 has_pipe_cxsr:1;
242 u8 has_hotplug : 1; 242 u8 has_hotplug:1;
243 u8 cursor_needs_physical : 1; 243 u8 cursor_needs_physical:1;
244 u8 has_overlay : 1; 244 u8 has_overlay:1;
245 u8 overlay_needs_physical : 1; 245 u8 overlay_needs_physical:1;
246 u8 supports_tv : 1; 246 u8 supports_tv:1;
247 u8 has_bsd_ring : 1; 247 u8 has_bsd_ring:1;
248 u8 has_blt_ring : 1; 248 u8 has_blt_ring:1;
249}; 249};
250 250
251enum no_fbc_reason { 251enum no_fbc_reason {
@@ -759,19 +759,19 @@ struct drm_i915_gem_object {
759 * (has pending rendering), and is not set if it's on inactive (ready 759 * (has pending rendering), and is not set if it's on inactive (ready
760 * to be unbound). 760 * to be unbound).
761 */ 761 */
762 unsigned int active : 1; 762 unsigned int active:1;
763 763
764 /** 764 /**
765 * This is set if the object has been written to since last bound 765 * This is set if the object has been written to since last bound
766 * to the GTT 766 * to the GTT
767 */ 767 */
768 unsigned int dirty : 1; 768 unsigned int dirty:1;
769 769
770 /** 770 /**
771 * This is set if the object has been written to since the last 771 * This is set if the object has been written to since the last
772 * GPU flush. 772 * GPU flush.
773 */ 773 */
774 unsigned int pending_gpu_write : 1; 774 unsigned int pending_gpu_write:1;
775 775
776 /** 776 /**
777 * Fence register bits (if any) for this object. Will be set 777 * Fence register bits (if any) for this object. Will be set
@@ -780,18 +780,18 @@ struct drm_i915_gem_object {
780 * 780 *
781 * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE) 781 * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE)
782 */ 782 */
783 signed int fence_reg : 5; 783 signed int fence_reg:5;
784 784
785 /** 785 /**
786 * Advice: are the backing pages purgeable? 786 * Advice: are the backing pages purgeable?
787 */ 787 */
788 unsigned int madv : 2; 788 unsigned int madv:2;
789 789
790 /** 790 /**
791 * Current tiling mode for the object. 791 * Current tiling mode for the object.
792 */ 792 */
793 unsigned int tiling_mode : 2; 793 unsigned int tiling_mode:2;
794 unsigned int tiling_changed : 1; 794 unsigned int tiling_changed:1;
795 795
796 /** How many users have pinned this object in GTT space. The following 796 /** How many users have pinned this object in GTT space. The following
797 * users can each hold at most one reference: pwrite/pread, pin_ioctl 797 * users can each hold at most one reference: pwrite/pread, pin_ioctl
@@ -802,22 +802,22 @@ struct drm_i915_gem_object {
802 * 802 *
803 * In the worst case this is 1 + 1 + 1 + 2*2 = 7. That would fit into 3 803 * In the worst case this is 1 + 1 + 1 + 2*2 = 7. That would fit into 3
804 * bits with absolutely no headroom. So use 4 bits. */ 804 * bits with absolutely no headroom. So use 4 bits. */
805 unsigned int pin_count : 4; 805 unsigned int pin_count:4;
806#define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf 806#define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf
807 807
808 /** 808 /**
809 * Is the object at the current location in the gtt mappable and 809 * Is the object at the current location in the gtt mappable and
810 * fenceable? Used to avoid costly recalculations. 810 * fenceable? Used to avoid costly recalculations.
811 */ 811 */
812 unsigned int map_and_fenceable : 1; 812 unsigned int map_and_fenceable:1;
813 813
814 /** 814 /**
815 * Whether the current gtt mapping needs to be mappable (and isn't just 815 * Whether the current gtt mapping needs to be mappable (and isn't just
816 * mappable by accident). Track pin and fault separate for a more 816 * mappable by accident). Track pin and fault separate for a more
817 * accurate mappable working set. 817 * accurate mappable working set.
818 */ 818 */
819 unsigned int fault_mappable : 1; 819 unsigned int fault_mappable:1;
820 unsigned int pin_mappable : 1; 820 unsigned int pin_mappable:1;
821 821
822 /* 822 /*
823 * Is the GPU currently using a fence to access this buffer, 823 * Is the GPU currently using a fence to access this buffer,
@@ -1056,7 +1056,7 @@ i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
1056void 1056void
1057i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); 1057i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
1058 1058
1059void intel_enable_asle (struct drm_device *dev); 1059void intel_enable_asle(struct drm_device *dev);
1060 1060
1061#ifdef CONFIG_DEBUG_FS 1061#ifdef CONFIG_DEBUG_FS
1062extern void i915_destroy_error_state(struct drm_device *dev); 1062extern void i915_destroy_error_state(struct drm_device *dev);
@@ -1146,7 +1146,7 @@ int i915_gem_dumb_create(struct drm_file *file_priv,
1146int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev, 1146int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev,
1147 uint32_t handle, uint64_t *offset); 1147 uint32_t handle, uint64_t *offset);
1148int i915_gem_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev, 1148int i915_gem_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,
1149 uint32_t handle); 1149 uint32_t handle);
1150/** 1150/**
1151 * Returns true if seq1 is later than seq2. 1151 * Returns true if seq1 is later than seq2.
1152 */ 1152 */
@@ -1303,8 +1303,8 @@ extern void intel_disable_fbc(struct drm_device *dev);
1303extern bool ironlake_set_drps(struct drm_device *dev, u8 val); 1303extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
1304extern void ironlake_enable_rc6(struct drm_device *dev); 1304extern void ironlake_enable_rc6(struct drm_device *dev);
1305extern void gen6_set_rps(struct drm_device *dev, u8 val); 1305extern void gen6_set_rps(struct drm_device *dev, u8 val);
1306extern void intel_detect_pch (struct drm_device *dev); 1306extern void intel_detect_pch(struct drm_device *dev);
1307extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); 1307extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);
1308 1308
1309/* overlay */ 1309/* overlay */
1310#ifdef CONFIG_DEBUG_FS 1310#ifdef CONFIG_DEBUG_FS