[0/1] dg1: enable dsb back
diff mbox

Message ID 20191108053725.7024-1-lucas.demarchi@intel.com
State New
Headers show

Commit Message

Lucas De Marchi Nov. 8, 2019, 5:37 a.m. UTC
Commit  a096883dda2c ("drm/i915/dsb: Remove PIN_MAPPABLE from the DSB object VMA")
fixed it, remove the hack.

---
baseline: f681b0ac20073c08e34f5987800b35f45fb69e29
pile-commit: 3f2a85eed3a5be81b1ab3e02426c368f20e5be82
range-diff:
156:  31c4b0cc66c6 <   -:  ------------ INTEL_DII: drm/i915/dg1: HACK: disable dsb
204:  15fa3c0ae1b4 ! 203:  d0e5019e1e45 INTEL_DII: drm/i915: add new gen12.5 macro

 series                                             |  1 -
 ...-INTEL_DII-drm-i915-add-new-gen12.5-macro.patch |  4 +-
 0001-INTEL_DII-drm-i915-dg1-HACK-disable-dsb.patch | 61 ----------------------
 3 files changed, 2 insertions(+), 64 deletions(-)

--
git-pile 0.93

Patch
diff mbox

diff --git a/series b/series
index bf01fc9aced5..9b4350b74d96 100644
--- a/series
+++ b/series
@@ -155,7 +155,6 @@ 
 0001-INTEL_DII-START-dg1-DG1-enabling.patch
 0001-INTEL_DII-drm-i915-Add-has_master_unit_irq-flag.patch
 0001-INTEL_DII-drm-i915-dg1-add-initial-DG-1-definitions.patch
-0001-INTEL_DII-drm-i915-dg1-HACK-disable-dsb.patch
 0001-INTEL_DII-drm-i915-dg1-Add-DG1-PCI-IDs.patch
 0001-INTEL_DII-drm-i915-dg1-Add-fake-PCH.patch
 0001-INTEL_DII-drm-i915-dg1-Initialize-RAWCLK-properly.patch
diff --git a/0001-INTEL_DII-drm-i915-add-new-gen12.5-macro.patch b/0001-INTEL_DII-drm-i915-add-new-gen12.5-macro.patch
index 47d092d0d081..3270503a5da3 100644
--- a/0001-INTEL_DII-drm-i915-add-new-gen12.5-macro.patch
+++ b/0001-INTEL_DII-drm-i915-add-new-gen12.5-macro.patch
@@ -20,8 +20,8 @@  Signed-off-by: Stuart Summers <stuart.summers@intel.com>
 diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
 --- a/drivers/gpu/drm/i915/i915_pci.c
 +++ b/drivers/gpu/drm/i915/i915_pci.c
