drm/i915/huc: Add HuC fw loading support
Subsystems (2)
PATCH 4/6 drm/i915/huc: Add HuC fw loading support
From: Alex Dai <[email protected]>
The HuC loading process is similar to GuC. The intel_uc_fw_fetch() is used for both cases.
HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
Signed-off-by Alex Dai <[email protected]>
Signed-off-by Peter Antoine <[email protected]>
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_dma.c | 3 + drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem.c | 7 + drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 7 +- drivers/gpu/drm/i915/intel_huc.h | 44 ++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 262 ++++++++++++++++++++++++++++++++ 8 files changed, 325 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -42,6 +42,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -410,6 +410,7 @@ static int i915_load_modeset_init(struct drm_device *dev)* working irqs for e.g. gmbus and dp aux transfers. */ intel_modeset_init (dev); +intel_huc_ucode_init (dev);intel_guc_ucode_init (dev); ret =i915_gem_init (dev);
@@ -453,6 +454,7 @@ cleanup_gem:i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex); cleanup_irq: +intel_huc_ucode_fini (dev);intel_guc_ucode_fini (dev);drm_irq_uninstall (dev); cleanup_gem_stolen:
@@ -1194,6 +1196,7 @@ int i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ flush_workqueue (dev_priv->wq); +intel_huc_ucode_fini (dev);intel_guc_ucode_fini (dev);mutex_lock (&dev->struct_mutex);i915_gem_cleanup_ringbuffer (dev);
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -53,6 +53,7 @@#include <linux/kref.h> #include <linux/pm_qos.h> #include "intel_guc.h" +#include "intel_huc.h" /* General customization: */
@@ -1699,6 +1700,7 @@ struct drm_i915_private {struct i915_virtual_gpu vgpu; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;
@@ -2629,6 +2631,7 @@ struct drm_i915_cmd_table {#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_HUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)
drivers/gpu/drm/i915/i915_gem.c +7 -0
@@ -4849,6 +4849,13 @@ i915_gem_init_hw(struct drm_device *dev)/* We can't enable contexts until all firmware is loaded */ if (HAS_GUC_UCODE (dev)) { +/* init WOPCM */ +I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); +I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE | +HUC_LOADING_AGENT_GUC ); + +intel_huc_ucode_load (dev); + ret =intel_guc_ucode_load (dev);if (ret) {DRM_ERROR ("Failed to initialize GuC, error %d\n" , ret);
drivers/gpu/drm/i915/i915_guc_reg.h +3 -0
@@ -52,9 +52,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)
drivers/gpu/drm/i915/intel_guc_loader.c +2 -5
@@ -256,7 +256,8 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv)I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ -I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); +I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA ) | +_MASKED_BIT_DISABLE (HUC_UKERNEL ));/* * Spin-wait for the DMA to complete & the GuC to start up.
@@ -307,10 +308,6 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); -/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); -I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE ); -/* Enable MIA caching. GuC clock gating is disabled. */ I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE );
drivers/gpu/drm/i915/intel_huc.h new file +44 -0
44 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc_loader.c new file +262 -0
262 lines not on this page · raw message
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx