Home| summaryrefslogtreecommitdiff |
diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2019-09-17 10:37:14 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2019-09-17 11:39:11 +0200 |
| commit | 700d2e9ac5473579edfbccea9121f8652c6c33dd (patch) | |
| tree | 97e33677b5aff95ada9a8fc36fce514029ac81bd | |
| parent | b68beb095285a9626f4322784482ff2b89a8b4c7 (diff) | |
drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE) for skl+ (bsc#1142635)rpm-4.12.14-150.35--sle15-updatesrpm-4.12.14-150.35
| -rw-r--r-- | patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch | 50 | ||||
| -rw-r--r-- | series.conf | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch b/patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch new file mode 100644 index 0000000000..23fa4e3b75 --- /dev/null +++ b/patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch @@ -0,0 +1,50 @@ +From 2eb0964eec5f1d99f9eaf4963eee267acc72b615 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed, 4 Sep 2019 11:07:07 +0100 +Subject: drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE) for skl+ +Git-commit: 2eb0964eec5f1d99f9eaf4963eee267acc72b615 +Patch-mainline: v5.3 +References: bsc#1142635 +No-fix: 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37 + +This bit was fliped on for "syncing dependencies between camera and +graphics". BSpec has no recollection why, and it is causing +unrecoverable GPU hangs with Vulkan compute workloads. + +From BSpec, setting bit5 to 0 enables relaxed padding requirements for +buffers, 1D and 2D non-array, non-MSAA, non-mip-mapped linear surfaces; +and *must* be set to 0h on skl+ to ensure "Out of Bounds" case is +suppressed. + +Reported-by: Jason Ekstrand <jason@jlekstrand.net> +Suggested-by: Jason Ekstrand <jason@jlekstrand.net> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110998 +Fixes: 8424171e135c ("drm/i915/gen9: h/w w/a: syncing dependencies between camera and graphics") +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +Tested-by: denys.kostin@globallogic.com +Cc: Jason Ekstrand <jason@jlekstrand.net> +Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> +Cc: <stable@vger.kernel.org> # v4.1+ +Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20190904100707.7377-1-chris@chris-wilson.co.uk +(cherry picked from commit 9d7b01e93526efe79dbf75b69cc5972b5a4f7b37) +Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Acked-by: Thomas Zimmermann <tzimmermann@suse.de> +--- + drivers/gpu/drm/i915/intel_engine_cs.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/gpu/drm/i915/intel_engine_cs.c ++++ b/drivers/gpu/drm/i915/intel_engine_cs.c +@@ -1004,11 +1004,6 @@ static int gen9_init_workarounds(struct + FLOW_CONTROL_ENABLE | + PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE); + +- /* Syncing dependencies between camera and graphics:skl,bxt,kbl */ +- if (!IS_COFFEELAKE(dev_priv)) +- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, +- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC); +- + /* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt,kbl,glk,cfl */ + /* WaEnableSamplerGPGPUPreemptionSupport:skl,bxt,kbl,cfl */ + WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7, diff --git a/series.conf b/series.conf index 081ca5ca20..8223eed9de 100644 --- a/series.conf +++ b/series.conf @@ -24240,6 +24240,7 @@ patches.suse/iommu-amd-fix-race-in-increase_address_space patches.suse/vhost-make-sure-log_num-in_num.patch patches.suse/Btrfs-fix-assertion-failure-during-fsync-and-use-of-.patch + patches.suse/0001-drm-i915-Restore-relaxed-padding-OCL_OOB_SUPPRES_ENA.patch patches.suse/Revert-Bluetooth-validate-BLE-connection-interval-up.patch patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch |