drm/i915: Make intel_crtc->config a pointer

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_fbdev.c

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 04d582b50364c70e501093f666bde165da29d61e..3eea7ed84bb19cab16423bc596276a081aabe647 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -443,7 +443,7 @@ retry:
                        DRM_DEBUG_KMS("looking for current mode on connector %s\n",
                                      connector->name);
                        intel_mode_from_pipe_config(&encoder->crtc->hwmode,
-                                                   &to_intel_crtc(encoder->crtc)->config);
+                                                   to_intel_crtc(encoder->crtc)->config);
                        modes[i] = &encoder->crtc->hwmode;
                }
                crtcs[i] = new_crtc;
@@ -581,7 +581,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
                 * pipe.  Note we need to use the selected fb's pitch and bpp
                 * rather than the current pipe's, since they differ.
                 */
-               cur_size = intel_crtc->config.base.adjusted_mode.crtc_hdisplay;
+               cur_size = intel_crtc->config->base.adjusted_mode.crtc_hdisplay;
                cur_size = cur_size * fb->base.bits_per_pixel / 8;
                if (fb->base.pitches[0] < cur_size) {
                        DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
@@ -592,13 +592,13 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
                        break;
                }
 
-               cur_size = intel_crtc->config.base.adjusted_mode.crtc_vdisplay;
+               cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
                cur_size = ALIGN(cur_size, plane_config->tiled ? (IS_GEN2(dev) ? 16 : 8) : 1);
                cur_size *= fb->base.pitches[0];
                DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
                              pipe_name(intel_crtc->pipe),
-                             intel_crtc->config.base.adjusted_mode.crtc_hdisplay,
-                             intel_crtc->config.base.adjusted_mode.crtc_vdisplay,
+                             intel_crtc->config->base.adjusted_mode.crtc_hdisplay,
+                             intel_crtc->config->base.adjusted_mode.crtc_vdisplay,
                              fb->base.bits_per_pixel,
                              cur_size);