Commit aee2eeeb authored by Wambui Karuga's avatar Wambui Karuga Committed by Jani Nikula
Browse files

drm/i915: conversion to new logging macros in i915/i915_vgpu.c 



Replace the use of printk based logging macros with the struct
drm_device based macros in i915/i915_vgpu.c

Signed-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/45e8bffff8cbffd72ed41901c3db9f7f6dbe79f3.1578560355.git.wambui.karugax@gmail.com
parent 77b20896

drivers/gpu/drm/i915/i915_vgpu.c

+25 −16
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) 


	shared_area = pci_iomap_range(pdev, 0, VGT_PVINFO_PAGE, VGT_PVINFO_SIZE);

	if (!shared_area) {

		DRM_ERROR("failed to map MMIO bar to check for VGT\n");

		drm_err(&dev_priv->drm,

			"failed to map MMIO bar to check for VGT\n");

		return;

	}
@@ -87,7 +88,7 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) 


	version_major = readw(shared_area + vgtif_offset(version_major));

	if (version_major < VGT_VERSION_MAJOR) {

		DRM_INFO("VGT interface version mismatch!\n");

		drm_info(&dev_priv->drm, "VGT interface version mismatch!\n");

		goto out;

	}
@@ -95,7 +96,7 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) 


	dev_priv->vgpu.active = true;

	mutex_init(&dev_priv->vgpu.lock);

	DRM_INFO("Virtual GPU for Intel GVT-g detected.\n");

	drm_info(&dev_priv->drm, "Virtual GPU for Intel GVT-g detected.\n");



out:

	pci_iounmap(pdev, shared_area);
@@ -120,10 +121,12 @@ static struct _balloon_info_ bl_info; 
static void vgt_deballoon_space(struct i915_ggtt *ggtt,

				struct drm_mm_node *node)

{

	struct drm_i915_private *dev_priv = ggtt->vm.i915;

	if (!drm_mm_node_allocated(node))

		return;



	DRM_DEBUG_DRIVER("deballoon space: range [0x%llx - 0x%llx] %llu KiB.\n",

	drm_dbg(&dev_priv->drm,

		"deballoon space: range [0x%llx - 0x%llx] %llu KiB.\n",

		node->start,

		node->start + node->size,

		node->size / 1024);
@@ -141,12 +144,13 @@ static void vgt_deballoon_space(struct i915_ggtt *ggtt, 
 */

void intel_vgt_deballoon(struct i915_ggtt *ggtt)

{

	struct drm_i915_private *dev_priv = ggtt->vm.i915;

	int i;



	if (!intel_vgpu_active(ggtt->vm.i915))

		return;



	DRM_DEBUG("VGT deballoon.\n");

	drm_dbg(&dev_priv->drm, "VGT deballoon.\n");



	for (i = 0; i < 4; i++)

		vgt_deballoon_space(ggtt, &bl_info.space[i]);
@@ -156,13 +160,15 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt, 
			     struct drm_mm_node *node,

			     unsigned long start, unsigned long end)

{

	struct drm_i915_private *dev_priv = ggtt->vm.i915;

	unsigned long size = end - start;

	int ret;



	if (start >= end)

		return -EINVAL;



	DRM_INFO("balloon space: range [ 0x%lx - 0x%lx ] %lu KiB.\n",

	drm_info(&dev_priv->drm,

		 "balloon space: range [ 0x%lx - 0x%lx ] %lu KiB.\n",

		 start, end, size / 1024);

	ret = i915_gem_gtt_reserve(&ggtt->vm, node,

				   size, start, I915_COLOR_UNEVICTABLE,
@@ -219,7 +225,8 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt, 
 */

int intel_vgt_balloon(struct i915_ggtt *ggtt)

{

	struct intel_uncore *uncore = &ggtt->vm.i915->uncore;

	struct drm_i915_private *dev_priv = ggtt->vm.i915;

	struct intel_uncore *uncore = &dev_priv->uncore;

	unsigned long ggtt_end = ggtt->vm.total;



	unsigned long mappable_base, mappable_size, mappable_end;
@@ -241,16 +248,18 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) 
	mappable_end = mappable_base + mappable_size;

	unmappable_end = unmappable_base + unmappable_size;



	DRM_INFO("VGT ballooning configuration:\n");

	DRM_INFO("Mappable graphic memory: base 0x%lx size %ldKiB\n",

	drm_info(&dev_priv->drm, "VGT ballooning configuration:\n");

	drm_info(&dev_priv->drm,

		 "Mappable graphic memory: base 0x%lx size %ldKiB\n",

		 mappable_base, mappable_size / 1024);

	DRM_INFO("Unmappable graphic memory: base 0x%lx size %ldKiB\n",

	drm_info(&dev_priv->drm,

		 "Unmappable graphic memory: base 0x%lx size %ldKiB\n",

		 unmappable_base, unmappable_size / 1024);



	if (mappable_end > ggtt->mappable_end ||

	    unmappable_base < ggtt->mappable_end ||

	    unmappable_end > ggtt_end) {

		DRM_ERROR("Invalid ballooning configuration!\n");

		drm_err(&dev_priv->drm, "Invalid ballooning configuration!\n");

		return -EINVAL;

	}
@@ -287,7 +296,7 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) 
			goto err_below_mappable;

	}



	DRM_INFO("VGT balloon successfully\n");

	drm_info(&dev_priv->drm, "VGT balloon successfully\n");

	return 0;



err_below_mappable:
@@ -297,6 +306,6 @@ err_upon_unmappable: 
err_upon_mappable:

	vgt_deballoon_space(ggtt, &bl_info.space[2]);

err:

	DRM_ERROR("VGT balloon fail\n");

	drm_err(&dev_priv->drm, "VGT balloon fail\n");

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE