Commit 3de6f852 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: rename init/fini/prune uncore functions 



Add "_mmio" postfix to be consistent from the init/fini phase they're
called from.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190402201032.15841-2-daniele.ceraolospurio@intel.com
parent 6cbe8830

drivers/gpu/drm/i915/i915_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) 
	if (i915_get_bridge_dev(dev_priv))

		return -EIO;



	ret = intel_uncore_init(&dev_priv->uncore);

	ret = intel_uncore_init_mmio(&dev_priv->uncore);

	if (ret < 0)

		goto err_bridge;
@@ -966,7 +966,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) 


	intel_device_info_init_mmio(dev_priv);



	intel_uncore_prune(&dev_priv->uncore);

	intel_uncore_prune_mmio_domains(&dev_priv->uncore);



	intel_uc_init_mmio(dev_priv);
@@ -980,7 +980,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) 


err_uncore:

	intel_teardown_mchbar(dev_priv);

	intel_uncore_fini(&dev_priv->uncore);

	intel_uncore_fini_mmio(&dev_priv->uncore);

err_bridge:

	pci_dev_put(dev_priv->bridge_dev);
@@ -994,7 +994,7 @@ err_bridge: 
static void i915_driver_cleanup_mmio(struct drm_i915_private *dev_priv)

{

	intel_teardown_mchbar(dev_priv);

	intel_uncore_fini(&dev_priv->uncore);

	intel_uncore_fini_mmio(&dev_priv->uncore);

	pci_dev_put(dev_priv->bridge_dev);

}

drivers/gpu/drm/i915/intel_uncore.c

+3 −3
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ void intel_uncore_init_early(struct intel_uncore *uncore) 
	spin_lock_init(&uncore->lock);

}



int intel_uncore_init(struct intel_uncore *uncore)

int intel_uncore_init_mmio(struct intel_uncore *uncore)

{

	struct drm_i915_private *i915 = uncore_to_i915(uncore);

	int ret;
@@ -1608,7 +1608,7 @@ int intel_uncore_init(struct intel_uncore *uncore) 
 * the forcewake domains. Prune them, to make sure they only reference existing

 * engines.

 */

void intel_uncore_prune(struct intel_uncore *uncore)

void intel_uncore_prune_mmio_domains(struct intel_uncore *uncore)

{

	struct drm_i915_private *i915 = uncore_to_i915(uncore);
@@ -1639,7 +1639,7 @@ void intel_uncore_prune(struct intel_uncore *uncore) 
	}

}



void intel_uncore_fini(struct intel_uncore *uncore)

void intel_uncore_fini_mmio(struct intel_uncore *uncore)

{

	/* Paranoia: make sure we have disabled everything before we exit. */

	intel_uncore_sanitize(uncore_to_i915(uncore));

drivers/gpu/drm/i915/intel_uncore.h

+3 −3
Original line number Diff line number Diff line
@@ -179,11 +179,11 @@ intel_uncore_has_fifo(const struct intel_uncore *uncore) 


void intel_uncore_sanitize(struct drm_i915_private *dev_priv);

void intel_uncore_init_early(struct intel_uncore *uncore);

int intel_uncore_init(struct intel_uncore *uncore);

void intel_uncore_prune(struct intel_uncore *uncore);

int intel_uncore_init_mmio(struct intel_uncore *uncore);

void intel_uncore_prune_mmio_domains(struct intel_uncore *uncore);

bool intel_uncore_unclaimed_mmio(struct intel_uncore *uncore);

bool intel_uncore_arm_unclaimed_mmio_detection(struct intel_uncore *uncore);

void intel_uncore_fini(struct intel_uncore *uncore);

void intel_uncore_fini_mmio(struct intel_uncore *uncore);

void intel_uncore_suspend(struct intel_uncore *uncore);

void intel_uncore_resume_early(struct intel_uncore *uncore);

void intel_uncore_runtime_resume(struct intel_uncore *uncore);

CRA Git | Maintained and supported by SUSTech CRA and CCSE