From: Robert Bragg <robert@sixbynine.org>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org,
Sourab Gupta <sourab.gupta@intel.com>,
Deepak S <deepak.s@intel.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Robert Bragg <robert@sixbynine.org>
Subject: [PATCH 2/9] drm/i915: rename OACONTROL GEN7_OACONTROL
Date: Wed, 20 Apr 2016 15:23:07 +0100 [thread overview]
Message-ID: <1461162194-1424-3-git-send-email-robert@sixbynine.org> (raw)
In-Reply-To: <1461162194-1424-1-git-send-email-robert@sixbynine.org>
OACONTROL changes quite a bit for gen8, with some bits split out into a
per-context OACTXCONTROL register. Rename now before add more gen7 OA
registers
Signed-off-by: Robert Bragg <robert@sixbynine.org>
---
drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
drivers/gpu/drm/i915/i915_reg.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index a337f33..035f2dd 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -445,7 +445,7 @@ static const struct drm_i915_reg_descriptor gen7_render_regs[] = {
REG64(PS_INVOCATION_COUNT),
REG64(PS_DEPTH_COUNT),
REG64_IDX(RING_TIMESTAMP, RENDER_RING_BASE),
- REG32(OACONTROL), /* Only allowed for LRI and SRM. See below. */
+ REG32(GEN7_OACONTROL), /* Only allowed for LRI and SRM. See below. */
REG64(MI_PREDICATE_SRC0),
REG64(MI_PREDICATE_SRC1),
REG32(GEN7_3DPRIM_END_OFFSET),
@@ -1092,7 +1092,7 @@ static bool check_cmd(const struct intel_engine_cs *engine,
* to the register. Hence, limit OACONTROL writes to
* only MI_LOAD_REGISTER_IMM commands.
*/
- if (reg_addr == i915_mmio_reg_offset(OACONTROL)) {
+ if (reg_addr == i915_mmio_reg_offset(GEN7_OACONTROL)) {
if (desc->cmd.value == MI_LOAD_REGISTER_MEM) {
DRM_DEBUG_DRIVER("CMD: Rejected LRM to OACONTROL\n");
return false;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 9464ba3..de1e9a0 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -593,7 +593,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
#define HSW_CS_GPR(n) _MMIO(0x2600 + (n) * 8)
#define HSW_CS_GPR_UDW(n) _MMIO(0x2600 + (n) * 8 + 4)
-#define OACONTROL _MMIO(0x2360)
+#define GEN7_OACONTROL _MMIO(0x2360)
#define _GEN7_PIPEA_DE_LOAD_SL 0x70068
#define _GEN7_PIPEB_DE_LOAD_SL 0x71068
--
2.7.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-20 14:23 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 14:23 [PATCH 0/9] Enable Gen 7 Observation Architecture Robert Bragg
2016-04-20 14:23 ` [PATCH 1/9] drm/i915: Add i915 perf infrastructure Robert Bragg
2016-04-20 22:41 ` Chris Wilson
2016-04-20 14:23 ` Robert Bragg [this message]
2016-04-20 14:23 ` [PATCH 3/9] drm/i915: don't whitelist oacontrol in cmd parser Robert Bragg
2016-04-20 14:23 ` [PATCH 4/9] drm/i915: Add 'render basic' Haswell OA unit config Robert Bragg
2016-04-20 14:23 ` [PATCH 5/9] drm/i915: Enable i915 perf stream for Haswell OA unit Robert Bragg
2016-04-20 16:16 ` kbuild test robot
2016-04-20 20:30 ` [Intel-gfx] " kbuild test robot
2016-04-20 21:11 ` Chris Wilson
2016-04-21 16:15 ` Robert Bragg
2016-04-23 8:48 ` Chris Wilson
2016-04-20 22:15 ` Chris Wilson
2016-04-20 22:46 ` Chris Wilson
2016-04-22 11:04 ` Robert Bragg
2016-04-22 11:18 ` Chris Wilson
2016-04-20 22:52 ` Chris Wilson
2016-04-21 15:43 ` Robert Bragg
2016-04-21 16:21 ` Chris Wilson
2016-04-20 23:09 ` Chris Wilson
2016-04-21 15:18 ` Robert Bragg
2016-04-22 1:10 ` Robert Bragg
2016-04-20 23:16 ` Chris Wilson
2016-04-21 15:01 ` Robert Bragg
2016-04-23 10:34 ` Martin Peres
2016-05-03 19:34 ` Robert Bragg
2016-05-03 20:03 ` Robert Bragg
2016-05-04 9:09 ` Martin Peres
2016-05-04 9:49 ` Robert Bragg
2016-05-04 12:24 ` Daniel Vetter
2016-05-04 13:24 ` Robert Bragg
2016-05-04 13:33 ` Robert Bragg
2016-05-04 13:51 ` Daniel Vetter
2016-05-04 9:04 ` [Intel-gfx] " Martin Peres
2016-05-04 11:15 ` Robert Bragg
2016-04-20 14:23 ` [PATCH 6/9] drm/i915: advertise available metrics via sysfs Robert Bragg
2016-04-20 14:23 ` [PATCH 7/9] drm/i915: Add dev.i915.perf_event_paranoid sysctl option Robert Bragg
2016-04-20 14:23 ` [PATCH 8/9] drm/i915: add oa_event_min_timer_exponent sysctl Robert Bragg
2016-04-20 14:23 ` [PATCH 9/9] drm/i915: Add more Haswell OA metric sets Robert Bragg
2016-04-20 14:56 ` [PATCH 0/9] Enable Gen 7 Observation Architecture Robert Bragg
2016-04-21 7:46 ` ✓ Fi.CI.BAT: success for Enable Gen 7 Observation Architecture (rev3) Patchwork
2016-04-21 12:41 ` ✗ Fi.CI.BAT: failure " Patchwork
2016-04-23 8:31 ` ✗ Fi.CI.BAT: warning " Patchwork
2016-04-24 17:23 ` ✓ Fi.CI.BAT: success " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461162194-1424-3-git-send-email-robert@sixbynine.org \
--to=robert@sixbynine.org \
--cc=daniel.vetter@intel.com \
--cc=deepak.s@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sourab.gupta@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox