summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorTvrtko Ursulin2016-12-01 15:16:42 +0100
committerTvrtko Ursulin2016-12-01 19:01:22 +0100
commit401964465f04f3c01dd7ddfe6b5149bc33eaa509 (patch)
tree811865908fa37a98f37b5a2482e2cec9cc664613 /drivers/gpu/drm/i915/i915_drv.c
parentdrm/i915: Unexport VGA switcheroo functions (diff)
downloadkernel-qcow2-linux-401964465f04f3c01dd7ddfe6b5149bc33eaa509.tar.gz
kernel-qcow2-linux-401964465f04f3c01dd7ddfe6b5149bc33eaa509.tar.xz
kernel-qcow2-linux-401964465f04f3c01dd7ddfe6b5149bc33eaa509.zip
drm/i915: Make gmbus setup take dev_priv
Simplify the code by passing the right argument in. v2: Commit message. (Joonas Lahtinen) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c4
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 362c8baef640..fee0b46a04bc 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -592,7 +592,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret)
goto cleanup_csr;
- intel_setup_gmbus(dev);
+ intel_setup_gmbus(dev_priv);
/* Important: The output setup functions called by modeset_init need
* working irqs for e.g. gmbus and dp aux transfers. */
@@ -629,7 +629,7 @@ cleanup_gem:
cleanup_irq:
intel_guc_fini(dev_priv);
drm_irq_uninstall(dev);
- intel_teardown_gmbus(dev);
+ intel_teardown_gmbus(dev_priv);
cleanup_csr:
intel_csr_ucode_fini(dev_priv);
intel_power_domains_fini(dev_priv);