浏览代码

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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170114002827.31315-6-chris@chris-wilson.co.uk
Chris Wilson 8 年之前
父节点
当前提交
7b92c047ba
共有 3 个文件被更改,包括 2 次插入7 次删除
  1. 0 3
      drivers/gpu/drm/i915/i915_gem_gtt.c
  2. 0 1
      drivers/gpu/drm/i915/i915_gem_gtt.h
  3. 2 3
      drivers/gpu/drm/i915/intel_display.c

+ 0 - 3
drivers/gpu/drm/i915/i915_gem_gtt.c

@@ -106,9 +106,6 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma);
 const struct i915_ggtt_view i915_ggtt_view_normal = {
 const struct i915_ggtt_view i915_ggtt_view_normal = {
 	.type = 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)
 static void gen6_ggtt_invalidate(struct drm_i915_private *dev_priv)
 {
 {

+ 0 - 1
drivers/gpu/drm/i915/i915_gem_gtt.h

@@ -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_normal;
-extern const struct i915_ggtt_view i915_ggtt_view_rotated;
 
 
 enum i915_cache_level;
 enum i915_cache_level;
 
 

+ 2 - 3
drivers/gpu/drm/i915/intel_display.c

@@ -2137,11 +2137,10 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view,
 			const struct drm_framebuffer *fb,
 			const struct drm_framebuffer *fb,
 			unsigned int rotation)
 			unsigned int rotation)
 {
 {
+	view->type = I915_GGTT_VIEW_NORMAL;
 	if (drm_rotation_90_or_270(rotation)) {
 	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;
 		view->rotated = to_intel_framebuffer(fb)->rot_info;
-	} else {
-		*view = i915_ggtt_view_normal;
 	}
 	}
 }
 }