History

Merge tag 'drm-intel-fixes-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

drm/i915 fixes for v5.19-rc4: - Revert low voltage SKU check removal to fix display issues - Apply PLL DCO fraction workaround for ADL-S - Don't show engine classes not present in client fdinfo

Dave Airlie committed 4 years ago

Commit 08d27da2 parents 0a86b0d c7b28f53 files · +34 −7Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/i915/display/intel_dp.c +29 −3
  2. drivers/gpu/drm/i915/display/intel_dpll_mgr.c +2 −2
  3. drivers/gpu/drm/i915/i915_drm_client.c +3 −2
drivers/gpu/drm/i915/display/intel_dp.c+29−3
@@ -388,13 +388,23 @@ static int dg2_max_source_rate(struct intel_dp *intel_dp) · 387 unmodified lines
388 return intel_dp_is_edp(intel_dp) ? 810000 : 1350000;388 return intel_dp_is_edp(intel_dp) ? 810000 : 1350000;
389}389}
390 390
391static bool is_low_voltage_sku(struct drm_i915_private *i915, enum phy phy)
392{
393 u32 voltage;
394
395 voltage = intel_de_read(i915, ICL_PORT_COMP_DW3(phy)) & VOLTAGE_INFO_MASK;
396
397 return voltage == VOLTAGE_INFO_0_85V;
398}
399
391static int icl_max_source_rate(struct intel_dp *intel_dp)400static int icl_max_source_rate(struct intel_dp *intel_dp)
392{401{
393 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);402 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
394 struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);403 struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
395 enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);404 enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
396 405
397 if (intel_phy_is_combo(dev_priv, phy) && !intel_dp_is_edp(intel_dp))406 if (intel_phy_is_combo(dev_priv, phy) &&
407 (is_low_voltage_sku(dev_priv, phy) || !intel_dp_is_edp(intel_dp)))
398 return 540000;408 return 540000;
399 409
400 return 810000;410 return 810000;
@@ -402,7 +412,23 @@ static int icl_max_source_rate(struct intel_dp *intel_dp) · 1 unmodified line
402 412
403static int ehl_max_source_rate(struct intel_dp *intel_dp)413static int ehl_max_source_rate(struct intel_dp *intel_dp)
404{414{
405 if (intel_dp_is_edp(intel_dp))415 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
416 struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
417 enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
418
419 if (intel_dp_is_edp(intel_dp) || is_low_voltage_sku(dev_priv, phy))
420 return 540000;
421
422 return 810000;
423}
424
425static int dg1_max_source_rate(struct intel_dp *intel_dp)
426{
427 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
428 struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
429 enum phy phy = intel_port_to_phy(i915, dig_port->base.port);
430
431 if (intel_phy_is_combo(i915, phy) && is_low_voltage_sku(i915, phy))
406 return 540000;432 return 540000;
407 433
408 return 810000;434 return 810000;
@@ -445,7 +471,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) · 36 unmodified lines
445 max_rate = dg2_max_source_rate(intel_dp);471 max_rate = dg2_max_source_rate(intel_dp);
446 else if (IS_ALDERLAKE_P(dev_priv) || IS_ALDERLAKE_S(dev_priv) ||472 else if (IS_ALDERLAKE_P(dev_priv) || IS_ALDERLAKE_S(dev_priv) ||
447 IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv))473 IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv))
448 max_rate = 810000;474 max_rate = dg1_max_source_rate(intel_dp);
449 else if (IS_JSL_EHL(dev_priv))475 else if (IS_JSL_EHL(dev_priv))
450 max_rate = ehl_max_source_rate(intel_dp);476 max_rate = ehl_max_source_rate(intel_dp);
451 else477 else
drivers/gpu/drm/i915/display/intel_dpll_mgr.c+2−2
@@ -2396,7 +2396,7 @@ static void icl_wrpll_params_populate(struct skl_wrpll_params *params, · 2395 unmodified lines
2396}2396}
2397 2397
2398/*2398/*
2399 * Display WA #22010492432: ehl, tgl, adl-p2399 * Display WA #22010492432: ehl, tgl, adl-s, adl-p
2400 * Program half of the nominal DCO divider fraction value.2400 * Program half of the nominal DCO divider fraction value.
2401 */2401 */
2402static bool2402static bool
@@ -2404,7 +2404,7 @@ ehl_combo_pll_div_frac_wa_needed(struct drm_i915_private *i915) · 1 unmodified line
2404{2404{
2405 return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&2405 return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&
2406 IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) ||2406 IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) ||
2407 IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) &&2407 IS_TIGERLAKE(i915) || IS_ALDERLAKE_S(i915) || IS_ALDERLAKE_P(i915)) &&
2408 i915->dpll.ref_clks.nssc == 38400;2408 i915->dpll.ref_clks.nssc == 38400;
2409}2409}
2410 2410
drivers/gpu/drm/i915/i915_drm_client.c+3−2
@@ -116,8 +116,9 @@ show_client_class(struct seq_file *m, · 115 unmodified lines
116 total += busy_add(ctx, class);116 total += busy_add(ctx, class);
117 rcu_read_unlock();117 rcu_read_unlock();
118 118
119 seq_printf(m, "drm-engine-%s:\t%llu ns\n",119 if (capacity)
120 uabi_class_names[class], total);120 seq_printf(m, "drm-engine-%s:\t%llu ns\n",
121 uabi_class_names[class], total);
121 122
122 if (capacity > 1)123 if (capacity > 1)
123 seq_printf(m, "drm-engine-capacity-%s:\t%u\n",124 seq_printf(m, "drm-engine-capacity-%s:\t%u\n",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t