| Message ID | 1479498793-31021-31-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Nov 18, 2016 at 09:53:06PM +0200, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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ä <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 8f63fd38deee..5d8db436c557 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); > > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Nov 18, 2016 at 09:53:06PM +0200, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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ä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 8f63fd38deee..5d8db436c557 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); Grep seems to say that we can nuke these two after this patch? I didn't find that patch in your series ... -Daniel > + 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); > > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8f63fd38deee..5d8db436c557 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);