diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-05 11:52:17 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-05 11:52:17 +0300 |
| commit | 93cd6fa6806cb3455e8231578840afb031606352 (patch) | |
| tree | 042f13cde2701b880d512c5cd6b263b0197cc39f /drivers/gpu/drm/i915/intel_fbdev.c | |
| parent | ce6612d6844701a5b5a162f201103240c07abd9e (diff) | |
| parent | f03ee46be9401e3434f52bb15e92d1e640f76438 (diff) | |
| download | linux-93cd6fa6806cb3455e8231578840afb031606352.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Resync, and we need all the fancy new drm_mm stuff to implement more
efficient evict algorithms for softpin.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 3c445b92e988..2163aaad6a36 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -633,7 +633,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay; cur_size = intel_fb_align_height(dev, cur_size, fb->base.pixel_format, - fb->base.modifier[0]); + fb->base.modifier); cur_size *= fb->base.pitches[0]; DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n", pipe_name(intel_crtc->pipe), |