Commit a7f46d5b authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Move intel_vtd_active and run_as_guest to i915_utils 



Continuation of the effort to declutter i915_drv.h.

Also, component specific helpers which consult the iommu/virtualization
helpers moved to respective component source/header files as appropriate.

v2:
 * s/dev_priv/i915/ in intel_scanout_needs_vtd_wa. (Lucas)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220329090204.2324499-1-tvrtko.ursulin@linux.intel.com
[tursulin: fixup conflict in i915_drv.h]
parent ca2cae9a

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

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <drm/drm_atomic_state_helper.h>



#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_atomic.h"

#include "intel_bw.h"

#include "intel_cdclk.h"
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, 
	for_each_pipe(dev_priv, pipe)

		data_rate += bw_state->data_rate[pipe];



	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))

	if (DISPLAY_VER(dev_priv) >= 13 && i915_vtd_active(dev_priv))

		data_rate = DIV_ROUND_UP(data_rate * 105, 100);



	return data_rate;

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

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#include "g4x_hdmi.h"

#include "hsw_ips.h"

#include "i915_drv.h"

#include "i915_utils.h"

#include "icl_dsi.h"

#include "intel_acpi.h"

#include "intel_atomic.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state) 
{

	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);



	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&

	return crtc_state->uapi.async_flip && i915_vtd_active(i915) &&

		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));

}
@@ -10696,3 +10697,8 @@ void intel_display_driver_unregister(struct drm_i915_private *i915) 
	acpi_video_unregister();

	intel_opregion_unregister(i915);

}



bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915)

{

	return DISPLAY_VER(i915) >= 6 && i915_vtd_active(i915);

}

drivers/gpu/drm/i915/display/intel_display.h

+2 −0
Original line number Diff line number Diff line
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv, 
#define I915_STATE_WARN_ON(x)						\

	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")



bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915);



#endif

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

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <drm/drm_fourcc.h>



#include "i915_drv.h"

#include "i915_utils.h"

#include "i915_vgpu.h"

#include "intel_cdclk.h"

#include "intel_de.h"
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915) 
static bool need_fbc_vtd_wa(struct drm_i915_private *i915)

{

	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */

	if (intel_vtd_active(i915) &&

	if (i915_vtd_active(i915) &&

	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {

		drm_info(&i915->drm,

			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "i915_drv.h"

#include "i915_gem_stolen.h"

#include "i915_reg.h"

#include "i915_utils.h"

#include "i915_vgpu.h"

#include "intel_mchbar_regs.h"
@@ -401,7 +402,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem) 
		return 0;

	}



	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {

	if (i915_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {

		drm_notice(&i915->drm,

			   "%s, disabling use of stolen memory\n",

			   "DMAR active");