On Fri, May 08, 2015 at 08:22:46PM -0700, Chandra Konduru wrote:
> 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@xxxxxxxxx>
Queued for -next, thanks for the patch.
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> drivers/gpu/drm/i915/intel_sprite.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 66c78b6..c385a3b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3157,7 +3157,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], 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 fc1505b7..e23fe8e 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -232,7 +232,7 @@ 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,
> + tile_height = intel_tile_height(dev, fb->pixel_format,
> fb->modifier[0], 0);
Alignment isn't properly patched up here, continuatino should line up with
the opening (. I've fixed this while applying.
-Daniel
> stride = DIV_ROUND_UP(fb->height, tile_height);
> plane_size = (src_w << 16) | src_h;
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
