diff options
author | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:52:09 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:52:09 +1000 |
commit | 4db9a82f1efa18304e51d68ef056b045050b9153 (patch) | |
tree | 1c55391c98b4c4f61a66ddf9e4e205512c19386a /include | |
parent | 762043aa77ad6de79236f3a9e6281f84e4fe9788 (diff) | |
parent | 648a9bc5308d952f2c80772301b339f73026f013 (diff) | |
download | lwn-4db9a82f1efa18304e51d68ef056b045050b9153.tar.gz lwn-4db9a82f1efa18304e51d68ef056b045050b9153.zip |
Merge tag 'drm-intel-fixes-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-fixes
arb_timer kernel side fix from Chris.
* tag 'drm-intel-fixes-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/drm/i915_drm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 6e1a2ed116cb..db809b722985 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -1070,6 +1070,14 @@ struct drm_i915_reg_read { __u64 offset; __u64 val; /* Return value */ }; +/* Known registers: + * + * Render engine timestamp - 0x2358 + 64bit - gen7+ + * - Note this register returns an invalid value if using the default + * single instruction 8byte read, in order to workaround that use + * offset (0x2538 | 1) instead. + * + */ struct drm_i915_reset_stats { __u32 ctx_id; |