Commit 325710d3 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Refactor VBT fixed mode handling 



LVDS and eDP have essentially the same code for grabbing the
fixed mode from VBT. Pull that code to a common location.

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


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 8f49673e

drivers/gpu/drm/i915/intel_dp.c

+2 −9
Original line number Diff line number Diff line
@@ -7114,15 +7114,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 
		downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode);



	/* fallback to VBT if available for eDP */

	if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) {

		fixed_mode = drm_mode_duplicate(dev,

					dev_priv->vbt.lfp_lvds_vbt_mode);

		if (fixed_mode) {

			fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;

			connector->display_info.width_mm = fixed_mode->width_mm;

			connector->display_info.height_mm = fixed_mode->height_mm;

		}

	}

	if (!fixed_mode)

		fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);

	mutex_unlock(&dev->mode_config.mutex);



	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,8 @@ extern struct drm_display_mode *intel_find_panel_downclock( 
				struct drm_connector *connector);

struct drm_display_mode *

intel_panel_edid_fixed_mode(struct intel_connector *connector);

struct drm_display_mode *

intel_panel_vbt_fixed_mode(struct intel_connector *connector);



#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)

int intel_backlight_device_register(struct intel_connector *connector);

drivers/gpu/drm/i915/intel_lvds.c

+3 −12
Original line number Diff line number Diff line
@@ -953,18 +953,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) 
		goto out;



	/* Failed to get EDID, what about VBT? */

	if (dev_priv->vbt.lfp_lvds_vbt_mode) {

		DRM_DEBUG_KMS("using mode from VBT: ");

		drm_mode_debug_printmodeline(dev_priv->vbt.lfp_lvds_vbt_mode);



		fixed_mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);

		if (fixed_mode) {

			fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;

			connector->display_info.width_mm = fixed_mode->width_mm;

			connector->display_info.height_mm = fixed_mode->height_mm;

	fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);

	if (fixed_mode)

		goto out;

		}

	}



	/*

	 * If we didn't get EDID, try checking if the panel is already turned

drivers/gpu/drm/i915/intel_panel.c

+27 −0
Original line number Diff line number Diff line
@@ -141,6 +141,33 @@ intel_panel_edid_fixed_mode(struct intel_connector *connector) 
	return fixed_mode;

}



struct drm_display_mode *

intel_panel_vbt_fixed_mode(struct intel_connector *connector)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct drm_display_info *info = &connector->base.display_info;

	struct drm_display_mode *fixed_mode;



	if (!dev_priv->vbt.lfp_lvds_vbt_mode)

		return NULL;



	fixed_mode = drm_mode_duplicate(&dev_priv->drm,

					dev_priv->vbt.lfp_lvds_vbt_mode);

	if (!fixed_mode)

		return NULL;



	fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using mode from VBT: ",

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

	drm_mode_debug_printmodeline(fixed_mode);



	info->width_mm = fixed_mode->width_mm;

	info->height_mm = fixed_mode->height_mm;



	return fixed_mode;

}



/* adjusted_mode has been preset to be the panel's fixed mode */

void

intel_pch_panel_fitting(struct intel_crtc *intel_crtc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE