Commit feddf6e8 authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: clean up intel_gvt.h as interface for i915 core 



i915 core should only call functions and structures exposed through
intel_gvt.h. Remove internal gvt.h and i915_pvinfo.h.

Change for internal intel_gvt structure as private handler which
not requires to expose gvt internal structure for i915 core.

v2: Fix per Chris's comment
- carefully handle dev_priv->gvt assignment
- add necessary bracket for macro helper
- forward declartion struct intel_gvt
- keep free operation within same file handling alloc

v3: fix use after free and remove intel_gvt.initialized

v4: change to_gvt() to an inline

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 1140f9ed

drivers/gpu/drm/i915/gvt/aperture_gm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
 */

 */





#include "i915_drv.h"

#include "i915_drv.h"

#include "gvt.h"





#define MB_TO_BYTES(mb) ((mb) << 20ULL)

#define MB_TO_BYTES(mb) ((mb) << 20ULL)

#define BYTES_TO_MB(b) ((b) >> 20ULL)

#define BYTES_TO_MB(b) ((b) >> 20ULL)

drivers/gpu/drm/i915/gvt/cfg_space.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */

 */





#include "i915_drv.h"

#include "i915_drv.h"

#include "gvt.h"





enum {

enum {

	INTEL_GVT_PCI_BAR_GTTMMIO = 0,

	INTEL_GVT_PCI_BAR_GTTMMIO = 0,

drivers/gpu/drm/i915/gvt/cmd_parser.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ 




#include <linux/slab.h>

#include <linux/slab.h>

#include "i915_drv.h"

#include "i915_drv.h"

#include "gvt.h"

#include "i915_pvinfo.h"

#include "trace.h"

#include "trace.h"





#define INVALID_OP    (~0U)

#define INVALID_OP    (~0U)

drivers/gpu/drm/i915/gvt/display.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
 */

 */





#include "i915_drv.h"

#include "i915_drv.h"

#include "gvt.h"





static int get_edp_pipe(struct intel_vgpu *vgpu)

static int get_edp_pipe(struct intel_vgpu *vgpu)

{

{

drivers/gpu/drm/i915/gvt/edid.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
 */

 */





#include "i915_drv.h"

#include "i915_drv.h"

#include "gvt.h"





#define GMBUS1_TOTAL_BYTES_SHIFT 16

#define GMBUS1_TOTAL_BYTES_SHIFT 16

#define GMBUS1_TOTAL_BYTES_MASK 0x1ff

#define GMBUS1_TOTAL_BYTES_MASK 0x1ff