mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
Revert "drm/i915/pps: Split pps_init_delays() into distinct parts"
This reverts commitad719d5cc7
which is commit75bd0d5e4e
upstream. This is part of a series of i915 patches that were backported to 5.19.12 but found to be incomplete and caused problems on many systems so they are being reverted. Reported-by: Jerry Ling <jiling@cern.ch> Reported-by: Hans de Goede <hdegoede@redhat.com> Cc: Thorsten Leemhuis <regressions@leemhuis.info> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Sasha Levin <sashal@kernel.org> Link: https://lore.kernel.org/all/55905860-adf9-312c-69cc-491ac8ce1a8b@cern.ch/ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5f86062caf
commit
da42e25ec5
1 changed files with 35 additions and 65 deletions
|
@ -1159,68 +1159,6 @@ intel_pps_verify_state(struct intel_dp *intel_dp)
|
|||
}
|
||||
}
|
||||
|
||||
static void pps_init_delays_cur(struct intel_dp *intel_dp,
|
||||
struct edp_power_seq *cur)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
|
||||
lockdep_assert_held(&dev_priv->pps_mutex);
|
||||
|
||||
intel_pps_readout_hw_state(intel_dp, cur);
|
||||
|
||||
intel_pps_dump_state(intel_dp, "cur", cur);
|
||||
}
|
||||
|
||||
static void pps_init_delays_vbt(struct intel_dp *intel_dp,
|
||||
struct edp_power_seq *vbt)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
|
||||
*vbt = dev_priv->vbt.edp.pps;
|
||||
|
||||
/* On Toshiba Satellite P50-C-18C system the VBT T12 delay
|
||||
* of 500ms appears to be too short. Ocassionally the panel
|
||||
* just fails to power back on. Increasing the delay to 800ms
|
||||
* seems sufficient to avoid this problem.
|
||||
*/
|
||||
if (dev_priv->quirks & QUIRK_INCREASE_T12_DELAY) {
|
||||
vbt->t11_t12 = max_t(u16, vbt->t11_t12, 1300 * 10);
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"Increasing T12 panel delay as per the quirk to %d\n",
|
||||
vbt->t11_t12);
|
||||
}
|
||||
|
||||
/* T11_T12 delay is special and actually in units of 100ms, but zero
|
||||
* based in the hw (so we need to add 100 ms). But the sw vbt
|
||||
* table multiplies it with 1000 to make it in units of 100usec,
|
||||
* too. */
|
||||
vbt->t11_t12 += 100 * 10;
|
||||
|
||||
intel_pps_dump_state(intel_dp, "vbt", vbt);
|
||||
}
|
||||
|
||||
static void pps_init_delays_spec(struct intel_dp *intel_dp,
|
||||
struct edp_power_seq *spec)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
|
||||
lockdep_assert_held(&dev_priv->pps_mutex);
|
||||
|
||||
/* Upper limits from eDP 1.3 spec. Note that we use the clunky units of
|
||||
* our hw here, which are all in 100usec. */
|
||||
spec->t1_t3 = 210 * 10;
|
||||
spec->t8 = 50 * 10; /* no limit for t8, use t7 instead */
|
||||
spec->t9 = 50 * 10; /* no limit for t9, make it symmetric with t8 */
|
||||
spec->t10 = 500 * 10;
|
||||
/* This one is special and actually in units of 100ms, but zero
|
||||
* based in the hw (so we need to add 100 ms). But the sw vbt
|
||||
* table multiplies it with 1000 to make it in units of 100usec,
|
||||
* too. */
|
||||
spec->t11_t12 = (510 + 100) * 10;
|
||||
|
||||
intel_pps_dump_state(intel_dp, "spec", spec);
|
||||
}
|
||||
|
||||
static void pps_init_delays(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
|
@ -1233,9 +1171,41 @@ static void pps_init_delays(struct intel_dp *intel_dp)
|
|||
if (final->t11_t12 != 0)
|
||||
return;
|
||||
|
||||
pps_init_delays_cur(intel_dp, &cur);
|
||||
pps_init_delays_vbt(intel_dp, &vbt);
|
||||
pps_init_delays_spec(intel_dp, &spec);
|
||||
intel_pps_readout_hw_state(intel_dp, &cur);
|
||||
|
||||
intel_pps_dump_state(intel_dp, "cur", &cur);
|
||||
|
||||
vbt = dev_priv->vbt.edp.pps;
|
||||
/* On Toshiba Satellite P50-C-18C system the VBT T12 delay
|
||||
* of 500ms appears to be too short. Ocassionally the panel
|
||||
* just fails to power back on. Increasing the delay to 800ms
|
||||
* seems sufficient to avoid this problem.
|
||||
*/
|
||||
if (dev_priv->quirks & QUIRK_INCREASE_T12_DELAY) {
|
||||
vbt.t11_t12 = max_t(u16, vbt.t11_t12, 1300 * 10);
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"Increasing T12 panel delay as per the quirk to %d\n",
|
||||
vbt.t11_t12);
|
||||
}
|
||||
/* T11_T12 delay is special and actually in units of 100ms, but zero
|
||||
* based in the hw (so we need to add 100 ms). But the sw vbt
|
||||
* table multiplies it with 1000 to make it in units of 100usec,
|
||||
* too. */
|
||||
vbt.t11_t12 += 100 * 10;
|
||||
|
||||
/* Upper limits from eDP 1.3 spec. Note that we use the clunky units of
|
||||
* our hw here, which are all in 100usec. */
|
||||
spec.t1_t3 = 210 * 10;
|
||||
spec.t8 = 50 * 10; /* no limit for t8, use t7 instead */
|
||||
spec.t9 = 50 * 10; /* no limit for t9, make it symmetric with t8 */
|
||||
spec.t10 = 500 * 10;
|
||||
/* This one is special and actually in units of 100ms, but zero
|
||||
* based in the hw (so we need to add 100 ms). But the sw vbt
|
||||
* table multiplies it with 1000 to make it in units of 100usec,
|
||||
* too. */
|
||||
spec.t11_t12 = (510 + 100) * 10;
|
||||
|
||||
intel_pps_dump_state(intel_dp, "vbt", &vbt);
|
||||
|
||||
/* Use the max of the register settings and vbt. If both are
|
||||
* unset, fall back to the spec limits. */
|
||||
|
|
Loading…
Reference in a new issue