Commit 9da1030e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2016-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next 

- Infrastructure for GVT-g (paravirtualized gpu on gen8+), from Zhi Wang
- another attemp at nonblocking atomic plane updates
- bugfixes and refactoring for GuC doorbell code (Dave Gordon)
- GuC command submission enabled by default, if fw available (Dave Gordon)
- more bxt w/a (Arun Siluvery)
- bxt phy improvements (Imre Deak)
- prep work for stolen objects support (Ankitprasa Sharma & Chris Wilson)
- skl/bkl w/a update from Mika Kuoppala
- bunch of small improvements and fixes all over, as usual

* tag 'drm-intel-next-2016-06-20' of git://anongit.freedesktop.org/drm-intel: (81 commits)
  drm/i915: Update DRIVER_DATE to 20160620
  drm/i915: Introduce GVT context creation API
  drm/i915: Support LRC context single submission
  drm/i915: Introduce execlist context status change notification
  drm/i915: Make addressing mode bits in context descriptor configurable
  drm/i915: Make ring buffer size of a LRC context configurable
  drm/i915: gvt: Introduce the basic architecture of GVT-g
  drm/i915: Fold vGPU active check into inner functions
  drm/i915: Use offsetof() to calculate the offset of members in PVINFO page
  drm/i915: Factor out i915_pvinfo.h
  drm/i915: Serialise presentation with imported dmabufs
  drm/i915: Use atomic commits for legacy page_flips
  drm/i915: Move fb_bits updating later in atomic_commit
  drm/i915: nonblocking commit
  Reapply "drm/i915: Pass atomic states to fbc update, functions."
  drm/i915: Roll out the helper nonblock tracking
  drm/i915: Signal drm events for atomic
  drm/i915/ilk: Don't disable SSC source if it's in use
  drm/i915/guc: (re)initialise doorbell h/w when enabling GuC submission
  drm/i915/guc: replace assign_doorbell() with select_doorbell_register()
  ...
parents 9253d059 a02b0109

drivers/char/agp/intel-gtt.c

+8 −0
Original line number Diff line number Diff line
@@ -840,6 +840,14 @@ static bool i830_check_flags(unsigned int flags) 
	return false;

}



void intel_gtt_insert_page(dma_addr_t addr,

			   unsigned int pg,

			   unsigned int flags)

{

	intel_private.driver->write_entry(addr, pg, flags);

}

EXPORT_SYMBOL(intel_gtt_insert_page);



void intel_gtt_insert_sg_entries(struct sg_table *st,

				 unsigned int pg_start,

				 unsigned int flags)

drivers/gpu/drm/i915/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -57,6 +57,28 @@ config DRM_I915_USERPTR 


	  If in doubt, say "Y".



config DRM_I915_GVT

        bool "Enable Intel GVT-g graphics virtualization host support"

        depends on DRM_I915

        default n

        help

	  Choose this option if you want to enable Intel GVT-g graphics

	  virtualization technology host support with integrated graphics.

	  With GVT-g, it's possible to have one integrated graphics

	  device shared by multiple VMs under different hypervisors.



	  Note that at least one hypervisor like Xen or KVM is required for

	  this driver to work, and it only supports newer device from

	  Broadwell+. For further information and setup guide, you can

	  visit: http://01.org/igvt-g.



	  Now it's just a stub to support the modifications of i915 for

	  GVT device model. It requires at least one MPT modules for Xen/KVM

	  and other components of GVT device model to work. Use it under

	  you own risk.



	  If in doubt, say "N".



menu "drm/i915 Debugging"

depends on DRM_I915

depends on EXPERT

drivers/gpu/drm/i915/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -104,6 +104,11 @@ i915-y += i915_vgpu.o 
# legacy horrors

i915-y += i915_dma.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

endif



obj-$(CONFIG_DRM_I915)  += i915.o



CFLAGS_i915_trace_points.o := -I$(src)

drivers/gpu/drm/i915/gvt/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
GVT_DIR := gvt

GVT_SOURCE := gvt.o



ccflags-y                      += -I$(src) -I$(src)/$(GVT_DIR) -Wall

i915-y			       += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))

drivers/gpu/drm/i915/gvt/debug.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * 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 __GVT_DEBUG_H__

#define __GVT_DEBUG_H__



#define gvt_dbg_core(fmt, args...) \

	DRM_DEBUG_DRIVER("gvt: core: "fmt, ##args)



/*

 * Other GVT debug stuff will be introduced in the GVT device model patches.

 */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE