|
@@ -199,8 +199,8 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
|
|
|
int (*xfer)(struct intel_uc_fw *uc_fw,
|
|
|
struct i915_vma *vma))
|
|
|
{
|
|
|
- struct drm_i915_private *i915 = to_i915(uc_fw->obj->base.dev);
|
|
|
struct i915_vma *vma;
|
|
|
+ u32 ggtt_pin_bias;
|
|
|
int err;
|
|
|
|
|
|
DRM_DEBUG_DRIVER("%s fw load %s\n",
|
|
@@ -222,9 +222,9 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
|
|
|
goto fail;
|
|
|
}
|
|
|
|
|
|
+ ggtt_pin_bias = to_i915(uc_fw->obj->base.dev)->guc.ggtt_pin_bias;
|
|
|
vma = i915_gem_object_ggtt_pin(uc_fw->obj, NULL, 0, 0,
|
|
|
- PIN_OFFSET_BIAS |
|
|
|
- i915->guc.ggtt_pin_bias);
|
|
|
+ PIN_OFFSET_BIAS | ggtt_pin_bias);
|
|
|
if (IS_ERR(vma)) {
|
|
|
err = PTR_ERR(vma);
|
|
|
DRM_DEBUG_DRIVER("%s fw ggtt-pin err=%d\n",
|