diff options
| author | Dave Airlie <[email protected]> | 2020-09-09 12:27:12 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-09-09 12:27:13 +1000 |
| commit | 877d8c074302c20ac0759d1a4f689c14aada420d (patch) | |
| tree | c4ac9ed42b665fc88dcc73c957cab62496037ac8 /drivers/gpu/drm/i915/display/intel_lspcon.c | |
| parent | 1f4b2aca794f7aeb918ed5f0d7221d68a81d6b43 (diff) | |
| parent | 79416e97dda0118b137302575a70a14259a27d7d (diff) | |
Merge tag 'topic/nouveau-i915-dp-helpers-and-cleanup-2020-08-31-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
UAPI Changes:
None
Cross-subsystem Changes:
* Moves a bunch of miscellaneous DP code from the i915 driver into a set
of shared DRM DP helpers
Core Changes:
* New DRM DP helpers (see above)
Driver Changes:
* Implements usage of the aforementioned DP helpers in the nouveau
driver, along with some other various HPD related cleanup for nouveau
Signed-off-by: Dave Airlie <[email protected]>
From: Lyude Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_lspcon.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lspcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c index b781bf469644..dc1b35559afd 100644 --- a/drivers/gpu/drm/i915/display/intel_lspcon.c +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c @@ -571,7 +571,7 @@ bool lspcon_init(struct intel_digital_port *dig_port) return false; } - if (!intel_dp_read_dpcd(dp)) { + if (drm_dp_read_dpcd_caps(&dp->aux, dp->dpcd) != 0) { DRM_ERROR("LSPCON DPCD read failed\n"); return false; } |