aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-03-31 07:27:18 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-31 09:32:50 -0400
commitfbee40df050fc3593d143e3d2f24694d988ff753 (patch)
tree3a703edfe40f3faeafd154a58357cf1aa092fc19
parent2d1013dd82bda51e48c612a2907708d2343bb0ed (diff)
drm/i915/display: prefer struct drm_i915_private to drm_i915_private_t
No functional changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 56018b79da62..8bce7f00294b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8359,7 +8359,7 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
8359static void intel_increase_pllclock(struct drm_crtc *crtc) 8359static void intel_increase_pllclock(struct drm_crtc *crtc)
8360{ 8360{
8361 struct drm_device *dev = crtc->dev; 8361 struct drm_device *dev = crtc->dev;
8362 drm_i915_private_t *dev_priv = dev->dev_private; 8362 struct drm_i915_private *dev_priv = dev->dev_private;
8363 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8363 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8364 int pipe = intel_crtc->pipe; 8364 int pipe = intel_crtc->pipe;
8365 int dpll_reg = DPLL(pipe); 8365 int dpll_reg = DPLL(pipe);
@@ -8390,7 +8390,7 @@ static void intel_increase_pllclock(struct drm_crtc *crtc)
8390static void intel_decrease_pllclock(struct drm_crtc *crtc) 8390static void intel_decrease_pllclock(struct drm_crtc *crtc)
8391{ 8391{
8392 struct drm_device *dev = crtc->dev; 8392 struct drm_device *dev = crtc->dev;
8393 drm_i915_private_t *dev_priv = dev->dev_private; 8393 struct drm_i915_private *dev_priv = dev->dev_private;
8394 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8394 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8395 8395
8396 if (HAS_PCH_SPLIT(dev)) 8396 if (HAS_PCH_SPLIT(dev))
@@ -8531,7 +8531,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
8531static void do_intel_finish_page_flip(struct drm_device *dev, 8531static void do_intel_finish_page_flip(struct drm_device *dev,
8532 struct drm_crtc *crtc) 8532 struct drm_crtc *crtc)
8533{ 8533{
8534 drm_i915_private_t *dev_priv = dev->dev_private; 8534 struct drm_i915_private *dev_priv = dev->dev_private;
8535 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 8535 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
8536 struct intel_unpin_work *work; 8536 struct intel_unpin_work *work;
8537 unsigned long flags; 8537 unsigned long flags;
@@ -8572,7 +8572,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
8572 8572
8573void intel_finish_page_flip(struct drm_device *dev, int pipe) 8573void intel_finish_page_flip(struct drm_device *dev, int pipe)
8574{ 8574{
8575 drm_i915_private_t *dev_priv = dev->dev_private; 8575 struct drm_i915_private *dev_priv = dev->dev_private;
8576 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; 8576 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
8577 8577
8578 do_intel_finish_page_flip(dev, crtc); 8578 do_intel_finish_page_flip(dev, crtc);
@@ -8580,7 +8580,7 @@ void intel_finish_page_flip(struct drm_device *dev, int pipe)
8580 8580
8581void intel_finish_page_flip_plane(struct drm_device *dev, int plane) 8581void intel_finish_page_flip_plane(struct drm_device *dev, int plane)
8582{ 8582{
8583 drm_i915_private_t *dev_priv = dev->dev_private; 8583 struct drm_i915_private *dev_priv = dev->dev_private;
8584 struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane]; 8584 struct drm_crtc *crtc = dev_priv->plane_to_crtc_mapping[plane];
8585 8585
8586 do_intel_finish_page_flip(dev, crtc); 8586 do_intel_finish_page_flip(dev, crtc);
@@ -8588,7 +8588,7 @@ void intel_finish_page_flip_plane(struct drm_device *dev, int plane)
8588 8588
8589void intel_prepare_page_flip(struct drm_device *dev, int plane) 8589void intel_prepare_page_flip(struct drm_device *dev, int plane)
8590{ 8590{
8591 drm_i915_private_t *dev_priv = dev->dev_private; 8591 struct drm_i915_private *dev_priv = dev->dev_private;
8592 struct intel_crtc *intel_crtc = 8592 struct intel_crtc *intel_crtc =
8593 to_intel_crtc(dev_priv->plane_to_crtc_mapping[plane]); 8593 to_intel_crtc(dev_priv->plane_to_crtc_mapping[plane]);
8594 unsigned long flags; 8594 unsigned long flags;
@@ -9763,7 +9763,7 @@ check_encoder_state(struct drm_device *dev)
9763static void 9763static void
9764check_crtc_state(struct drm_device *dev) 9764check_crtc_state(struct drm_device *dev)
9765{ 9765{
9766 drm_i915_private_t *dev_priv = dev->dev_private; 9766 struct drm_i915_private *dev_priv = dev->dev_private;
9767 struct intel_crtc *crtc; 9767 struct intel_crtc *crtc;
9768 struct intel_encoder *encoder; 9768 struct intel_encoder *encoder;
9769 struct intel_crtc_config pipe_config; 9769 struct intel_crtc_config pipe_config;
@@ -9831,7 +9831,7 @@ check_crtc_state(struct drm_device *dev)
9831static void 9831static void
9832check_shared_dpll_state(struct drm_device *dev) 9832check_shared_dpll_state(struct drm_device *dev)
9833{ 9833{
9834 drm_i915_private_t *dev_priv = dev->dev_private; 9834 struct drm_i915_private *dev_priv = dev->dev_private;
9835 struct intel_crtc *crtc; 9835 struct intel_crtc *crtc;
9836 struct intel_dpll_hw_state dpll_hw_state; 9836 struct intel_dpll_hw_state dpll_hw_state;
9837 int i; 9837 int i;
@@ -9904,7 +9904,7 @@ static int __intel_set_mode(struct drm_crtc *crtc,
9904 int x, int y, struct drm_framebuffer *fb) 9904 int x, int y, struct drm_framebuffer *fb)
9905{ 9905{
9906 struct drm_device *dev = crtc->dev; 9906 struct drm_device *dev = crtc->dev;
9907 drm_i915_private_t *dev_priv = dev->dev_private; 9907 struct drm_i915_private *dev_priv = dev->dev_private;
9908 struct drm_display_mode *saved_mode; 9908 struct drm_display_mode *saved_mode;
9909 struct intel_crtc_config *pipe_config = NULL; 9909 struct intel_crtc_config *pipe_config = NULL;
9910 struct intel_crtc *intel_crtc; 9910 struct intel_crtc *intel_crtc;
@@ -10551,7 +10551,7 @@ static void intel_shared_dpll_init(struct drm_device *dev)
10551 10551
10552static void intel_crtc_init(struct drm_device *dev, int pipe) 10552static void intel_crtc_init(struct drm_device *dev, int pipe)
10553{ 10553{
10554 drm_i915_private_t *dev_priv = dev->dev_private; 10554 struct drm_i915_private *dev_priv = dev->dev_private;
10555 struct intel_crtc *intel_crtc; 10555 struct intel_crtc *intel_crtc;
10556 int i; 10556 int i;
10557 10557
@@ -11939,7 +11939,7 @@ struct intel_display_error_state {
11939struct intel_display_error_state * 11939struct intel_display_error_state *
11940intel_display_capture_error_state(struct drm_device *dev) 11940intel_display_capture_error_state(struct drm_device *dev)
11941{ 11941{
11942 drm_i915_private_t *dev_priv = dev->dev_private; 11942 struct drm_i915_private *dev_priv = dev->dev_private;
11943 struct intel_display_error_state *error; 11943 struct intel_display_error_state *error;
11944 int transcoders[] = { 11944 int transcoders[] = {
11945 TRANSCODER_A, 11945 TRANSCODER_A,