diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-16 10:01:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-16 10:01:52 +1000 |
| commit | 7119dbdf7c52042acb1b02f116fa3257e97659ea (patch) | |
| tree | cf13281a6bf2ba7b0e67d9bb75f3b006a95c6817 /drivers/gpu/drm/i915/i915_pvinfo.h | |
| parent | 91c0719c695a1fcba6a9728eb013eb6e3c7f3487 (diff) | |
| parent | c380f681245d7ae57f17d9ebbbe8f8f1557ee1fb (diff) | |
| download | op-kernel-dev-7119dbdf7c52042acb1b02f116fa3257e97659ea.zip op-kernel-dev-7119dbdf7c52042acb1b02f116fa3257e97659ea.tar.gz | |
Merge tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
drm/i915 fixes for v4.12-rc6
* tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel:
drm/i915: Fix GVT-g PVINFO version compatibility check
drm/i915: Fix SKL+ watermarks for 90/270 rotation
drm/i915: Fix scaling check for 90/270 degree plane rotation
Diffstat (limited to 'drivers/gpu/drm/i915/i915_pvinfo.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_pvinfo.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_pvinfo.h b/drivers/gpu/drm/i915/i915_pvinfo.h index c0cb297..2cfe96d3 100644 --- a/drivers/gpu/drm/i915/i915_pvinfo.h +++ b/drivers/gpu/drm/i915/i915_pvinfo.h @@ -36,10 +36,6 @@ #define VGT_VERSION_MAJOR 1 #define VGT_VERSION_MINOR 0 -#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor)) -#define INTEL_VGT_IF_VERSION \ - INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR) - /* * notifications from guest to vgpu device model */ @@ -55,8 +51,8 @@ enum vgt_g2v_type { struct vgt_if { u64 magic; /* VGT_MAGIC */ - uint16_t version_major; - uint16_t version_minor; + u16 version_major; + u16 version_minor; u32 vgt_id; /* ID of vGT instance */ u32 rsv1[12]; /* pad to offset 0x40 */ /* |
