Commit fe63ea7c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: convert INTEL_DISPLAY_ENABLED() into a function 



There's no need for this to be a macro. Add some documentation too.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/480b9b697b2ffa0c8677115bd443ba633801c6c1.1696336887.git.jani.nikula@intel.com
parent f2a7b9cd

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

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ intel_crt_detect(struct drm_connector *connector, 
		    connector->base.id, connector->name,

		    force);



	if (!INTEL_DISPLAY_ENABLED(dev_priv))

	if (!intel_display_device_enabled(dev_priv))

		return connector_status_disconnected;



	if (dev_priv->params.load_detect_test) {

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

+17 −0
Original line number Diff line number Diff line
@@ -1091,3 +1091,20 @@ void intel_display_device_info_print(const struct intel_display_device_info *inf 
	drm_printf(p, "has_dmc: %s\n", str_yes_no(runtime->has_dmc));

	drm_printf(p, "has_dsc: %s\n", str_yes_no(runtime->has_dsc));

}



/*

 * Assuming the device has display hardware, should it be enabled?

 *

 * It's an error to call this function if the device does not have display

 * hardware.

 *

 * Disabling display means taking over the display hardware, putting it to

 * sleep, and preventing connectors from being connected via any means.

 */

bool intel_display_device_enabled(struct drm_i915_private *i915)

{

	/* Only valid when HAS_DISPLAY() is true */

	drm_WARN_ON(&i915->drm, !HAS_DISPLAY(i915));



	return !i915->params.disable_display && !intel_opregion_headless_sku(i915);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ struct intel_display_device_info { 
	} color;

};



bool intel_display_device_enabled(struct drm_i915_private *i915);

void intel_display_device_probe(struct drm_i915_private *i915);

void intel_display_device_info_runtime_init(struct drm_i915_private *i915);

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

+1 −1
Original line number Diff line number Diff line
@@ -5358,7 +5358,7 @@ intel_dp_detect(struct drm_connector *connector, 
	drm_WARN_ON(&dev_priv->drm,

		    !drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));



	if (!INTEL_DISPLAY_ENABLED(dev_priv))

	if (!intel_display_device_enabled(dev_priv))

		return connector_status_disconnected;



	/* Can't disconnect eDP */

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

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ intel_dp_mst_detect(struct drm_connector *connector, 
	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_dp *intel_dp = intel_connector->mst_port;



	if (!INTEL_DISPLAY_ENABLED(i915))

	if (!intel_display_device_enabled(i915))

		return connector_status_disconnected;



	if (drm_connector_is_unregistered(connector))