drm/i915: call intel_tile_height with correct parameter

In skylake update plane functions, intel_tile_height() is called with
bits_per_pixel instead of pixel_format. Correcting it.

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
[danvet: Fixup alignment.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4a043a558871f98bc8263e0385b5594800900068..da64f0ed7b93482d811d343611810a98ecc2b576 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3115,7 +3115,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
 
        if (intel_rotation_90_or_270(rotation)) {
                /* stride = Surface height in tiles */
-               tile_height = intel_tile_height(dev, fb->bits_per_pixel,
+               tile_height = intel_tile_height(dev, fb->pixel_format,
                                                fb->modifier[0]);
                stride = DIV_ROUND_UP(fb->height, tile_height);
                x_offset = stride * tile_height - y - src_h;

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index f215e223aa4a9b11cd9a74d015dca7fd59b5f922..497e7953ad4de002125f41ee04cdfa2e72b72b78 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -229,8 +229,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
 
        if (intel_rotation_90_or_270(rotation)) {
                /* stride: Surface height in tiles */
-               tile_height = intel_tile_height(dev, fb->bits_per_pixel,
-                                                       fb->modifier[0]);
+               tile_height = intel_tile_height(dev, fb->pixel_format,
+                                               fb->modifier[0]);
                stride = DIV_ROUND_UP(fb->height, tile_height);
                plane_size = (src_w << 16) | src_h;
                x_offset = stride * tile_height - y - (src_h + 1);