From patchwork Sat Dec 31 12:06:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9492711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CFC7662ABB for ; Sat, 31 Dec 2016 12:11:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E2C223B2 for ; Sat, 31 Dec 2016 12:11:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96D87252D5; Sat, 31 Dec 2016 12:11:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 27C25223A6 for ; Sat, 31 Dec 2016 12:11:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9EBC89DF7; Sat, 31 Dec 2016 12:11:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 104056E2E3 for ; Sat, 31 Dec 2016 12:07:18 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id c85so36717690wmi.1 for ; Sat, 31 Dec 2016 04:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jhVtUyFmcylWoiMmCNFg5Qzh6Qybe9ETaqHcMbDtq/Q=; b=jmeZU1TQ+LJhRgmoYA509mDT+//RHtE+HYA813KOnBznENQY3IPyGZsuQ0CrRb7R2J 20XMFRrhUR8/PbRElBygEPXP37sqA9/+8pQQGZqSc62XbqI+RXUgh/BIu4BXnXtmyYRO RfWKD7pibBqbiQY+pfP7jEm5z0VvkiZZ5f3w/m01sJM1O7sLE5pLVCA9dra3x9jZP5qv NhoqgmRJqt/c3UFgxb9lzzj430K/lyurU5nEfZrAzYaM6HIb/f5TF0Q9VSc9jTHC3h4w GjQGbFvjzUjnHyqCsROaq4DFVm1d0LGXq/m4zH0Z5o8SJVdZLFYKExKTNF53k0Bdnca+ yr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=jhVtUyFmcylWoiMmCNFg5Qzh6Qybe9ETaqHcMbDtq/Q=; b=pcURBjwEWtThyEu0ipKhhY/T/Ml8exisYSTYvTaQXd8BT9Zy9H5eY7UHtXDudxBF/Q V+JNKj4SBq6YcTzueymZ/R0amhwF02Lbx1TKPEEmbiyvdd2RkzQmNJnlyjG5ElZIaTv9 blthO+ldN7+QRu34G6niIjH1K5gcvzFWpzcW+c/ugRwjfAAfl13EV1MkhXkK3X+KsAaA 1/zyFSYF4oL8ERYv1o3OL8MMbkX/j4ETXn0KljBzzlzxvPUJk3+Ki6Qd9DVelQkDXObw 49oSXhUw6dXkbWdHEOLYqz8cFVK09BSakXjSyIHW0yViHlIhU3dpi098PKjRty8v8voS 2SmQ== X-Gm-Message-State: AIkVDXIcNNFcAeTSP3JvPeoOfqgk7Xi4sT8IdIcr0iDK7iQnK4fHtBq+Q2PN/6mdQmCR+A== X-Received: by 10.28.163.5 with SMTP id m5mr45375370wme.98.1483186036031; Sat, 31 Dec 2016 04:07:16 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id c81sm74411987wmf.22.2016.12.31.04.07.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Dec 2016 04:07:15 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sat, 31 Dec 2016 12:06:49 +0000 Message-Id: <20161231120702.21204-14-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161231120702.21204-1-chris@chris-wilson.co.uk> References: <20161231120702.21204-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 13/26] drm/i915: Eliminate superfluous i915_ggtt_view_rotated X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 --- drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - drivers/gpu/drm/i915/intel_display.c | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index f863f2f98c7e..2c7000310030 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -102,9 +102,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, -}; int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, int enable_ppgtt) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index b2daca712df7..bdfd6c210fb9 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -191,7 +191,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; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7f12db705408..dcd413ce4d84 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2138,11 +2138,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; } }