Commit 40196446 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

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: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 7f26cb88

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -3478,8 +3478,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);

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/intel_i2c.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE