diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-09-20 21:54:21 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-09-23 10:50:43 +0300 |
| commit | 6cd02e77757a8fb0089053045932455355d2c4fd (patch) | |
| tree | 42a04ebfeedcee29612c8ae4da67ede915d768cc /drivers/gpu/drm/i915/i915_drv.c | |
| parent | e1a3d9895ddcec20cbb7353e77759589cf010275 (diff) | |
| download | linux-6cd02e77757a8fb0089053045932455355d2c4fd.tar.xz | |
drm/i915: pass i915 to intel_modeset_init() and intel_modeset_init_hw()
In general, prefer struct drm_i915_private * over struct drm_device *
when either will do. Rename the local variables to i915. No functional
changes.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190920185421.17822-6-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9b1788b4589e..dd9613e45723 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -378,7 +378,7 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915) /* Important: The output setup functions called by modeset_init need * working irqs for e.g. gmbus and dp aux transfers. */ - ret = intel_modeset_init(&i915->drm); + ret = intel_modeset_init(i915); if (ret) goto cleanup_irq; @@ -1946,7 +1946,7 @@ static int i915_drm_resume(struct drm_device *dev) i915_gem_resume(dev_priv); - intel_modeset_init_hw(dev); + intel_modeset_init_hw(dev_priv); intel_init_clock_gating(dev_priv); spin_lock_irq(&dev_priv->irq_lock); |