diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index f99332972b7a..2480c7d6edee 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c | |||
@@ -593,7 +593,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, | |||
593 | * pipe. Note we need to use the selected fb's pitch and bpp | 593 | * pipe. Note we need to use the selected fb's pitch and bpp |
594 | * rather than the current pipe's, since they differ. | 594 | * rather than the current pipe's, since they differ. |
595 | */ | 595 | */ |
596 | cur_size = intel_crtc->config->base.adjusted_mode.crtc_hdisplay; | 596 | cur_size = crtc->state->adjusted_mode.crtc_hdisplay; |
597 | cur_size = cur_size * fb->base.format->cpp[0]; | 597 | cur_size = cur_size * fb->base.format->cpp[0]; |
598 | if (fb->base.pitches[0] < cur_size) { | 598 | if (fb->base.pitches[0] < cur_size) { |
599 | DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n", | 599 | DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n", |
@@ -603,13 +603,13 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, | |||
603 | break; | 603 | break; |
604 | } | 604 | } |
605 | 605 | ||
606 | cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay; | 606 | cur_size = crtc->state->adjusted_mode.crtc_vdisplay; |
607 | cur_size = intel_fb_align_height(&fb->base, 0, cur_size); | 607 | cur_size = intel_fb_align_height(&fb->base, 0, cur_size); |
608 | cur_size *= fb->base.pitches[0]; | 608 | cur_size *= fb->base.pitches[0]; |
609 | DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n", | 609 | DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n", |
610 | pipe_name(intel_crtc->pipe), | 610 | pipe_name(intel_crtc->pipe), |
611 | intel_crtc->config->base.adjusted_mode.crtc_hdisplay, | 611 | crtc->state->adjusted_mode.crtc_hdisplay, |
612 | intel_crtc->config->base.adjusted_mode.crtc_vdisplay, | 612 | crtc->state->adjusted_mode.crtc_vdisplay, |
613 | fb->base.format->cpp[0] * 8, | 613 | fb->base.format->cpp[0] * 8, |
614 | cur_size); | 614 | cur_size); |
615 | 615 | ||