From patchwork Fri Jun 24 13:00:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9197467 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 385586075F for ; Fri, 24 Jun 2016 13:01:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27EFC284B1 for ; Fri, 24 Jun 2016 13:01:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CCC4284B4; Fri, 24 Jun 2016 13:01:35 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9CD8284B1 for ; Fri, 24 Jun 2016 13:01:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8ACE06EAB9; Fri, 24 Jun 2016 13:01:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3301B6EAAE for ; Fri, 24 Jun 2016 13:00:43 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id c82so4799933wme.3 for ; Fri, 24 Jun 2016 06:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=EWQo3TxI80NMJs9gvhQVwpHcrThlnSiEWqoEwVMu2RY=; b=DVHfXxUMygTRpWvd/59HOQYU6mhxz8iikTYlgzrRU010Mk2UchFiqsTnuk+Eect1/0 wGulCgw9llO/lIOpwN18JOBXVGZBQtx4Da1SFYdl8YaA7pMWoQRGQ3kTJuFWXUIiLPm3 B+Jq3+4Fs666yww8gMSiEZRXPNt3ccGske90O3XicIdnAPNRfQ8d+hI1vL/27Rhpodkn /ExrcXcIZ4r3hGhXe/J3gEiqt6Id1eg522Af9PZ6hoKsxq8afGvcJYU9Mwo/7jIJ33Ha tjWvFeS7Mvfj97nWngbRdAl4iLLNQ2g4zWZKsNkLJuf1H5BC2VECgx8+GO4mLj11Aopb 7B2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=EWQo3TxI80NMJs9gvhQVwpHcrThlnSiEWqoEwVMu2RY=; b=lpPzZkBmJ2+dJ3nctvZxvbA0IiymcpoKEarOlf/axht5/8uUC5T8Ljmz5zRhGwC453 b9WC+RFNn5CpaCgjV4rQ0eP5ud0yWS/eqrhVChWqS7D2SfWhdUs2QKe3wRtVwUG100i3 Ildco5HYvo9pGi2eHdR5h+uUSkI5X0vv+/Wx/71mLgewYxI8zdT3BL0N3N8TnGo5H2+Y MZc4yRZ2Q3hswfX35iTz9bhJDr359bkcy5Coqp+psu1FrUPgaDENj/wFC021BChpVMzR iLki7thMNgVVlv/NNiN7ffxY0yx1mTyqDC89x7PyIkWAPfOW2XBMekVhy5S4yQfIuDN6 U86A== X-Gm-Message-State: ALyK8tIAh1MAmbBIugg+wrTGVHZF+vU8IicfJIQE0XI929+NwOUBt0wNvyCwHZu0yJGp2g== X-Received: by 10.28.181.146 with SMTP id e140mr5616448wmf.38.1466773241446; Fri, 24 Jun 2016 06:00:41 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id ue1sm5032952wjc.44.2016.06.24.06.00.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jun 2016 06:00:40 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Jun 2016 14:00:21 +0100 Message-Id: <1466773227-7994-9-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466773227-7994-1-git-send-email-chris@chris-wilson.co.uk> References: <1466773227-7994-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 09/15] drm/i915: Start exploiting drm_device subclassing 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 Baby step, update to_i915() conversion from drm_device to drm_i915_private: text data bss dec hex filename 1108812 23207 416 1132435 114793 i915.ko (before) 1104999 23207 416 1128622 1138ae i915.ko (after) Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Cc: Daniel Vetter Reviewed-by: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_drv.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 520ee8a6bb7a..e0fc47b8b7ee 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2046,7 +2046,7 @@ struct drm_i915_private { static inline struct drm_i915_private *to_i915(const struct drm_device *dev) { - return dev->dev_private; + return container_of(dev, struct drm_i915_private, drm); } static inline struct drm_i915_private *dev_to_i915(struct device *dev) @@ -2622,7 +2622,7 @@ struct drm_i915_cmd_table { #define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) #define REVID_FOREVER 0xff -#define INTEL_REVID(p) (__I915__(p)->dev->pdev->revision) +#define INTEL_REVID(p) (__I915__(p)->drm.pdev->revision) #define GEN_FOREVER (0) /* @@ -3501,7 +3501,7 @@ i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id) { struct i915_gem_context *ctx; - lockdep_assert_held(&file_priv->dev_priv->dev->struct_mutex); + lockdep_assert_held(&file_priv->dev_priv->drm.struct_mutex); ctx = idr_find(&file_priv->context_idr, id); if (!ctx) @@ -3517,7 +3517,7 @@ static inline void i915_gem_context_reference(struct i915_gem_context *ctx) static inline void i915_gem_context_unreference(struct i915_gem_context *ctx) { - lockdep_assert_held(&ctx->i915->dev->struct_mutex); + lockdep_assert_held(&ctx->i915->drm.struct_mutex); kref_put(&ctx->ref, i915_gem_context_free); } @@ -3593,7 +3593,7 @@ void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv); /* i915_gem_tiling.c */ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj) { - struct drm_i915_private *dev_priv = obj->base.dev->dev_private; + struct drm_i915_private *dev_priv = to_i915(obj->base.dev); return dev_priv->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 && obj->tiling_mode != I915_TILING_NONE;