mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
0766e2efc6
- Ice Lake's workarounds (Oscar and Yunwei) - Ice Lake interrupt registers fixes (Oscar) - Context switch timeline fixes and improvements (Chris) - Spelling fixes (Colin) - GPU reset fixes and improvements (Chris) - Including fixes on execlist and preemption for a proper GPU reset (Chris) - Clean-up the port pipe select bits (Ville) - Other execlist improvements (Chris) - Remove unused enable_cmd_parser parameter (Chris) - Fix order of enabling pipe/transcoder/planes on HSW+ to avoid hang on ICL (Paulo) - Simplification and changes on intel_context (Chris) - Disable LVDS on Radiant P845 (Ondrej) - Improve HSW/BDW voltage swing handling (Ville) - Cleanup and renames on few parts of intel_dp code to make code clear and less confusing (Ville) - Move acpi lid notification code for fixing LVDS (Chris) - Speed up GPU idle detection (Chris) - Make intel_engine_dump irqsafe (Chris) - Fix GVT crash (Zhenyu) - Move GEM BO inside drm_framebuffer and use intel_fb_obj everywhere (Chris) - Revert edp's alternate fixed mode (Jani) - Protect tainted function pointer lookup (Chris) - And subsequent unsigned long size fix (Chris) - Allow page directory allocation to fail (Chris) - VBT's edp and lvds fix and clean-up (Ville) - Many other reorganizations and cleanups on DDI and DP code, as well on scaler and planes (Ville) - Selftest pin the mock kernel context (Chris) - Many PSR Fixes, clean-up and improvements (Dhinakaran) - PSR VBT fix (Vathsala) - Fix i915_scheduler and intel_context declaration (Tvrtko) - Improve PCH underruns detection on ILK-IVB (Ville) - Few s/drm_priv/i915 (Chris, Michal) - Notify opregion of the sanitized encoder state (Maarten) - Guc's event handling improvements and fixes on initialization failures (Michal) - Many gtt fixes and improvements (Chris) - Fixes and improvements for Suspend and Freeze safely (Chris) - i915_gem init and fini cleanup and fixes (Michal) - Remove obsolete switch_mm for gen8+ (Chris) - hw and context id fixes for GuC (Lionel) - Add new vGPU cap info bit VGT_CAPS_HUGE_GTT (Changbin) - Make context pin/unpin symmetric (Chris) - vma: Move the bind_count vs pin_count assertion to a helper (Chris) - Use available SZ_1M instead of 1 << 20 (Chris) - Trace and PMU fixes and improvements (Tvrtko) -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJbGFxbAAoJEPpiX2QO6xPK618H/i+VkEGB+Qdr3h3bwhwVSWB1 TzHZKFSDxznm3rDGU9argGc/nk0af4Kbq1+jnG9FYou2bmW7+wRu9RwIiX4Dggmy FJUHTZDm4lkP3KVlTGL9IbmS9/P6Opxdw9Hyn3WwpfDK2lg9KrRy3NwBtsxaLF6w ZM8hrabsnv0p9RRbNNqb9PJmDJCyoCeyvKgQPeHxHrwiV3VLsqerbuWRAHAQ90Vz /7hPvl6EcujpQR0xeaHt2+dFP2FTVVbVwyFyU4JMc5iPEDdQGOwPmxZCK8c7Khil Uoy1iUtoE5YKrcutEfFhUDigkYIB4N6WSAVrWPxEaHYQzx3XyewZtKIxDHVHpMI= =bbkZ -----END PGP SIGNATURE----- Merge tag 'drm-intel-next-2018-06-06' into gvt-next Backmerge for recent request->hw_context change and new vGPU huge page capability definition. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
121 lines
3.5 KiB
C
121 lines
3.5 KiB
C
/*
|
|
* Copyright(c) 2011-2016 Intel Corporation. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _I915_PVINFO_H_
|
|
#define _I915_PVINFO_H_
|
|
|
|
/* The MMIO offset of the shared info between guest and host emulator */
|
|
#define VGT_PVINFO_PAGE 0x78000
|
|
#define VGT_PVINFO_SIZE 0x1000
|
|
|
|
/*
|
|
* The following structure pages are defined in GEN MMIO space
|
|
* for virtualization. (One page for now)
|
|
*/
|
|
#define VGT_MAGIC 0x4776544776544776ULL /* 'vGTvGTvG' */
|
|
#define VGT_VERSION_MAJOR 1
|
|
#define VGT_VERSION_MINOR 0
|
|
|
|
/*
|
|
* notifications from guest to vgpu device model
|
|
*/
|
|
enum vgt_g2v_type {
|
|
VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE = 2,
|
|
VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY,
|
|
VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE,
|
|
VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY,
|
|
VGT_G2V_EXECLIST_CONTEXT_CREATE,
|
|
VGT_G2V_EXECLIST_CONTEXT_DESTROY,
|
|
VGT_G2V_MAX,
|
|
};
|
|
|
|
/*
|
|
* VGT capabilities type
|
|
*/
|
|
#define VGT_CAPS_FULL_48BIT_PPGTT BIT(2)
|
|
#define VGT_CAPS_HWSP_EMULATION BIT(3)
|
|
#define VGT_CAPS_HUGE_GTT BIT(4)
|
|
|
|
struct vgt_if {
|
|
u64 magic; /* VGT_MAGIC */
|
|
u16 version_major;
|
|
u16 version_minor;
|
|
u32 vgt_id; /* ID of vGT instance */
|
|
u32 vgt_caps; /* VGT capabilities */
|
|
u32 rsv1[11]; /* pad to offset 0x40 */
|
|
/*
|
|
* Data structure to describe the balooning info of resources.
|
|
* Each VM can only have one portion of continuous area for now.
|
|
* (May support scattered resource in future)
|
|
* (starting from offset 0x40)
|
|
*/
|
|
struct {
|
|
/* Aperture register balooning */
|
|
struct {
|
|
u32 base;
|
|
u32 size;
|
|
} mappable_gmadr; /* aperture */
|
|
/* GMADR register balooning */
|
|
struct {
|
|
u32 base;
|
|
u32 size;
|
|
} nonmappable_gmadr; /* non aperture */
|
|
/* allowed fence registers */
|
|
u32 fence_num;
|
|
u32 rsv2[3];
|
|
} avail_rs; /* available/assigned resource */
|
|
u32 rsv3[0x200 - 24]; /* pad to half page */
|
|
/*
|
|
* The bottom half page is for response from Gfx driver to hypervisor.
|
|
*/
|
|
u32 rsv4;
|
|
u32 display_ready; /* ready for display owner switch */
|
|
|
|
u32 rsv5[4];
|
|
|
|
u32 g2v_notify;
|
|
u32 rsv6[5];
|
|
|
|
u32 cursor_x_hot;
|
|
u32 cursor_y_hot;
|
|
|
|
struct {
|
|
u32 lo;
|
|
u32 hi;
|
|
} pdp[4];
|
|
|
|
u32 execlist_context_descriptor_lo;
|
|
u32 execlist_context_descriptor_hi;
|
|
|
|
u32 rsv7[0x200 - 24]; /* pad to one page */
|
|
} __packed;
|
|
|
|
#define vgtif_reg(x) \
|
|
_MMIO((VGT_PVINFO_PAGE + offsetof(struct vgt_if, x)))
|
|
|
|
/* vGPU display status to be used by the host side */
|
|
#define VGT_DRV_DISPLAY_NOT_READY 0
|
|
#define VGT_DRV_DISPLAY_READY 1 /* ready for display switch */
|
|
|
|
#endif /* _I915_PVINFO_H_ */
|