From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH v2 18/21] drm/i915: Start exploiting drm_device subclassing
Date: Mon, 30 May 2016 13:38:25 +0300 [thread overview]
Message-ID: <1464604705.4825.8.camel@linux.intel.com> (raw)
In-Reply-To: <1464597519-16659-19-git-send-email-chris@chris-wilson.co.uk>
On ma, 2016-05-30 at 09:38 +0100, Chris Wilson wrote:
> 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 <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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 1fd7a21243ae..fe121a8af146 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2033,7 +2033,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)
> @@ -2602,7 +2602,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)
> /*
> @@ -3439,7 +3439,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)
> @@ -3455,7 +3455,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);
> }
>
> @@ -3531,7 +3531,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;
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-05-30 10:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 8:38 Reordering debugfs registration vs driver loader, take 2 Chris Wilson
2016-05-30 8:38 ` [PATCH v2 01/21] drm: Export drm_dev_init() for subclassing Chris Wilson
2016-06-01 10:01 ` Daniel Vetter
2016-06-01 10:07 ` Daniel Vetter
2016-06-01 10:29 ` Chris Wilson
2016-05-30 8:38 ` [PATCH v2 02/21] drm: Add a callback from connector registering Chris Wilson
2016-06-01 9:57 ` Daniel Vetter
2016-06-01 10:38 ` Chris Wilson
2016-06-01 14:42 ` Daniel Vetter
2016-05-30 8:38 ` [PATCH v2 03/21] drm: Make drm_connector_register() safe against multiple calls Chris Wilson
2016-06-01 9:45 ` Daniel Vetter
2016-05-30 8:38 ` [PATCH v2 04/21] drm: Automatically unregister the connector during cleanup Chris Wilson
2016-06-01 9:45 ` Daniel Vetter
2016-05-30 8:38 ` [PATCH v2 05/21] drm: Minimally initialise drm_dp_aux Chris Wilson
2016-06-01 9:49 ` Daniel Vetter
2016-06-01 9:54 ` Chris Wilson
2016-05-30 8:38 ` [PATCH v2 06/21] drm/i915: Perform async fbdev initialisation much later Chris Wilson
2016-05-30 8:38 ` [PATCH v2 07/21] drm/i915: Make panel/backlight safe to setup/cleanup multiple times Chris Wilson
2016-05-30 8:38 ` [PATCH v2 08/21] drm/i915: Move panel's pipe from backlight setup to init Chris Wilson
2016-05-30 8:38 ` [PATCH v2 09/21] drm/i915: Move intel_connector->unregister to connector->early_unregister Chris Wilson
2016-05-30 8:38 ` [PATCH v2 10/21] drm/i915: Move backlight unregistration to connector unregistration Chris Wilson
2016-05-30 8:38 ` [PATCH v2 11/21] drm/i915: Move registration actions to connector->late_register Chris Wilson
2016-05-30 8:38 ` [PATCH v2 12/21] drm/i915: Move backlight setup to connector registration Chris Wilson
2016-05-30 8:38 ` [PATCH v2 13/21] drm/i915: Move backlight registration " Chris Wilson
2016-05-30 8:38 ` [PATCH v2 14/21] drm/i915: Move connector registration to driver registration Chris Wilson
2016-05-30 8:38 ` [PATCH v2 15/21] drm/i915: Register debugfs interface last Chris Wilson
2016-05-30 8:38 ` [PATCH v2 16/21] drm/i915: Demidlayer driver loading Chris Wilson
2016-05-30 8:38 ` [PATCH v2 17/21] drm/i915: Demidlayer driver unloading Chris Wilson
2016-05-30 8:38 ` [PATCH v2 18/21] drm/i915: Start exploiting drm_device subclassing Chris Wilson
2016-05-30 10:38 ` Joonas Lahtinen [this message]
2016-05-30 8:38 ` [PATCH v2 19/21] drm/i915: Merge i915_dma.c into i915_drv.c Chris Wilson
2016-05-30 8:38 ` [PATCH v2 20/21] drm/i915: Split out the PCI driver interface to i915_pci.c Chris Wilson
2016-05-30 8:38 ` [PATCH v2 21/21] drm/i915: Move module init/exit " Chris Wilson
2016-05-30 8:51 ` ✓ Ro.CI.BAT: success for series starting with [v2,01/21] drm: Export drm_dev_init() for subclassing Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464604705.4825.8.camel@linux.intel.com \
--to=joonas.lahtinen@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox