diff options
author | Dave Airlie <airlied@redhat.com> | 2019-11-14 11:06:01 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-11-14 11:09:06 +1000 |
commit | dfce90259d74d34cff4cb0c75ecfc0336c09520f (patch) | |
tree | e13b4f5083043a15d53c096d924d21cc57b45b59 /drivers/gpu/drm/i915/i915_reg.h | |
parent | drm/i915/gen8+: Add RC6 CTX corruption WA (diff) | |
parent | drm/i915/cmdparser: Fix jump whitelist clearing (diff) | |
download | linux-dev-dfce90259d74d34cff4cb0c75ecfc0336c09520f.tar.xz linux-dev-dfce90259d74d34cff4cb0c75ecfc0336c09520f.zip |
Backmerge i915 security patches from commit 'ea0b163b13ff' into drm-next
This backmerges the branch that ended up in Linus' tree. It removes
all the changes for the rc6 patches from Linus' tree in favour of
a patch that is based on a large refactor that occured.
Otherwise it all looks good.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ae306dab57fa..445dacbdc0e9 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -562,6 +562,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) */ #define BCS_SWCTRL _MMIO(0x22200) +/* There are 16 GPR registers */ +#define BCS_GPR(n) _MMIO(0x22600 + (n) * 8) +#define BCS_GPR_UDW(n) _MMIO(0x22600 + (n) * 8 + 4) + #define GPGPU_THREADS_DISPATCHED _MMIO(0x2290) #define GPGPU_THREADS_DISPATCHED_UDW _MMIO(0x2290 + 4) #define HS_INVOCATION_COUNT _MMIO(0x2300) @@ -7355,6 +7359,10 @@ enum { #define DMC_DEBUG3 _MMIO(0x101090) +/* Display Internal Timeout Register */ +#define RM_TIMEOUT _MMIO(0x42060) +#define MMIO_TIMEOUT_US(us) ((us) << 0) + /* interrupts */ #define DE_MASTER_IRQ_CONTROL (1 << 31) #define DE_SPRITEB_FLIP_DONE (1 << 29) |