Merge tag 'drm-intel-next-2018-07-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

Higlights here goes to many PSR fixes and improvements; to the Ice lake work with
power well support and begin of DSI support addition. Also there were many improvements
on execlists and interrupts for minimal latency on command submission; and many fixes
on selftests, mostly caught by our CI.

General driver:
- Clean-up on aux irq (Lucas)
- Mark expected switch fall-through for dealing with static analysis tools (Gustavo)

Gem:
- Different fixes for GuC (Chris, Anusha, Michal)
- Avoid self-relocation BIAS if no relocation (Chris)
- Improve debugging cases in on EINVAL return and vma allocation (Chris)
- Fixes and improvements on context destroying and freeing (Chris)
- Wait for engines to idle before retiring (Chris)
- Many improvements on execlists and interrupts for minimal latency on command submission (Chris)
- Many fixes in selftests, specially on cases highlighted on CI (Chris)
- Other fixes and improvements around GGTT (Chris)
- Prevent background reaping of active objects (Chris)

Display:
- Parallel modeset cleanup to fix driver reset (Chris)
- Get AUX power domain for DP main link (Imre)
- Clean-up on PSR unused func pointers (Rodrigo)
- Many PSR/PSR2 fixes and improvements (DK, Jose, Tarun)
- Add a PSR1 live status (Vathsala)
- Replace old drm_*_{un/reference} with put,get functions (Thomas)
- FBC fixes (Maarten)
- Abstract and document the usage of picking macros (Jani)
- Remove unnecessary check for unsupported modifiers for NV12. (DK)
- Interrupt fixes for display (Ville)
- Clean up on sdvo code (Ville)
- Clean up on current DSI code (Jani)
- Remove support for legacy debugfs crc interface (Maarten)
- Simplify get_encoder_power_domains (Imre)

Icelake:
- MG PLL fixes (Imre)
- Add hw workaround for alpha blending (Vandita)
- Add power well support (Imre)
- Add Interrupt Support (Anusha)
- Start to add support for DSI on Ice Lake (Madhav)

Signed-off-by: Dave Airlie <airlied@redhat.com>

# gpg: Signature made Tue 10 Jul 2018 08:41:37 AM AEST
# gpg:                using RSA key FA625F640EEB13CA
# gpg: Good signature from "Rodrigo Vivi <rodrigo.vivi@intel.com>"
# gpg:                 aka "Rodrigo Vivi <rodrigo.vivi@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6D20 7068 EEDD 6509 1C2C  E2A3 FA62 5F64 0EEB 13CA
Link: https://patchwork.freedesktop.org/patch/msgid/20180710234349.GA16562@intel.com

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 94e8863bd97c..7c95697e1a35 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -171,24 +171,11 @@ void intel_uc_init_early(struct drm_i915_private *i915)
         intel_huc_init_early(huc);
 
         sanitize_options_early(i915);
-
-        if (USES_GUC(i915))
-                intel_uc_fw_fetch(i915, &guc->fw);
-
-        if (USES_HUC(i915))
-                intel_uc_fw_fetch(i915, &huc->fw);
 }
 
 void intel_uc_cleanup_early(struct drm_i915_private *i915)
 {
         struct intel_guc *guc = &i915->guc;
-        struct intel_huc *huc = &i915->huc;
-
-        if (USES_HUC(i915))
-                intel_uc_fw_fini(&huc->fw);
-
-        if (USES_GUC(i915))
-                intel_uc_fw_fini(&guc->fw);
 
         guc_free_load_err_log(guc);
 }
@@ -252,28 +239,41 @@ static void guc_disable_communication(struct intel_guc *guc)
 int intel_uc_init_misc(struct drm_i915_private *i915)
 {
         struct intel_guc *guc = &i915->guc;
+        struct intel_huc *huc = &i915->huc;
         int ret;
 
         if (!USES_GUC(i915))
                 return 0;
 
-        intel_guc_init_ggtt_pin_bias(guc);
-
-        ret = intel_guc_init_wq(guc);
+        ret = intel_guc_init_misc(guc);
         if (ret)
                 return ret;
 
+        if (USES_HUC(i915)) {
+                ret = intel_huc_init_misc(huc);
+                if (ret)
+                        goto err_guc;
+        }
+
         return 0;
+
+err_guc:
+        intel_guc_fini_misc(guc);
+        return ret;
 }
 
 void intel_uc_fini_misc(struct drm_i915_private *i915)
 {
         struct intel_guc *guc = &i915->guc;
+        struct intel_huc *huc = &i915->huc;
 
         if (!USES_GUC(i915))
                 return;
 
-        intel_guc_fini_wq(guc);
+        if (USES_HUC(i915))
+                intel_huc_fini_misc(huc);
+
+        intel_guc_fini_misc(guc);
 }
 
 int intel_uc_init(struct drm_i915_private *i915)