-@@ -868,6 +868,9 @@ static const struct intel_device_info intel_dg1_info = {
- 	.display.has_dsb = 0, /* HACK */
+@@ -867,6 +867,9 @@ static const struct intel_device_info intel_dg1_info = {
+ 	.ppgtt_size = 47, /* for dual-ctx, see comment in TGL info */
  };
  
 +#define GEN12_5_FEATURES \
diff --git a/0001-INTEL_DII-drm-i915-dg1-HACK-disable-dsb.patch b/0001-INTEL_DII-drm-i915-dg1-HACK-disable-dsb.patch
deleted file mode 100644
index dc08e527df89..000000000000
--- a/0001-INTEL_DII-drm-i915-dg1-HACK-disable-dsb.patch
+++ /dev/null
@@ -1,61 +0,0 @@ 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@intel.com>
-Date: Fri, 1 Nov 2019 10:43:10 -0700
-Subject: [PATCH] INTEL_DII: drm/i915/dg1: HACK: disable dsb
-
-[   18.779601] [drm:intel_dsb_get [i915]] *ERROR* Vma creation failed
-[   18.780131] ------------[ cut here ]------------
-[   18.780132] WARN_ON(atomic_read(&dsb->refcount) == 0)
-[   18.780180] WARNING: CPU: 1 PID: 456 at drivers/gpu/drm/i915/display/intel_dsb.c:161 intel_dsb_put+0x56/0x60 [i915]
-[   18.780181] Modules linked in: i915(+) snd_hda_codec_hdmi prime_numbers snd_hda_intel snd_intel_nhlt snd_hda_codec btusb snd_hwdep x86_pkg_temp_thermal btrtl snd_hda_core coretemp btbcm btintel kvm_intel bluetooth snd_pcm kvm mei_me ec
-dh_generic e1000e ecc mei irqbypass i2c_i801 crct10dif_pclmul crc32_pclmul ghash_clmulni_intel
-[   18.780192] CPU: 1 PID: 456 Comm: modprobe Not tainted 5.4.0-rc5+ #7
-[   18.780194] Hardware name: Gigabyte Technology Co., Ltd. GB-Z390 Garuda/GB-Z390 Garuda-CF, BIOS IG1b 09/10/2019
-[   18.780223] RIP: 0010:intel_dsb_put+0x56/0x60 [i915]
-[   18.780225] Code: e8 5f 6b fb ff 48 c7 43 08 00 00 00 00 48 c7 43 18 00 00 00 00 5b c3 48 c7 c6 50 74 3d a0 48 c7 c7 e8 06 3f a0 e8 3a 61 d7 e0 <0f> 0b 5b c3 66 0f 1f 44 00 00 48 8b 47 08 48 85 c0 75 1f 48 8b 87
-[   18.780226] RSP: 0018:ffffc9000057f800 EFLAGS: 00010286
-[   18.780228] RAX: 0000000000000000 RBX: ffff888495812688 RCX: 0000000000000001
-[   18.780229] RDX: 000000000000190a RSI: ffff88849fe10928 RDI: ffffffff8213edf9
-[   18.780230] RBP: ffff888493966800 R08: ffff88849fe10928 R09: 0000000000000000
-[   18.780231] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88849589c000
-[   18.780232] R13: ffff88848fae6800 R14: ffff88848b8c0340 R15: ffff888493966858
-[   18.780234] FS:  00007f556fcb8740(0000) GS:ffff8884ad880000(0000) knlGS:0000000000000000
-[   18.780235] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
-[   18.780236] CR2: 000055f6d80c71f0 CR3: 00000004977e6004 CR4: 00000000003606e0
-[   18.780237] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
-[   18.780238] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
-[   18.780239] Call Trace:
-[   18.780270]  intel_atomic_commit_tail+0x3a6/0x14c0 [i915]
-[   18.780273]  ? mark_held_locks+0x49/0x70
-[   18.780276]  ? queue_work_on+0x31/0x70
-[   18.780278]  ? lockdep_hardirqs_on+0xe3/0x1c0
-[   18.780308]  ? intel_atomic_commit_ready+0x3f/0x50 [i915]
-[   18.780332]  ? __i915_sw_fence_complete+0x1a0/0x250 [i915]
-[   18.780363]  intel_atomic_commit+0x31d/0x350 [i915]
-[   18.780393]  intel_initial_commit+0xb1/0x130 [i915]
-[   18.780426]  intel_modeset_init+0x9fd/0x1c80 [i915]
-[   18.780451]  i915_driver_probe+0xc45/0x16b0 [i915]
-[   18.780478]  i915_pci_probe+0x4c/0x1c0 [i915]
-[   18.780481]  ? _raw_spin_unlock_irqrestore+0x39/0x60
-[   18.780484]  pci_device_probe+0xcd/0x150
-[   18.780488]  really_probe+0xea/0x420
-[   18.780491]  driver_probe_device+0x10b/0x120
-
-Cc: Animesh Manna <animesh.manna@intel.com>
-Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
-Acked-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
----
- drivers/gpu/drm/i915/i915_pci.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
---- a/drivers/gpu/drm/i915/i915_pci.c
-+++ b/drivers/gpu/drm/i915/i915_pci.c
-@@ -864,6 +864,7 @@ static const struct intel_device_info intel_dg1_info = {
- 		BIT(VCS0) | BIT(VCS2) |
- 		BIT(CCS0),
- 	.ppgtt_size = 47, /* for dual-ctx, see comment in TGL info */
-+	.display.has_dsb = 0, /* HACK */
- };
- 
- #undef GEN