On Wed, Oct 14, 2015 at 07:28:57PM +0300, ville.syrj...@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Use the actual tile size as to compute stuff in
> intel_fill_fb_ggtt_view() instead of assuming it's PAGE_SIZE. I suppose
> it doesn't matter since we don't use the results on gen2 platforms
> where the tile size is 2k.
Well maybe 64k Ys will eventually happen as a super-maxfifo mode for
performance in games ;-)
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
>
> v2: Update due to CbCr plane
>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index d028326..c8b2907 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2280,8 +2280,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view,
> struct drm_framebuffer *fb,
> {
> struct drm_i915_private *dev_priv = to_i915(fb->dev);
> struct intel_rotation_info *info = &view->rotation_info;
> - unsigned int tile_height, tile_pitch;
> - unsigned int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
> + unsigned int tile_size, tile_width, tile_height, cpp;
>
> *view = i915_ggtt_view_normal;
>
> @@ -2299,19 +2298,24 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view,
> struct drm_framebuffer *fb,
> info->uv_offset = fb->offsets[1];
> info->fb_modifier = fb->modifier[0];
>
> - tile_height = intel_tile_height(dev_priv, fb->modifier[0], cpp);
> - tile_pitch = PAGE_SIZE / tile_height;
> - info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_pitch);
> + tile_size = intel_tile_size(dev_priv);
> +
> + cpp = drm_format_plane_cpp(fb->pixel_format, 0);
> + tile_width = intel_tile_width(dev_priv, cpp, fb->modifier[0]);
> + tile_height = tile_size / tile_width;
> +
> + info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width);
> info->height_pages = DIV_ROUND_UP(fb->height, tile_height);
> - info->size = info->width_pages * info->height_pages * PAGE_SIZE;
> + info->size = info->width_pages * info->height_pages * tile_size;
>
> if (info->pixel_format == DRM_FORMAT_NV12) {
> cpp = drm_format_plane_cpp(fb->pixel_format, 1);
> - tile_height = intel_tile_height(dev_priv, fb->modifier[1], cpp);
> - tile_pitch = PAGE_SIZE / tile_height;
> - info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_pitch);
> + tile_width = intel_tile_width(dev_priv, fb->modifier[1], cpp);
> + tile_height = tile_size / tile_width;
> +
> + info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_width);
> info->height_pages_uv = DIV_ROUND_UP(fb->height / 2,
> tile_height);
> - info->size_uv = info->width_pages_uv * info->height_pages_uv *
> PAGE_SIZE;
> + info->size_uv = info->width_pages_uv * info->height_pages_uv *
> tile_size;
> }
>
> return 0;
> --
> 2.4.9
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
