Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b02d22a3 authored by Zhi Wang's avatar Zhi Wang Committed by Chris Wilson
Browse files

drm/i915: Fold vGPU active check into inner functions 



v5:
- Let functions take struct drm_i915_private *. (Tvrtko)

- Fold vGPU related active check into the inner functions. (Kevin)

Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Suggested-by: default avatarKevin Tian <kevin.tian@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466078825-6662-4-git-send-email-zhi.a.wang@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b2a5d1e7

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −7
Original line number Diff line number Diff line
@@ -2794,11 +2794,9 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev, 
	i915_address_space_init(&ggtt->base, dev_priv);

	ggtt->base.total += PAGE_SIZE;



	if (intel_vgpu_active(dev_priv)) {

		ret = intel_vgt_balloon(dev);

	ret = intel_vgt_balloon(dev_priv);

	if (ret)

		return ret;

	}



	if (!HAS_LLC(dev))

		ggtt->base.mm.color_adjust = i915_gtt_color_adjust;
@@ -2898,8 +2896,7 @@ void i915_ggtt_cleanup_hw(struct drm_device *dev) 
	i915_gem_cleanup_stolen(dev);



	if (drm_mm_initialized(&ggtt->base.mm)) {

		if (intel_vgpu_active(dev_priv))

			intel_vgt_deballoon();

		intel_vgt_deballoon(dev_priv);



		drm_mm_takedown(&ggtt->base.mm);

		list_del(&ggtt->base.global_link);

drivers/gpu/drm/i915/i915_vgpu.c

+9 −4
Original line number Diff line number Diff line
@@ -101,10 +101,13 @@ static struct _balloon_info_ bl_info; 
 * This function is called to deallocate the ballooned-out graphic memory, when

 * driver is unloaded or when ballooning fails.

 */

void intel_vgt_deballoon(void)

void intel_vgt_deballoon(struct drm_i915_private *dev_priv)

{

	int i;



	if (!intel_vgpu_active(dev_priv))

		return;



	DRM_DEBUG("VGT deballoon.\n");



	for (i = 0; i < 4; i++) {
@@ -177,9 +180,8 @@ static int vgt_balloon_space(struct drm_mm *mm, 
 * Returns:

 * zero on success, non-zero if configuration invalid or ballooning failed

 */

int intel_vgt_balloon(struct drm_device *dev)

int intel_vgt_balloon(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct i915_ggtt *ggtt = &dev_priv->ggtt;

	unsigned long ggtt_end = ggtt->base.start + ggtt->base.total;
@@ -187,6 +189,9 @@ int intel_vgt_balloon(struct drm_device *dev) 
	unsigned long unmappable_base, unmappable_size, unmappable_end;

	int ret;



	if (!intel_vgpu_active(dev_priv))

		return 0;



	mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base));

	mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size));

	unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base));
@@ -258,6 +263,6 @@ int intel_vgt_balloon(struct drm_device *dev) 


err:

	DRM_ERROR("VGT balloon fail\n");

	intel_vgt_deballoon();

	intel_vgt_deballoon(dev_priv);

	return ret;

}

drivers/gpu/drm/i915/i915_vgpu.h

+3 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


#include "i915_pvinfo.h"



extern void i915_check_vgpu(struct drm_i915_private *dev_priv);

extern int intel_vgt_balloon(struct drm_device *dev);

extern void intel_vgt_deballoon(void);

void i915_check_vgpu(struct drm_i915_private *dev_priv);

int intel_vgt_balloon(struct drm_i915_private *dev_priv);

void intel_vgt_deballoon(struct drm_i915_private *dev_priv);



#endif /* _I915_VGPU_H_ */