diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:10:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:25:28 +1000 |
| commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /drivers/gpu/drm/i915/intel_lrc.h | |
| parent | 6b62b3e134676687d5d666e6edc3b45f1507b2b7 (diff) | |
| parent | 06d1ee32a4d25356a710b49d5e95dbdd68bdf505 (diff) | |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h index 8a08a2780321..4e60d54ba66d 100644 --- a/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h @@ -25,6 +25,8 @@ #define _INTEL_LRC_H_ #define GEN8_LR_CONTEXT_ALIGN 4096 +#define GEN8_CSB_ENTRIES 6 +#define GEN8_CSB_PTR_MASK 0x07 /* Execlists regs */ #define RING_ELSP(ring) ((ring)->mmio_base+0x230) |