On 4/18/19 4:31 PM, Fernando Pacheco wrote: > The intent is to move the GuC and HuC firmware images to the > top of the address space. This portion is inaccessible during > normal GuC operations and should be relatively safe to house > both firmware images. By making the move we can re-enable the > full gpu reset with GuC enabled. > > Placing the firmware images above GUC_GGTT_TOP was discussed > previously here: > https://patchwork.freedesktop.org/patch/273616/ > > v2: > The decision to rename both the uc_fw init and fini functions > made it easier to pull the bind/unbind operations out of > intel_guc_fw.* and intel_huc_fw.*. The bind/unbind will now > take place within the newly repurposed intel_uc_fw_init/fini. > All other changes should be called out in their respective patches > and should be the direct result of a review comment. Chris, I didn't address two of your earlier review comments, so I'll try to do so here: 1. You are correct about the inline function in the first patch, but I felt that could be fixed separate from this series. 2. Your comment on not needing to pin the fw pages made sense to me, but I found that the explicit pin/unpin was necessary for the binding. Please let me know if I'm missing something here! Thanks, Fernando > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx> > > Fernando Pacheco (5): > drm/i915/uc: Rename uC firmware init/fini functions > drm/i915/uc: Reserve upper range of GGTT > drm/i915/uc: Place uC firmware in upper range of GGTT > Revert "drm/i915/guc: Disable global reset" > drm/i915/selftests: Check that gpu reset is usable from atomic context > > drivers/gpu/drm/i915/i915_gem.c | 2 + > drivers/gpu/drm/i915/i915_gem_gtt.c | 25 ++-- > drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + > drivers/gpu/drm/i915/i915_reset.c | 3 - > drivers/gpu/drm/i915/intel_guc.c | 58 ++++++++- > drivers/gpu/drm/i915/intel_guc.h | 2 + > drivers/gpu/drm/i915/intel_guc_fw.c | 20 +-- > drivers/gpu/drm/i915/intel_huc.c | 74 ++++++++--- > drivers/gpu/drm/i915/intel_huc.h | 6 +- > drivers/gpu/drm/i915/intel_huc_fw.c | 49 +++++-- > drivers/gpu/drm/i915/intel_uc.c | 39 +++++- > drivers/gpu/drm/i915/intel_uc.h | 1 + > drivers/gpu/drm/i915/intel_uc_fw.c | 122 +++++++++++++----- > drivers/gpu/drm/i915/intel_uc_fw.h | 12 +- > .../gpu/drm/i915/selftests/intel_hangcheck.c | 6 +- > 15 files changed, 319 insertions(+), 101 deletions(-) > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx