Commit 119125d9 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-next-2022-04-29' of https://github.com/intel/gvt-linux into drm-intel-next 



gvt-next-2022-04-29

Introduce fixes from previous pull.
- Fix a compiling warning of non-static funtion only having one caller.
- Fix a potential NULL pointer reference in the code re-factor.
- Fix a compiling error when CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: "Wang, Zhi A" <zhi.a.wang@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9c2fc678-2e6e-a9d5-a540-2a6bfda31196@intel.com
parents 1bc4ae0c 419f8299

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

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ unsigned long intel_gvt_get_device_type(struct intel_gvt *gvt) 
	return 0;

}



bool intel_gvt_match_device(struct intel_gvt *gvt,

static bool intel_gvt_match_device(struct intel_gvt *gvt,

		unsigned long device)

{

	return intel_gvt_get_device_type(gvt) & device;
@@ -2922,7 +2922,7 @@ static int init_mmio_block_handlers(struct intel_gvt *gvt) 
	block = find_mmio_block(gvt, VGT_PVINFO_PAGE);

	if (!block) {

		WARN(1, "fail to assign handlers to mmio block %x\n",

		     i915_mmio_reg_offset(block->offset));

		     i915_mmio_reg_offset(gvt->mmio.mmio_block->offset));

		return -ENODEV;

	}

drivers/gpu/drm/i915/intel_gvt.c

+2 −0
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ EXPORT_SYMBOL_NS_GPL(__intel_context_do_pin, I915_GVT); 
EXPORT_SYMBOL_NS_GPL(__intel_context_do_unpin, I915_GVT);

EXPORT_SYMBOL_NS_GPL(intel_ring_begin, I915_GVT);

EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_get, I915_GVT);

#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)

EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_put, I915_GVT);

#endif

EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_put_unchecked, I915_GVT);

EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_for_reg, I915_GVT);

EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_get, I915_GVT);