All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 3/6] drm/i915: pass dev_priv to intel_device_info_runtime_init()
Date: Mon, 31 Dec 2018 16:56:43 +0200	[thread overview]
Message-ID: <ad5b448e4e318df0d292d73e6c3378f3e6b9bae5.1546267488.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1546267488.git.jani.nikula@intel.com>
In-Reply-To: <cover.1546267488.git.jani.nikula@intel.com>

With the static/runtime device info split, this makes more sense.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          | 2 +-
 drivers/gpu/drm/i915/intel_device_info.c | 5 ++---
 drivers/gpu/drm/i915/intel_device_info.h | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f884b9a138cd..261932ee6837 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1374,7 +1374,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
 	if (i915_inject_load_failure())
 		return -ENODEV;
 
-	intel_device_info_runtime_init(mkwrite_device_info(dev_priv));
+	intel_device_info_runtime_init(dev_priv);
 
 	if (HAS_PPGTT(dev_priv)) {
 		if (intel_vgpu_active(dev_priv) &&
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index ffc5d75aa690..f35e8cff4b99 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -738,10 +738,9 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)
  *   - after the PCH has been detected,
  *   - before the first usage of the fields it can tweak.
  */
-void intel_device_info_runtime_init(struct intel_device_info *info)
+void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 {
-	struct drm_i915_private *dev_priv =
-		container_of(info, struct drm_i915_private, info);
+	struct intel_device_info *info = mkwrite_device_info(dev_priv);
 	struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
 	enum pipe pipe;
 
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index fa81ee15dfa1..f0e6d374d4ec 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -266,7 +266,7 @@ static inline void sseu_set_eus(struct sseu_dev_info *sseu,
 
 const char *intel_platform_name(enum intel_platform platform);
 
-void intel_device_info_runtime_init(struct intel_device_info *info);
+void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
 void intel_device_info_dump(const struct intel_device_info *info,
 			    struct drm_printer *p);
 void intel_device_info_dump_flags(const struct intel_device_info *info,
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-12-31 14:57 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-31 14:56 [PATCH 0/6] drm/i915: start splitting off runtime device info Jani Nikula
2018-12-31 14:56 ` [PATCH 1/6] drm/i915: start moving runtime device info to a separate struct Jani Nikula
2019-01-02  9:27   ` Tvrtko Ursulin
2019-01-02 10:21     ` Jani Nikula
2018-12-31 14:56 ` [PATCH 2/6] drm/i915/reg: abstract display_mmio_offset access Jani Nikula
2019-01-02  9:37   ` Tvrtko Ursulin
2018-12-31 14:56 ` Jani Nikula [this message]
2019-01-02  9:38   ` [PATCH 3/6] drm/i915: pass dev_priv to intel_device_info_runtime_init() Tvrtko Ursulin
2018-12-31 14:56 ` [PATCH 4/6] drm/i915: always use INTEL_INFO() to access device info Jani Nikula
2019-01-02  9:58   ` Tvrtko Ursulin
2018-12-31 14:56 ` [PATCH 5/6] drm/i915: drop intel_device_info_dump() Jani Nikula
2019-01-02 10:02   ` Tvrtko Ursulin
2019-01-02 10:42     ` Jani Nikula
2019-01-02 11:09       ` Tvrtko Ursulin
2018-12-31 14:56 ` [PATCH 6/6] drm/i915: rename dev_priv info to __info to avoid usage Jani Nikula
2019-01-02 10:04   ` Tvrtko Ursulin
2019-01-02 10:44     ` Jani Nikula
2019-01-02 11:10       ` Tvrtko Ursulin
2018-12-31 15:07 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: start splitting off runtime device info Patchwork
2018-12-31 15:10 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-12-31 15:43 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-31 17:53 ` ✓ Fi.CI.IGT: " Patchwork
2019-01-01 10:31 ` [PATCH 0/6] " Chris Wilson
2019-01-02  9:13   ` Jani Nikula
2019-01-02 10:17     ` Tvrtko Ursulin
2019-01-02 11:19       ` Jani Nikula

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=ad5b448e4e318df0d292d73e6c3378f3e6b9bae5.1546267488.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.