OSDN Git Service

drm/i915/dp: Fix eDP max rate for display 11+
authorMatt Atwood <matthew.s.atwood@intel.com>
Wed, 1 Sep 2021 16:03:58 +0000 (21:33 +0530)
committerImre Deak <imre.deak@intel.com>
Thu, 2 Sep 2021 12:42:48 +0000 (15:42 +0300)
commit6fd5a7c92eae512c6760391731ed1b4a9de1c4a6
tree32a4ec3cbc01a5f96f1b4c3c57136cfca3014e71
parent344c32783044e75be56cbc6e34719cb0852f0af9
drm/i915/dp: Fix eDP max rate for display 11+

intel_dp_set_source_rates() calls intel_dp_is_edp(), which is unsafe to
use before intel_encoder->type is set. This causes incorrect max source
rate to be used for display 11+. On EHL and JSL, HBR3 is used instead of
HBR2, and on the other affected platforms, HBR2 is used instead of HBR3.

Move intel_dp_set_source_rates() to after intel_encoder->type is
set. Add comment to intel_dp_is_edp() describing unsafe usages. Cleanup
intel_dp_init_connector() while at it.

Note: The same change was originally added as commit 680c45c767f6
("drm/i915/dp: Correctly advertise HBR3 for GEN11+"), but later reverted
due to issues in CI in commit d3913019602e ("Revert "drm/i915/dp:
Correctly advertise HBR3 for GEN11+"").

Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210901160402.24816-2-animesh.manna@intel.com
drivers/gpu/drm/i915/display/intel_dp.c