drm/i915/gen9: add WaClearFlowControlGpgpuContextSave
Subsystems (2)
PATCH 1/1 drm/i915/gen9: add WaClearFlowControlGpgpuContextSave
From: Tim Gore <[email protected]>
This allows writes to EU flow control registers. Together with SIP code from the user-mode driver this resolves a hang seen in some pre-emption scenarios. Note that this patch is just the kernel mode part of this workaround.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -0
@@ -920,8 +920,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |ECOCHK_DIS_TLB ); +/* WaClearFlowControlGpgpuContextSave:skl,bxt */ /* WaDisablePartialInstShootdown:skl,bxt */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , +FLOW_CONTROL_ENABLE |PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE );/* Syncing dependencies between camera and graphics:skl,bxt */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/gen9: add WaClearFlowControlGpgpuContextSave
== Series Details ==
== Series Details ==
Series: drm/i915/gen9: add WaClearFlowControlGpgpuContextSave
URL : https://patchwork.freedesktop.org/series/4272/
State : failure
== Summary ==
CC [M] drivers/net/ethernet/smsc/smsc9420.o CC [M] drivers/net/usb/smsc95xx.o LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o LD drivers/net/ethernet/synopsys/built-in.o CC drivers/video/fbdev/efifb.o CC drivers/usb/host/ohci-hcd.o LD [M] drivers/usb/serial/usbserial.o CC drivers/usb/host/ohci-pci.o CC [M] drivers/net/usb/mcs7830.o CC drivers/usb/host/uhci-hcd.o CC [M] drivers/net/usb/usbnet.o CC drivers/usb/host/xhci.o CC [M] drivers/net/usb/cdc_ncm.o CC drivers/usb/host/xhci-mem.o CC drivers/usb/host/xhci-ring.o CC drivers/usb/host/xhci-hub.o CC drivers/usb/host/xhci-dbg.o CC drivers/usb/host/xhci-trace.o CC drivers/usb/host/xhci-pci.o LD drivers/video/fbdev/built-in.o LD drivers/video/built-in.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD drivers/net/ethernet/built-in.o LD drivers/net/built-in.o LD drivers/usb/host/xhci-hcd.o LD drivers/usb/host/built-in.o LD drivers/usb/built-in.o
Makefile:950: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botreproduce:
Hi Tim,
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on v4.5-rc7 next-20160309]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/tim-gore-intel-com/drm-i915-gen9-add-WaClearFlowControlGpgpuContextSave/20160309-213806 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-randconfig-x000-201610 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386
All error/warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/intel_ringbuffer.c: In function 'gen9_init_workarounds':
>> drivers/gpu/drm/i915/intel_ringbuffer.c:926:6: error: 'FLOW_CONTROL_ENABLE' undeclared (first use in this function)
FLOW_CONTROL_ENABLE |
^
drivers/gpu/drm/i915/intel_ringbuffer.c:773:43: note: in definition of macro 'WA_REG'
const int r = wa_add(dev_priv, (addr), (mask), (val)); \
^
>> drivers/gpu/drm/i915/intel_ringbuffer.c:925:2: note: in expansion of macro 'WA_SET_BIT_MASKED'
WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
^
drivers/gpu/drm/i915/intel_ringbuffer.c:926:6: note: each undeclared identifier is reported only once for each function it appears in
FLOW_CONTROL_ENABLE |
^
drivers/gpu/drm/i915/intel_ringbuffer.c:773:43: note: in definition of macro 'WA_REG'
const int r = wa_add(dev_priv, (addr), (mask), (val)); \
^
>> drivers/gpu/drm/i915/intel_ringbuffer.c:925:2: note: in expansion of macro 'WA_SET_BIT_MASKED'
WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
^vim +/FLOW_CONTROL_ENABLE +926 drivers/gpu/drm/i915/intel_ringbuffer.c
919 /* WaDisableKillLogic:bxt,skl */
920 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
921 ECOCHK_DIS_TLB);
922
923 /* WaClearFlowControlGpgpuContextSave:skl,bxt */
924 /* WaDisablePartialInstShootdown:skl,bxt */
> 925 WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, > 926 FLOW_CONTROL_ENABLE |
927 PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
928
929 /* Syncing dependencies between camera and graphics:skl,bxt */
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx