On Wed, Feb 05, 2014 at 05:30:43PM +0000, Jesse Barnes wrote: > For use by get_plane_config. > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 4d4a0d9..e2f1db6 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1929,6 +1929,14 @@ static bool need_vtd_wa(struct drm_device *dev) > return false; > } > > +static int intel_align_height(struct drm_device *dev, int height, bool tiled) > +{ > + int tile_height; > + > + tile_height = IS_GEN2(dev) ? 16 : 8; > + return ALIGN(height, tiled ? tile_height : 1); Might as well take a moment here to move that ?: outside of the macro. tile_height = tiled ? IS_GEN2(dev) ? 16 : 8 : 1; -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx