drm/i915: Add HAS_DISPLAY() and use it (e1bf094b) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
		* Use PCH_NOP (PCH but no South Display) for PCH platforms without
		* display.
		*/
		if (pch && INTEL_INFO(dev_priv)->num_pipes == 0) {
		if (pch && !HAS_DISPLAY(dev_priv)) {
		DRM_DEBUG_KMS("Display disabled, reverting to NOP PCH\n");
		dev_priv->pch_type = PCH_NOP;
		dev_priv->pch_id = 0;
		@@ -645,7 +645,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
		if (i915_inject_load_failure())
		return -ENODEV;

		if (INTEL_INFO(dev_priv)->num_pipes) {
		if (HAS_DISPLAY(dev_priv)) {
		ret = drm_vblank_init(&dev_priv->drm,
		INTEL_INFO(dev_priv)->num_pipes);
		if (ret)
		@@ -696,7 +696,7 @@ static int i915_load_modeset_init(struct drm_device *dev)

		intel_overlay_setup(dev_priv);

		if (INTEL_INFO(dev_priv)->num_pipes == 0)
		if (!HAS_DISPLAY(dev_priv))
		return 0;

		ret = intel_fbdev_init(dev);
		@@ -1566,7 +1566,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
		} else
		DRM_ERROR("Failed to register driver for userspace access!\n");

		if (INTEL_INFO(dev_priv)->num_pipes) {
		if (HAS_DISPLAY(dev_priv)) {
		/* Must be done after probing outputs */
		intel_opregion_register(dev_priv);
		acpi_video_register();
		@@ -1590,7 +1590,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
		* We need to coordinate the hotplugs with the asynchronous fbdev
		* configuration, for which we use the fbdev->async_cookie.
		*/
		if (INTEL_INFO(dev_priv)->num_pipes)
		if (HAS_DISPLAY(dev_priv))
		drm_kms_helper_poll_init(dev);

		intel_power_domains_enable(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2569,6 +2569,8 @@ intel_info(const struct drm_i915_private *dev_priv)
		#define GT_FREQUENCY_MULTIPLIER 50
		#define GEN9_FREQ_SCALER 3

		#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->num_pipes > 0)

		#include "i915_trace.h"

		static inline bool intel_vtd_active(void)

drivers/gpu/drm/i915/intel_bios.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1752,7 +1752,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
		const struct bdb_header *bdb;
		u8 __iomem *bios = NULL;

		if (INTEL_INFO(dev_priv)->num_pipes == 0) {
		if (!HAS_DISPLAY(dev_priv)) {
		DRM_DEBUG_KMS("Skipping VBT init due to disabled display.\n");
		return;
		}

drivers/gpu/drm/i915/intel_device_info.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -782,7 +782,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
		if (i915_modparams.disable_display) {
		DRM_INFO("Display disabled (module parameter)\n");
		info->num_pipes = 0;
		} else if (info->num_pipes > 0 &&
		} else if (HAS_DISPLAY(dev_priv) &&
		(IS_GEN7(dev_priv) \|\| IS_GEN8(dev_priv)) &&
		HAS_PCH_SPLIT(dev_priv)) {
		u32 fuse_strap = I915_READ(FUSE_STRAP);
		@@ -807,7 +807,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
		DRM_INFO("PipeC fused off\n");
		info->num_pipes -= 1;
		}
		} else if (info->num_pipes > 0 && IS_GEN9(dev_priv)) {
		} else if (HAS_DISPLAY(dev_priv) && IS_GEN9(dev_priv)) {
		u32 dfsm = I915_READ(SKL_DFSM);
		u8 disabled_mask = 0;
		bool invalid;

drivers/gpu/drm/i915/intel_display.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -14249,7 +14249,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)

		intel_pps_init(dev_priv);

		if (INTEL_INFO(dev_priv)->num_pipes == 0)
		if (!HAS_DISPLAY(dev_priv))
		return;

		/*
		@@ -16040,7 +16040,7 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)
		};
		int i;

		if (INTEL_INFO(dev_priv)->num_pipes == 0)
		if (!HAS_DISPLAY(dev_priv))
		return NULL;

		error = kzalloc(sizeof(*error), GFP_ATOMIC);

Admin message