Commit 8e9c9848 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Polish drrs type enum 



Make the drrs type enum less convoluted.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220310004802.16310-7-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1fa7bb12

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

+5 −5
Original line number Diff line number Diff line
@@ -257,16 +257,16 @@ parse_panel_options(struct drm_i915_private *i915, 
	 */

	switch (drrs_mode) {

	case 0:

		i915->vbt.drrs_type = STATIC_DRRS_SUPPORT;

		i915->vbt.drrs_type = DRRS_TYPE_STATIC;

		drm_dbg_kms(&i915->drm, "DRRS supported mode is static\n");

		break;

	case 2:

		i915->vbt.drrs_type = SEAMLESS_DRRS_SUPPORT;

		i915->vbt.drrs_type = DRRS_TYPE_SEAMLESS;

		drm_dbg_kms(&i915->drm,

			    "DRRS supported mode is seamless\n");

		break;

	default:

		i915->vbt.drrs_type = DRRS_NOT_SUPPORTED;

		i915->vbt.drrs_type = DRRS_TYPE_NONE;

		drm_dbg_kms(&i915->drm,

			    "DRRS not supported (VBT input)\n");

		break;
@@ -740,7 +740,7 @@ parse_driver_features(struct drm_i915_private *i915, 
		 * driver->drrs_enabled=false

		 */

		if (!driver->drrs_enabled)

			i915->vbt.drrs_type = DRRS_NOT_SUPPORTED;

			i915->vbt.drrs_type = DRRS_TYPE_NONE;



		i915->vbt.psr.enable = driver->psr_enabled;

	}
@@ -769,7 +769,7 @@ parse_power_conservation_features(struct drm_i915_private *i915, 
	 * power->drrs & BIT(panel_type)=false

	 */

	if (!(power->drrs & BIT(panel_type)))

		i915->vbt.drrs_type = DRRS_NOT_SUPPORTED;

		i915->vbt.drrs_type = DRRS_TYPE_NONE;



	if (bdb->version >= 232)

		i915->vbt.edp.hobl = power->hobl & BIT(panel_type);

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

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ static void drrs_status_per_crtc(struct seq_file *m, 
		seq_printf(m, "%s:\n", connector->name);



		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&

		    drrs->type == SEAMLESS_DRRS_SUPPORT)

		    drrs->type == DRRS_TYPE_SEAMLESS)

			supported = true;



		seq_printf(m, "\tDRRS Supported: %s\n", str_yes_no(supported));

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

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static bool can_enable_drrs(struct intel_connector *connector, 
		return false;



	return connector->panel.downclock_mode &&

		i915->drrs.type == SEAMLESS_DRRS_SUPPORT;

		i915->drrs.type == DRRS_TYPE_SEAMLESS;

}



void
@@ -155,7 +155,7 @@ static void intel_drrs_set_state(struct drm_i915_private *dev_priv, 
		return;

	}



	if (dev_priv->drrs.type != SEAMLESS_DRRS_SUPPORT) {

	if (dev_priv->drrs.type != DRRS_TYPE_SEAMLESS) {

		drm_dbg_kms(&dev_priv->drm, "Only Seamless DRRS supported.\n");

		return;

	}
@@ -274,7 +274,7 @@ intel_drrs_update(struct intel_dp *intel_dp, 
{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);



	if (dev_priv->drrs.type != SEAMLESS_DRRS_SUPPORT)

	if (dev_priv->drrs.type != DRRS_TYPE_SEAMLESS)

		return;



	mutex_lock(&dev_priv->drrs.mutex);
@@ -329,7 +329,7 @@ static void intel_drrs_frontbuffer_update(struct drm_i915_private *dev_priv, 
	struct drm_crtc *crtc;

	enum pipe pipe;



	if (dev_priv->drrs.type != SEAMLESS_DRRS_SUPPORT)

	if (dev_priv->drrs.type != DRRS_TYPE_SEAMLESS)

		return;



	cancel_delayed_work(&dev_priv->drrs.work);
@@ -449,7 +449,7 @@ intel_drrs_init(struct intel_connector *connector, 
		return NULL;

	}



	if (dev_priv->vbt.drrs_type != SEAMLESS_DRRS_SUPPORT) {

	if (dev_priv->vbt.drrs_type != DRRS_TYPE_SEAMLESS) {

		drm_dbg_kms(&dev_priv->drm,

			    "[CONNECTOR:%d:%s] DRRS not supported according to VBT\n",

			    connector->base.base.id, connector->base.name);

drivers/gpu/drm/i915/i915_drv.h

+6 −6
Original line number Diff line number Diff line
@@ -207,10 +207,10 @@ enum drrs_refresh_rate_type { 
	DRRS_MAX_RR, /* RR count */

};



enum drrs_support_type {

	DRRS_NOT_SUPPORTED = 0,

	STATIC_DRRS_SUPPORT = 1,

	SEAMLESS_DRRS_SUPPORT = 2

enum drrs_type {

	DRRS_TYPE_NONE,

	DRRS_TYPE_STATIC,

	DRRS_TYPE_SEAMLESS,

};



struct i915_drrs {
@@ -219,7 +219,7 @@ struct i915_drrs { 
	struct intel_dp *dp;

	unsigned busy_frontbuffer_bits;

	enum drrs_refresh_rate_type refresh_rate_type;

	enum drrs_support_type type;

	enum drrs_type type;

};



#define QUIRK_LVDS_SSC_DISABLE (1<<1)
@@ -349,7 +349,7 @@ struct intel_vbt_data { 
	bool override_afc_startup;

	u8 override_afc_startup_val;



	enum drrs_support_type drrs_type;

	enum drrs_type drrs_type;



	struct {

		int rate;