diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-23 10:18:10 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-23 10:39:39 +0200 |
| commit | 390a1f8beb879359359ef38d30a0b0ccf392148e (patch) | |
| tree | 8d9c51fc1e3313910a120f2061bdf6ee035d8d88 | |
| parent | drm/i915/adl-n: Add PCH Support for Alder Lake N (diff) | |
| download | wireguard-linux-390a1f8beb879359359ef38d30a0b0ccf392148e.tar.xz wireguard-linux-390a1f8beb879359359ef38d30a0b0ccf392148e.zip | |
Revert "drm/i915/display/vrr: Reset VRR capable property on a long hpd"
This reverts commit 9bc34b4d0f3cb368241684cc5e0445d435dded44.
Just oopses on most machines.
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220223081810.19917-1-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index a80d96ced198..5381b993a346 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4455,12 +4455,6 @@ intel_dp_detect(struct drm_connector *connector, memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance)); memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd)); - /* Reset VRR Capable property */ - drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s] VRR capable: FALSE\n", - connector->base.id, connector->name); - drm_connector_set_vrr_capable_property(connector, - false); - if (intel_dp->is_mst) { drm_dbg_kms(&dev_priv->drm, "MST device may have disappeared %d vs %d\n", @@ -4575,18 +4569,15 @@ static int intel_dp_get_modes(struct drm_connector *connector) { struct intel_connector *intel_connector = to_intel_connector(connector); struct edid *edid; - struct drm_i915_private *i915 = to_i915(connector->dev); int num_modes = 0; edid = intel_connector->detect_edid; if (edid) { - bool vrr_capable; - num_modes = intel_connector_update_modes(connector, edid); - vrr_capable = intel_vrr_is_capable(connector); - drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] VRR capable: %s\n", - connector->base.id, connector->name, yesno(vrr_capable)); - drm_connector_set_vrr_capable_property(connector, vrr_capable); + + if (intel_vrr_is_capable(connector)) + drm_connector_set_vrr_capable_property(connector, + true); } /* Also add fixed mode, which may or may not be present in EDID */ |