From: Greg Kroah-Hartman Date: Fri, 16 Mar 2018 15:21:26 +0000 (+0100) Subject: 4.15-stable patches X-Git-Tag: v3.18.100~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=531fd7116a20b89f258ba0d04d1b6780b9e678ec;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: drm-i915-glk-disable-guc-and-huc-on-glk.patch --- diff --git a/queue-4.15/drm-i915-glk-disable-guc-and-huc-on-glk.patch b/queue-4.15/drm-i915-glk-disable-guc-and-huc-on-glk.patch new file mode 100644 index 00000000000..01e9e205bd6 --- /dev/null +++ b/queue-4.15/drm-i915-glk-disable-guc-and-huc-on-glk.patch @@ -0,0 +1,101 @@ +From 2afba81c7909ac259720c0d3e7616cf54d4a5368 Mon Sep 17 00:00:00 2001 +From: Anusha Srivatsa +Date: Wed, 3 Jan 2018 11:03:45 -0800 +Subject: drm/i915/glk: Disable Guc and HuC on GLK + +From: Anusha Srivatsa + +commit 2afba81c7909ac259720c0d3e7616cf54d4a5368 upstream. + +Since the firmwares are not yet released to public repo, +disable them on Geminilake. + +v2: Remove the firmware versions (Michal) + +v3: Remove unwanted defines (Rodrigo) +Correct commit message (Michal) + +Cc: Michal Wajdeczko +Cc: Rodrigo Vivi +Cc: +Signed-off-by: Anusha Srivatsa +Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK") +Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK") +Reviewed-by: Michal Wajdeczko +Signed-off-by: Rodrigo Vivi +Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com +(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8) +Signed-off-by: Rodrigo Vivi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- + drivers/gpu/drm/i915/intel_huc.c | 11 ----------- + 2 files changed, 20 deletions(-) + +--- a/drivers/gpu/drm/i915/intel_guc_fw.c ++++ b/drivers/gpu/drm/i915/intel_guc_fw.c +@@ -39,9 +39,6 @@ + #define KBL_FW_MAJOR 9 + #define KBL_FW_MINOR 14 + +-#define GLK_FW_MAJOR 10 +-#define GLK_FW_MINOR 56 +- + #define GUC_FW_PATH(platform, major, minor) \ + "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin" + +@@ -54,8 +51,6 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE); + #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR) + MODULE_FIRMWARE(I915_KBL_GUC_UCODE); + +-#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR) +- + /** + * intel_guc_fw_select() - selects GuC firmware for uploading + * +@@ -85,10 +80,6 @@ int intel_guc_fw_select(struct intel_guc + guc->fw.path = I915_KBL_GUC_UCODE; + guc->fw.major_ver_wanted = KBL_FW_MAJOR; + guc->fw.minor_ver_wanted = KBL_FW_MINOR; +- } else if (IS_GEMINILAKE(dev_priv)) { +- guc->fw.path = I915_GLK_GUC_UCODE; +- guc->fw.major_ver_wanted = GLK_FW_MAJOR; +- guc->fw.minor_ver_wanted = GLK_FW_MINOR; + } else { + DRM_ERROR("No GuC firmware known for platform with GuC!\n"); + return -ENOENT; +--- a/drivers/gpu/drm/i915/intel_huc.c ++++ b/drivers/gpu/drm/i915/intel_huc.c +@@ -54,10 +54,6 @@ + #define KBL_HUC_FW_MINOR 00 + #define KBL_BLD_NUM 1810 + +-#define GLK_HUC_FW_MAJOR 02 +-#define GLK_HUC_FW_MINOR 00 +-#define GLK_BLD_NUM 1748 +- + #define HUC_FW_PATH(platform, major, minor, bld_num) \ + "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ + __stringify(minor) "_" __stringify(bld_num) ".bin" +@@ -74,9 +70,6 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE); + KBL_HUC_FW_MINOR, KBL_BLD_NUM) + MODULE_FIRMWARE(I915_KBL_HUC_UCODE); + +-#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ +- GLK_HUC_FW_MINOR, GLK_BLD_NUM) +- + /** + * intel_huc_select_fw() - selects HuC firmware for loading + * @huc: intel_huc struct +@@ -103,10 +96,6 @@ void intel_huc_select_fw(struct intel_hu + huc->fw.path = I915_KBL_HUC_UCODE; + huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR; + huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR; +- } else if (IS_GEMINILAKE(dev_priv)) { +- huc->fw.path = I915_GLK_HUC_UCODE; +- huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR; +- huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR; + } else { + DRM_ERROR("No HuC firmware known for platform with HuC!\n"); + return; diff --git a/queue-4.15/series b/queue-4.15/series index 0c478c194a8..c77740cd9fe 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -125,3 +125,4 @@ locking-locktorture-fix-num-reader-writer-corner-cases.patch ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch ib-mlx5-revisit-wmaybe-uninitialized-warning.patch dmaengine-qcom_hidma-check-pending-interrupts.patch +drm-i915-glk-disable-guc-and-huc-on-glk.patch