summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_fbdev.c
diff options
context:
space:
mode:
authorVille Syrjälä2017-03-07 20:42:06 +0100
committerVille Syrjälä2017-03-08 15:35:56 +0100
commitd88c4afddc5519d49ee621e0437abb9c6a25fafb (patch)
tree5bb18f2bb9e7673c748fd43d041876fd49fcafa9 /drivers/gpu/drm/i915/intel_fbdev.c
parentdrm/i915: suppress atomic commit error message under gvt-g env (diff)
downloadkernel-qcow2-linux-d88c4afddc5519d49ee621e0437abb9c6a25fafb.tar.gz
kernel-qcow2-linux-d88c4afddc5519d49ee621e0437abb9c6a25fafb.tar.xz
kernel-qcow2-linux-d88c4afddc5519d49ee621e0437abb9c6a25fafb.zip
drm/i915: Plumb drm_framebuffer into more places
Now that framebuffers can be used even before calling drm_framebuffer_init() we can start to plumb them into more places, instead of passing individual pieces for fb metadata. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170307194210.13400-2-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f7e9a4e69595..332254a8eebe 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -619,9 +619,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(to_i915(dev), cur_size,
- fb->base.format->format,
- fb->base.modifier);
+ cur_size = intel_fb_align_height(&fb->base, 0, cur_size);
cur_size *= fb->base.pitches[0];
DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
pipe_name(intel_crtc->pipe),