Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b92c047 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Eliminate superfluous i915_ggtt_view_rotated 



It is only being used to clear a struct and set the type, after which it
is overwritten. Since we no longer check the unset bits of the union,
skipping the clear is permissible.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170114002827.31315-6-chris@chris-wilson.co.uk
parent 8bab1193

drivers/gpu/drm/i915/i915_gem_gtt.c

+0 −3
Original line number Diff line number Diff line
@@ -106,9 +106,6 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma); 
const struct i915_ggtt_view i915_ggtt_view_normal = {

	.type = I915_GGTT_VIEW_NORMAL,

};

const struct i915_ggtt_view i915_ggtt_view_rotated = {

	.type = I915_GGTT_VIEW_ROTATED,

};



static void gen6_ggtt_invalidate(struct drm_i915_private *dev_priv)

{

drivers/gpu/drm/i915/i915_gem_gtt.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ struct i915_ggtt_view { 
};



extern const struct i915_ggtt_view i915_ggtt_view_normal;

extern const struct i915_ggtt_view i915_ggtt_view_rotated;



enum i915_cache_level;

drivers/gpu/drm/i915/intel_display.c

+2 −3
Original line number Diff line number Diff line
@@ -2137,11 +2137,10 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, 
			const struct drm_framebuffer *fb,

			unsigned int rotation)

{

	view->type = I915_GGTT_VIEW_NORMAL;

	if (drm_rotation_90_or_270(rotation)) {

		*view = i915_ggtt_view_rotated;

		view->type = I915_GGTT_VIEW_ROTATED;

		view->rotated = to_intel_framebuffer(fb)->rot_info;

	} else {

		*view = i915_ggtt_view_normal;

	}

}