All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tursulin@ursulin.net>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 07/10] drm/i915: Make gmbus setup take dev_priv
Date: Wed, 30 Nov 2016 11:35:37 +0000	[thread overview]
Message-ID: <1480505740-1920-8-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c      | 4 ++--
 drivers/gpu/drm/i915/i915_drv.h      | 4 ++--
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_i2c.c     | 8 +++-----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 45b65962bd97..2d1f1090a1ff 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 @@ static int i915_load_modeset_init(struct drm_device *dev)
 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);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c6437c1422f3..0522aab3576b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3482,8 +3482,8 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv);
 void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
 
 /* intel_i2c.c */
-extern int intel_setup_gmbus(struct drm_device *dev);
-extern void intel_teardown_gmbus(struct drm_device *dev);
+extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
+extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);
 extern bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
 				     unsigned int pin);
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2785c619fa55..16fb90964a64 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -17162,7 +17162,7 @@ void intel_modeset_cleanup(struct drm_device *dev)
 
 	intel_cleanup_gt_powersave(dev_priv);
 
-	intel_teardown_gmbus(dev);
+	intel_teardown_gmbus(dev_priv);
 }
 
 void intel_connector_attach_encoder(struct intel_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 83f260bb4eef..85faba415633 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -617,11 +617,10 @@ static const struct i2c_algorithm gmbus_algorithm = {
 
 /**
  * intel_gmbus_setup - instantiate all Intel i2c GMBuses
- * @dev: DRM device
+ * @dev_priv: i915 device private
  */
-int intel_setup_gmbus(struct drm_device *dev)
+int intel_setup_gmbus(struct drm_i915_private *dev_priv)
 {
-	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct pci_dev *pdev = dev_priv->drm.pdev;
 	struct intel_gmbus *bus;
 	unsigned int pin;
@@ -724,9 +723,8 @@ void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)
 	mutex_unlock(&dev_priv->gmbus_mutex);
 }
 
-void intel_teardown_gmbus(struct drm_device *dev)
+void intel_teardown_gmbus(struct drm_i915_private *dev_priv)
 {
-	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_gmbus *bus;
 	unsigned int pin;
 
-- 
2.7.4

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

  parent reply	other threads:[~2016-11-30 11:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30 11:35 [PATCH 00/10] GEM object create and driver init dev_priv cleanups Tvrtko Ursulin
2016-11-30 11:35 ` [PATCH 01/10] drm/i915: Make GEM object alloc/free and stolen created take dev_priv Tvrtko Ursulin
2016-11-30 12:19   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 02/10] drm/i915: Make GEM object create and create from data " Tvrtko Ursulin
2016-11-30 12:22   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 03/10] drm/i915: Make various init functions " Tvrtko Ursulin
2016-11-30 12:27   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 04/10] drm/i915: More GEM init dev_priv cleanup Tvrtko Ursulin
2016-11-30 12:08   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 05/10] drm/i915: dev_priv cleanup in bridge/bar/mmio init code Tvrtko Ursulin
2016-11-30 12:06   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 06/10] drm/i915: Unexport VGA switcheroo functions Tvrtko Ursulin
2016-11-30 12:03   ` Joonas Lahtinen
2016-11-30 11:35 ` Tvrtko Ursulin [this message]
2016-11-30 12:28   ` [PATCH 07/10] drm/i915: Make gmbus setup take dev_priv Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 08/10] drm/i915: Make i915_destroy_error_state " Tvrtko Ursulin
2016-11-30 12:10   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 09/10] drm/i915: Make i915_save/restore_state and intel_i2c_reset " Tvrtko Ursulin
2016-11-30 12:13   ` Joonas Lahtinen
2016-11-30 11:35 ` [PATCH 10/10] drm/i915: Make intel_pm_setup " Tvrtko Ursulin
2016-11-30 12:14   ` Joonas Lahtinen
2016-11-30 12:05 ` [PATCH 00/10] GEM object create and driver init dev_priv cleanups Chris Wilson
2016-12-01  2:31 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-12-01 14:16 [PATCH v2 00/10] " Tvrtko Ursulin
2016-12-01 14:16 ` [PATCH 07/10] drm/i915: Make gmbus setup take dev_priv Tvrtko Ursulin

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=1480505740-1920-8-git-send-email-tvrtko.ursulin@linux.intel.com \
    --to=tursulin@ursulin.net \
    --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.