Commit 1400cc7e authored by Jani Nikula's avatar Jani Nikula

drm/i915: pass dev_priv to intel_device_info_runtime_init()

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

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ad5b448e4e318df0d292d73e6c3378f3e6b9bae5.1546267488.git.jani.nikula@intel.com
parent ed5eb1b7
...@@ -1374,7 +1374,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) ...@@ -1374,7 +1374,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
if (i915_inject_load_failure()) if (i915_inject_load_failure())
return -ENODEV; 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 (HAS_PPGTT(dev_priv)) {
if (intel_vgpu_active(dev_priv) && if (intel_vgpu_active(dev_priv) &&
......
...@@ -738,10 +738,9 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv) ...@@ -738,10 +738,9 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)
* - after the PCH has been detected, * - after the PCH has been detected,
* - before the first usage of the fields it can tweak. * - 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 = struct intel_device_info *info = mkwrite_device_info(dev_priv);
container_of(info, struct drm_i915_private, info);
struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv); struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
enum pipe pipe; enum pipe pipe;
......
...@@ -266,7 +266,7 @@ static inline void sseu_set_eus(struct sseu_dev_info *sseu, ...@@ -266,7 +266,7 @@ static inline void sseu_set_eus(struct sseu_dev_info *sseu,
const char *intel_platform_name(enum intel_platform platform); 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, void intel_device_info_dump(const struct intel_device_info *info,
struct drm_printer *p); struct drm_printer *p);
void intel_device_info_dump_flags(const struct intel_device_info *info, void intel_device_info_dump_flags(const struct intel_device_info *info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment