diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-21 15:04:07 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-21 18:27:38 -0400 |
commit | c459787294e8375210a3d26fe8ed83f40eca3276 (patch) | |
tree | 107bc7a0404fe94c9c14bb017d02b7b2dd72b92a | |
parent | 6efdf354ddb186c6604d1692075421e8d2c740e9 (diff) |
drm/i915: Move the pipe CRC stuff to other pipe data
Adding stuff to the bottom of struct drm_i915_driver_private is
nowadays considered uncool.
Cc: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index faface98ba37..2e1e884ac86c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1380,6 +1380,10 @@ typedef struct drm_i915_private { | |||
1380 | struct drm_crtc *pipe_to_crtc_mapping[3]; | 1380 | struct drm_crtc *pipe_to_crtc_mapping[3]; |
1381 | wait_queue_head_t pending_flip_queue; | 1381 | wait_queue_head_t pending_flip_queue; |
1382 | 1382 | ||
1383 | #ifdef CONFIG_DEBUG_FS | ||
1384 | struct intel_pipe_crc pipe_crc[I915_MAX_PIPES]; | ||
1385 | #endif | ||
1386 | |||
1383 | int num_shared_dpll; | 1387 | int num_shared_dpll; |
1384 | struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; | 1388 | struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; |
1385 | struct intel_ddi_plls ddi_plls; | 1389 | struct intel_ddi_plls ddi_plls; |
@@ -1460,10 +1464,6 @@ typedef struct drm_i915_private { | |||
1460 | struct i915_dri1_state dri1; | 1464 | struct i915_dri1_state dri1; |
1461 | /* Old ums support infrastructure, same warning applies. */ | 1465 | /* Old ums support infrastructure, same warning applies. */ |
1462 | struct i915_ums_state ums; | 1466 | struct i915_ums_state ums; |
1463 | |||
1464 | #ifdef CONFIG_DEBUG_FS | ||
1465 | struct intel_pipe_crc pipe_crc[I915_MAX_PIPES]; | ||
1466 | #endif | ||
1467 | } drm_i915_private_t; | 1467 | } drm_i915_private_t; |
1468 | 1468 | ||
1469 | static inline struct drm_i915_private *to_i915(const struct drm_device *dev) | 1469 | static inline struct drm_i915_private *to_i915(const struct drm_device *dev) |