Commit 9e759ff1 authored Jun 23, 2015 by Tvrtko Ursulin Committed by Daniel Vetter Jun 24, 2015

drm/i915: Return correct size for rotated views

Currently object size is returned for the rotated VMA size which can be
bigger than the rotated view itself. Since the binding code pads all
excess size with scratch pages the only minor issue with this is wasting
some GGTT space, but still feels nicer to fix and report the real size.

v2: Rebase for tracking size in bytes instead of pages.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 84fe03f7

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2899,9 +2899,10 @@ size_t
		i915_ggtt_view_size(struct drm_i915_gem_object *obj,
		const struct i915_ggtt_view *view)
		{
		if (view->type == I915_GGTT_VIEW_NORMAL \|\|
		view->type == I915_GGTT_VIEW_ROTATED) {
		if (view->type == I915_GGTT_VIEW_NORMAL) {
		return obj->base.size;
		} else if (view->type == I915_GGTT_VIEW_ROTATED) {
		return view->rotation_info.size;
		} else if (view->type == I915_GGTT_VIEW_PARTIAL) {
		return view->params.partial.size << PAGE_SHIFT;
		} else {