Re: [PATCH 07/18] drm/i915: Fix intel_tile_width() parameters

Ville Syrjälä
2016-01-28T18:35:29Z

On Mon, Jan 25, 2016 at 06:12:15PM +0100, Daniel Vetter wrote:
> On Wed, Jan 20, 2016 at 09:05:28PM +0200, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > The fb_modifiers and cpp arguments passed to intel_tile_width() in
> > intel_fill_fb_ggtt_view() got accidentally swapped around. I'm pretty
> > sure I fixed this already, but could be I lost the fix accidentally
> > during some rebases or something. Anyway, fix it up for real.
> >
> > Fixes: d9b3288ecf2f ("drm/i915: change intel_fill_fb_ggtt_view() to use the real tile size")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Just to check my understanding: We did blow up in the MISSING_CASE in
> tile_width for this in some igt, right? Please add a Testcase: igt/foo/bar
> line for the one that makes it go boom. With that

This will do for example:
Testcase: igt/kms_rotation_crc/primary-rotation-90

>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: drm-intel-fixes@lists.freedesktop.org
>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index f94ddad704b2..cfd52ea68e34 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -2306,7 +2306,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb,
> > 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_width = intel_tile_width(dev_priv, fb->modifier[0], cpp);
> > tile_height = tile_size / tile_width;
> >
> > info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width);
> > --
> > 2.4.10
> >
> > _______________________________________________
> > 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

--
Ville Syrjälä
Intel OTC