forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/tegra: Move drm_dp_link helpers to Tegra DRM
During the discussion of patches that enhance the drm_dp_link helpers it was concluded that these helpers aren't very useful to begin with. After all other drivers have been converted not to use these helpers anymore, move these helpers into the last remaining user: Tegra DRM. If at some point these helpers are deemed more widely useful, they can be moved out into the DRM DP helpers again. Signed-off-by: Thierry Reding <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
- Loading branch information
1 parent
2589c40
commit 9a42c7c
Showing
7 changed files
with
162 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ tegra-drm-y := \ | |
| drm.o \ | ||
| gem.o \ | ||
| fb.o \ | ||
| dp.o \ | ||
| hub.o \ | ||
| plane.o \ | ||
| dc.o \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| /* | ||
| * Copyright (C) 2013-2019 NVIDIA Corporation | ||
| * Copyright (C) 2015 Rob Clark | ||
| */ | ||
|
|
||
| #include <drm/drm_dp_helper.h> | ||
|
|
||
| #include "dp.h" | ||
|
|
||
| /** | ||
| * drm_dp_link_probe() - probe a DisplayPort link for capabilities | ||
| * @aux: DisplayPort AUX channel | ||
| * @link: pointer to structure in which to return link capabilities | ||
| * | ||
| * The structure filled in by this function can usually be passed directly | ||
| * into drm_dp_link_power_up() and drm_dp_link_configure() to power up and | ||
| * configure the link based on the link's capabilities. | ||
| * | ||
| * Returns 0 on success or a negative error code on failure. | ||
| */ | ||
| int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) | ||
| { | ||
| u8 values[3]; | ||
| int err; | ||
|
|
||
| memset(link, 0, sizeof(*link)); | ||
|
|
||
| err = drm_dp_dpcd_read(aux, DP_DPCD_REV, values, sizeof(values)); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| link->revision = values[0]; | ||
| link->rate = drm_dp_bw_code_to_link_rate(values[1]); | ||
| link->num_lanes = values[2] & DP_MAX_LANE_COUNT_MASK; | ||
|
|
||
| if (values[2] & DP_ENHANCED_FRAME_CAP) | ||
| link->capabilities |= DP_LINK_CAP_ENHANCED_FRAMING; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /** | ||
| * drm_dp_link_power_up() - power up a DisplayPort link | ||
| * @aux: DisplayPort AUX channel | ||
| * @link: pointer to a structure containing the link configuration | ||
| * | ||
| * Returns 0 on success or a negative error code on failure. | ||
| */ | ||
| int drm_dp_link_power_up(struct drm_dp_aux *aux, struct drm_dp_link *link) | ||
| { | ||
| u8 value; | ||
| int err; | ||
|
|
||
| /* DP_SET_POWER register is only available on DPCD v1.1 and later */ | ||
| if (link->revision < 0x11) | ||
| return 0; | ||
|
|
||
| err = drm_dp_dpcd_readb(aux, DP_SET_POWER, &value); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| value &= ~DP_SET_POWER_MASK; | ||
| value |= DP_SET_POWER_D0; | ||
|
|
||
| err = drm_dp_dpcd_writeb(aux, DP_SET_POWER, value); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| /* | ||
| * According to the DP 1.1 specification, a "Sink Device must exit the | ||
| * power saving state within 1 ms" (Section 2.5.3.1, Table 5-52, "Sink | ||
| * Control Field" (register 0x600). | ||
| */ | ||
| usleep_range(1000, 2000); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /** | ||
| * drm_dp_link_power_down() - power down a DisplayPort link | ||
| * @aux: DisplayPort AUX channel | ||
| * @link: pointer to a structure containing the link configuration | ||
| * | ||
| * Returns 0 on success or a negative error code on failure. | ||
| */ | ||
| int drm_dp_link_power_down(struct drm_dp_aux *aux, struct drm_dp_link *link) | ||
| { | ||
| u8 value; | ||
| int err; | ||
|
|
||
| /* DP_SET_POWER register is only available on DPCD v1.1 and later */ | ||
| if (link->revision < 0x11) | ||
| return 0; | ||
|
|
||
| err = drm_dp_dpcd_readb(aux, DP_SET_POWER, &value); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| value &= ~DP_SET_POWER_MASK; | ||
| value |= DP_SET_POWER_D3; | ||
|
|
||
| err = drm_dp_dpcd_writeb(aux, DP_SET_POWER, value); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /** | ||
| * drm_dp_link_configure() - configure a DisplayPort link | ||
| * @aux: DisplayPort AUX channel | ||
| * @link: pointer to a structure containing the link configuration | ||
| * | ||
| * Returns 0 on success or a negative error code on failure. | ||
| */ | ||
| int drm_dp_link_configure(struct drm_dp_aux *aux, struct drm_dp_link *link) | ||
| { | ||
| u8 values[2]; | ||
| int err; | ||
|
|
||
| values[0] = drm_dp_link_rate_to_bw_code(link->rate); | ||
| values[1] = link->num_lanes; | ||
|
|
||
| if (link->capabilities & DP_LINK_CAP_ENHANCED_FRAMING) | ||
| values[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN; | ||
|
|
||
| err = drm_dp_dpcd_write(aux, DP_LINK_BW_SET, values, sizeof(values)); | ||
| if (err < 0) | ||
| return err; | ||
|
|
||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* SPDX-License-Identifier: MIT */ | ||
| /* | ||
| * Copyright (C) 2013-2019 NVIDIA Corporation. | ||
| * Copyright (C) 2015 Rob Clark | ||
| */ | ||
|
|
||
| #ifndef DRM_TEGRA_DP_H | ||
| #define DRM_TEGRA_DP_H 1 | ||
|
|
||
| struct drm_dp_aux; | ||
|
|
||
| #define DP_LINK_CAP_ENHANCED_FRAMING (1 << 0) | ||
|
|
||
| struct drm_dp_link { | ||
| unsigned char revision; | ||
| unsigned int rate; | ||
| unsigned int num_lanes; | ||
| unsigned long capabilities; | ||
| }; | ||
|
|
||
| int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link); | ||
| int drm_dp_link_power_up(struct drm_dp_aux *aux, struct drm_dp_link *link); | ||
| int drm_dp_link_power_down(struct drm_dp_aux *aux, struct drm_dp_link *link); | ||
| int drm_dp_link_configure(struct drm_dp_aux *aux, struct drm_dp_link *link); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters