Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/dp: finish link training conversion to struct intel_display
Convert the final stragglers to struct intel_display now that we have
platform identification via it too.
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/14a214fc358eafba8d57c25e0d26c8c35856dc89.1734083244.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+3
-6
+3
-6
drivers/gpu/drm/i915/display/intel_dp_link_training.c
+3
-6
drivers/gpu/drm/i915/display/intel_dp_link_training.c
···
221
221
int intel_dp_read_dprx_caps(struct intel_dp *intel_dp, u8 dpcd[DP_RECEIVER_CAP_SIZE])
222
222
{
223
223
struct intel_display *display = to_intel_display(intel_dp);
224
-
struct drm_i915_private *i915 = to_i915(display->drm);
225
224
226
225
if (intel_dp_is_edp(intel_dp))
227
226
return 0;
···
229
230
* Detecting LTTPRs must be avoided on platforms with an AUX timeout
230
231
* period < 3.2ms. (see DP Standard v2.0, 2.11.2, 3.6.6.1).
231
232
*/
232
-
if (DISPLAY_VER(display) >= 10 && !IS_GEMINILAKE(i915))
233
+
if (DISPLAY_VER(display) >= 10 && !display->platform.geminilake)
233
234
if (drm_dp_dpcd_probe(&intel_dp->aux,
234
235
DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV))
235
236
return -EIO;
···
261
262
int intel_dp_init_lttpr_and_dprx_caps(struct intel_dp *intel_dp)
262
263
{
263
264
struct intel_display *display = to_intel_display(intel_dp);
264
-
struct drm_i915_private *i915 = to_i915(display->drm);
265
265
int lttpr_count = 0;
266
266
267
267
/*
···
268
270
* period < 3.2ms. (see DP Standard v2.0, 2.11.2, 3.6.6.1).
269
271
*/
270
272
if (!intel_dp_is_edp(intel_dp) &&
271
-
(DISPLAY_VER(display) >= 10 && !IS_GEMINILAKE(i915))) {
273
+
(DISPLAY_VER(display) >= 10 && !display->platform.geminilake)) {
272
274
u8 dpcd[DP_RECEIVER_CAP_SIZE];
273
275
int err = intel_dp_read_dprx_caps(intel_dp, dpcd);
274
276
···
389
391
enum drm_dp_phy dp_phy)
390
392
{
391
393
struct intel_display *display = to_intel_display(intel_dp);
392
-
struct drm_i915_private *i915 = to_i915(display->drm);
393
394
394
395
return !intel_dp_phy_is_downstream_of_source(intel_dp, dp_phy) ||
395
-
DISPLAY_VER(display) >= 10 || IS_BROXTON(i915);
396
+
DISPLAY_VER(display) >= 10 || display->platform.broxton;
396
397
}
397
398
398
399
/* 128b/132b */