Commit 6cbe8830 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: add intel_uncore_init_early 



Encapsulate the uncore early init and be consistent with the
"_early" naming.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
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-1-daniele.ceraolospurio@intel.com
parent f722b8c1

drivers/gpu/drm/i915/i915_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -870,10 +870,11 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv) 


	intel_device_info_subplatform_init(dev_priv);



	intel_uncore_init_early(&dev_priv->uncore);



	spin_lock_init(&dev_priv->irq_lock);

	spin_lock_init(&dev_priv->gpu_error.lock);

	mutex_init(&dev_priv->backlight_lock);

	spin_lock_init(&dev_priv->uncore.lock);



	mutex_init(&dev_priv->sb_lock);

	mutex_init(&dev_priv->av_mutex);

drivers/gpu/drm/i915/intel_uncore.c

+4 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,10 @@ static void uncore_mmio_cleanup(struct intel_uncore *uncore) 
	pci_iounmap(pdev, uncore->regs);

}



void intel_uncore_init_early(struct intel_uncore *uncore)

{

	spin_lock_init(&uncore->lock);

}



int intel_uncore_init(struct intel_uncore *uncore)

{

drivers/gpu/drm/i915/intel_uncore.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ 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);

bool intel_uncore_unclaimed_mmio(struct intel_uncore *uncore);

CRA Git | Maintained and supported by SUSTech CRA and CCSE