From: Ville Syrjälä Date: Fri, 18 Nov 2016 19:53:06 +0000 (+0200) Subject: drm/i915: Use drm_framebuffer_plane_{width,height}() where possible X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=145fcb115052c31f9aa5bed0ae9f9c4dd51b49ae;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/i915: Use drm_framebuffer_plane_{width,height}() where possible Replace drm_format_plane_{width,height}() usage with drm_framebuffer_plane_{width,height}() to avoid the lookup of the format info. Cc: intel-gfx@lists.freedesktop.org Signed-off-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-31-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3c064558cde0..87a0bba764c7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2496,7 +2496,6 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv, struct intel_rotation_info *rot_info = &intel_fb->rot_info; u32 gtt_offset_rotated = 0; unsigned int max_size = 0; - uint32_t format = fb->pixel_format; int i, num_planes = fb->format->num_planes; unsigned int tile_size = intel_tile_size(dev_priv); @@ -2507,8 +2506,8 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv, int x, y; cpp = fb->format->cpp[i]; - width = drm_format_plane_width(fb->width, format, i); - height = drm_format_plane_height(fb->height, format, i); + width = drm_framebuffer_plane_width(fb->width, fb, i); + height = drm_framebuffer_plane_height(fb->height, fb, i); intel_fb_offset_to_xy(&x, &y, fb, i);