linux_dsm_epyc7002/drivers/gpu/drm/i915/gvt
Dave Airlie 41206a073c Linux 5.8-rc6
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl8UzA4eHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQ7cH/3v+Gv+SmHJCvaT2
 CSu0+7okVnYbY3UTb3hykk7/aOqb6284KjxR03r0CWFzsEsZVhC5pvvruASSiMQg
 Pi04sLqv6CsGLHd1n+pl4AUYEaxq6k4KS3uU3HHSWxrahDDApQoRUx2F8lpOxyj8
 RiwnoO60IMPA7IFJqzcZuFqsgdxqiiYvnzT461KX8Mrw6fyMXeR2KAj2NwMX8dZN
 At21Sf8+LSoh6q2HnugfiUd/jR10XbfxIIx2lXgIinb15GXgWydEQVrDJ7cUV7ix
 Jd0S+dtOtp+lWtFHDoyjjqqsMV7+G8i/rFNZoxSkyZqsUTaKzaR6JD3moSyoYZgG
 0+eXO4A=
 =9EpR
 -----END PGP SIGNATURE-----

Merge v5.8-rc6 into drm-next

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
2020-07-24 08:48:05 +10:00
..
aperture_gm.c drm/i915: Move GGTT fence registers under gt/ 2020-03-16 20:28:26 +00:00
cfg_space.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
cmd_parser.c drm/i915/gvt: Drop redundant prepare_write/pin_pages 2020-06-20 09:57:09 +01:00
cmd_parser.h
debug.h
debugfs.c drm/i915/gvt: Use GFP_ATOMIC instead of GFP_KERNEL in atomic context 2020-06-17 12:36:19 +08:00
display.c Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
display.h
dmabuf.c drm/i915/gem: Give each object class a friendly name 2020-05-29 23:38:29 +01:00
dmabuf.h
edid.c drm/i915: Identify Cometlake platform 2020-06-02 23:15:34 +01:00
edid.h
execlist.c drm/i915/gvt: move workload destroy out of execlist complete 2020-05-08 12:34:12 +08:00
execlist.h drm/i915/gvt: Wean gvt off dev_priv->engine[] 2020-03-06 09:56:15 +08:00
fb_decoder.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
fb_decoder.h
firmware.c Merge tag 'gvt-next-2020-03-10' of https://github.com/intel/gvt-linux into drm-intel-next-queued 2020-03-10 15:46:29 -07:00
gtt.c Merge tag 'gvt-next-2020-05-12' of https://github.com/intel/gvt-linux into drm-intel-next-queued 2020-05-14 18:02:23 +03:00
gtt.h drm/i915/gvt: Support PPGTT table load command 2020-05-08 12:36:38 +08:00
gvt.c Merge tag 'gvt-next-2020-04-22' of https://github.com/intel/gvt-linux into drm-intel-next-queued 2020-04-30 10:53:21 +03:00
gvt.h drm/i915/gvt: skip populate shadow context if guest context not changed 2020-04-17 17:31:22 +08:00
handlers.c Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
hypercall.h i915/gvt: remove unused xen bits 2020-04-14 16:40:42 +08:00
interrupt.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
interrupt.h
kvmgt.c kernel: move use_mm/unuse_mm to kthread.c 2020-06-10 19:14:18 -07:00
Makefile
mmio_context.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
mmio_context.h drm/i915/gvt: Fix incorrect check of enabled bits in mask registers 2020-06-17 12:36:01 +08:00
mmio.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
mmio.h drm/i915/gvt: Wean gvt off dev_priv->engine[] 2020-03-06 09:56:15 +08:00
mpt.h
opregion.c drm/i915/gvt: Fix emulated vbt size issue 2020-03-06 09:35:30 +08:00
page_track.c
page_track.h
reg.h drm/i915/gvt: Fix incorrect check of enabled bits in mask registers 2020-06-17 12:36:01 +08:00
sched_policy.c drm/i915/gvt: Wean gvt off using dev_priv 2020-03-06 10:08:10 +08:00
sched_policy.h
scheduler.c Merge drm/drm-next into drm-intel-next-queued 2020-06-25 18:05:03 +03:00
scheduler.h drm/i915/gvt: Drop redundant prepare_write/pin_pages 2020-06-20 09:57:09 +01:00
trace_points.c
trace.h
vgpu.c drm/i915/gvt: Use ARRAY_SIZE for vgpu_types 2020-05-19 17:18:50 +08:00