diff options
| author | Michal Wajdeczko | 2018-03-23 13:34:50 +0100 |
|---|---|---|
| committer | Chris Wilson | 2018-03-23 18:03:24 +0100 |
| commit | 8c650aefb82d559aa0e1b7c0c36346b906481106 (patch) | |
| tree | 042ccce3dd46702c15742f4bd85a65602fb507eb /drivers/gpu/drm/i915/intel_huc_fw.c | |
| parent | drm/i915: Reorder early initialization (diff) | |
| download | kernel-qcow2-linux-8c650aefb82d559aa0e1b7c0c36346b906481106.tar.gz kernel-qcow2-linux-8c650aefb82d559aa0e1b7c0c36346b906481106.tar.xz kernel-qcow2-linux-8c650aefb82d559aa0e1b7c0c36346b906481106.zip | |
drm/i915/uc: Fetch uC firmware in init_early
We were fetching uC firmwares in separate uc_init_fw step, while
there is no reason why we can't fetch them during init_early.
This will also simplify upcoming patches, as size of the firmware
may be used for register initialization.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180323123451.59244-2-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc_fw.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_huc_fw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c index bb0f8b7a8d2b..f93d2384d482 100644 --- a/drivers/gpu/drm/i915/intel_huc_fw.c +++ b/drivers/gpu/drm/i915/intel_huc_fw.c @@ -155,9 +155,8 @@ static int huc_fw_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma) * Called from intel_uc_init_hw() during driver load, resume from sleep and * after a GPU reset. Note that HuC must be loaded before GuC. * - * The firmware image should have already been fetched into memory by the - * earlier call to intel_uc_init_fw(), so here we need to only check that - * fetch succeeded, and then transfer the image to the h/w. + * The firmware image should have already been fetched into memory, so only + * check that fetch succeeded, and then transfer the image to the h/w. * * Return: non-zero code on error */ |