Commit 4565e042 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge tag 'gvt-next-fixes-2020-12-25' of https://github.com/intel/gvt-linux into drm-intel-next 



gvt-next-fixes-2020-12-25

- Avoid one useless inline (Jani)
- make gvt header self-contained, fix CONFIG_DRM_I915_WERROR (Jani)

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201225022009.GF16939@zhen-hp.sh.intel.com
parents 6b966341 e056f669

drivers/gpu/drm/i915/Makefile

+1 −9
Original line number Diff line number Diff line
@@ -285,15 +285,7 @@ obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o 


# exclude some broken headers from the test coverage

no-header-test := \

	display/intel_vbt_defs.h \

	gvt/execlist.h \

	gvt/fb_decoder.h \

	gvt/gtt.h \

	gvt/gvt.h \

	gvt/interrupt.h \

	gvt/mmio_context.h \

	gvt/mpt.h \

	gvt/scheduler.h

	display/intel_vbt_defs.h



extra-$(CONFIG_DRM_I915_WERROR) += \

	$(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \

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

+0 −3
Original line number Diff line number Diff line
@@ -182,7 +182,4 @@ int intel_vgpu_init_execlist(struct intel_vgpu *vgpu); 
int intel_vgpu_submit_execlist(struct intel_vgpu *vgpu,

			       const struct intel_engine_cs *engine);



void intel_vgpu_reset_execlist(struct intel_vgpu *vgpu,

			       intel_engine_mask_t engine_mask);



#endif /*_GVT_EXECLIST_H_*/

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

+4 −2
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 


#include <linux/types.h>



#include "display/intel_display.h"



struct intel_vgpu;



#define _PLANE_CTL_FORMAT_SHIFT		24

#define _PLANE_CTL_TILED_SHIFT		10

#define _PIPE_V_SRCSZ_SHIFT		0
@@ -98,8 +102,6 @@ enum DDI_PORT { 
	DDI_PORT_E	= 4

};



struct intel_gvt;



/* color space conversion and gamma correction are not included */

struct intel_vgpu_primary_plane_format {

	u8	enabled;	/* plane is enabled */

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

+10 −1
Original line number Diff line number Diff line
@@ -34,10 +34,19 @@ 
#ifndef _GVT_GTT_H_

#define _GVT_GTT_H_



#define I915_GTT_PAGE_SHIFT         12

#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/mutex.h>

#include <linux/radix-tree.h>



#include "gt/intel_gtt.h"



struct intel_gvt;

struct intel_vgpu;

struct intel_vgpu_mm;



#define I915_GTT_PAGE_SHIFT         12



#define INTEL_GVT_INVALID_ADDR (~0UL)



struct intel_gvt_gtt_entry {

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

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
#ifndef _GVT_H_

#define _GVT_H_



#include <uapi/linux/pci_regs.h>



#include "i915_drv.h"



#include "debug.h"

#include "hypercall.h"

#include "mmio.h"