From 39b892c92ed753aca65bf69790328f77f2e370ba Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 31 Oct 2014 02:17:26 +0000 Subject: [PATCH] [x86] drm/i915: Add some L3 registers to the parser whitelist (Closes: #767148) svn path=/dists/sid/linux/; revision=21996 --- debian/changelog | 2 + ...e-L3-registers-to-the-parser-whiteli.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+) create mode 100644 debian/patches/bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch diff --git a/debian/changelog b/debian/changelog index 5cb205e2e..739c386bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -125,6 +125,8 @@ linux (3.16.7-1) UNRELEASED; urgency=medium * m25p80: Fix module device ID table * HID: i2c-hid: call the hid driver's suspend and resume callbacks (Closes: #767204) + * [x86] drm/i915: Add some L3 registers to the parser whitelist + (Closes: #767148) [ Mauricio Faria de Oliveira ] * [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles diff --git a/debian/patches/bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch b/debian/patches/bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch new file mode 100644 index 000000000..9c7ba1e64 --- /dev/null +++ b/debian/patches/bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch @@ -0,0 +1,38 @@ +From: Brad Volkin +Date: Tue, 17 Jun 2014 14:10:34 -0700 +Subject: drm/i915: Add some L3 registers to the parser whitelist +Origin: https://git.kernel.org/linus/c9224faa59c3071ecfa2d4b24592f4eb61e57069 + +Beignet needs these in order to program the L3 cache config for +OpenCL workloads, particularly when using SLM. + +Signed-off-by: Brad Volkin +Signed-off-by: Daniel Vetter +--- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +++ + drivers/gpu/drm/i915/i915_reg.h | 2 ++ + 2 files changed, 5 insertions(+) + +--- a/drivers/gpu/drm/i915/i915_cmd_parser.c ++++ b/drivers/gpu/drm/i915/i915_cmd_parser.c +@@ -426,6 +426,9 @@ static const u32 gen7_render_regs[] = { + GEN7_SO_WRITE_OFFSET(1), + GEN7_SO_WRITE_OFFSET(2), + GEN7_SO_WRITE_OFFSET(3), ++ GEN7_L3SQCREG1, ++ GEN7_L3CNTLREG2, ++ GEN7_L3CNTLREG3, + }; + + static const u32 gen7_blt_regs[] = { +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -4630,6 +4630,8 @@ enum punit_power_well { + #define GEN7_L3CNTLREG1 0xB01C + #define GEN7_WA_FOR_GEN7_L3_CONTROL 0x3C47FF8C + #define GEN7_L3AGDIS (1<<19) ++#define GEN7_L3CNTLREG2 0xB020 ++#define GEN7_L3CNTLREG3 0xB024 + + #define GEN7_L3_CHICKEN_MODE_REGISTER 0xB030 + #define GEN7_WA_L3_CHICKEN_MODE 0x20000000 diff --git a/debian/patches/series b/debian/patches/series index 428924d9c..442850d79 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -402,3 +402,4 @@ bugfix/all/mtd-m25p80-get-rid-of-spi_get_device_id.patch bugfix/all/mtd-spi-nor-make-spi_nor_scan-take-a-chip-type-name-.patch bugfix/all/mtd-m25p80-spi-nor-Fix-module-aliases-for-m25p80.patch bugfix/all/HID-i2c-hid-call-the-hid-driver-s-suspend-and-resume.patch +bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch