nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

drm/tegra: Update to Linux v6.16-rc1

Browse Source 
Update the Tegra DRM driver to Linux v6.16-rc1. In Linux v6.16-rc1, the
drm_dp_link_power_up/down functions were moved from the Tegra DRM driver
into the main DRM code. Conftest is used to detect this change and the
appropriate updates are made to the Tegra DRM driver.

JIRA LINQPJ14-60

Change-Id: Id5449b22e8eda5ee70eb6aed09ce627e63e7722e
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3375214
(cherry picked from commit f8adc0c950eb4905d397b6e1d8e524b856945f0e)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3461883
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2025-06-11 09:44:44 +01:00
committed by mobile promotions
parent da9c8f46c4
commit e004561637
14 changed files with 83 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/tegra/sor.c
View File

@@ -2712,7 +2712,11 @@ static void tegra_sor_dp_disable(struct drm_encoder *encoder)
* the AUX transactions would just be timing out.
*/
if (output->connector.status != connector_status_disconnected) {
#if defined(NV_DRM_DP_LINK_POWER_UP_PRESENT) /* Linux v6.16 */
err = drm_dp_link_power_down(sor->aux, sor->link.revision);
#else
err = drm_dp_link_power_down(sor->aux, &sor->link);
#endif
if (err < 0)
dev_err(sor->dev, "failed to power down link: %d\n",
err);
@@ -2928,7 +2932,11 @@ static void tegra_sor_dp_enable(struct drm_encoder *encoder)
else
dev_dbg(sor->dev, "link training succeeded\n");
#if defined(NV_DRM_DP_LINK_POWER_UP_PRESENT) /* Linux v6.16 */
err = drm_dp_link_power_up(sor->aux, sor->link.revision);
#else
err = drm_dp_link_power_up(sor->aux, &sor->link);
#endif
if (err < 0)
dev_err(sor->dev, "failed to power up DP link: %d\n", err);