I don't believe we need to be that extreme here. Daniel asked a cleaner version, but we don't need to block the huc on a full rework of an unified fw loader. On Tue, Jun 28, 2016 at 8:45 AM, Dave Gordon <david.s.gordon@xxxxxxxxx> wrote: > On 28/06/16 15:54, Dave Gordon wrote: >> >> On 21/06/16 19:11, Peter Antoine wrote: >>> >>> From: Alex Dai <yu.dai@xxxxxxxxx> >>> >>> 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 <yu.dai@xxxxxxxxx> >>> Signed-off-by: Peter Antoine <peter.antoine@xxxxxxxxx> >>> --- >>> drivers/gpu/drm/i915/Makefile | 1 + >>> drivers/gpu/drm/i915/i915_dma.c | 3 + > > > ... and one more thing: i915_dma.c has been deleted. > The code this touches is now in i915_drv.c > > .Dave. > >>> drivers/gpu/drm/i915/i915_drv.h | 3 + >>> drivers/gpu/drm/i915/i915_gem.c | 13 +- >>> drivers/gpu/drm/i915/i915_guc_reg.h | 3 + >>> drivers/gpu/drm/i915/intel_guc.h | 1 + >>> drivers/gpu/drm/i915/intel_guc_loader.c | 11 +- >>> drivers/gpu/drm/i915/intel_huc.h | 44 ++++++ >>> drivers/gpu/drm/i915/intel_huc_loader.c | 262 > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx