mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-24 10:11:26 +03:00
drm/tegra: Update to Linux v6.12
Update Tegra DRM to align with Linux v6.12. The output.c driver was updated to use the 'drm_edid_connector_add_modes()' function that was first added in Linux v6.3. Use conftest to detect the presence of the drm_edid_connector_add_modes() function and make the necessary changes to the driver. JIRA LINQPJ14-47 Change-Id: I0ff45ef0ada2f2c2353c1ba579c06ae06122727c Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3333835 Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
@@ -537,7 +537,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
|
||||
if (err < 0) {
|
||||
dev_err(dpaux->dev, "failed to request IRQ#%u: %d\n",
|
||||
dpaux->irq, err);
|
||||
return err;
|
||||
goto err_pm_disable;
|
||||
}
|
||||
|
||||
disable_irq(dpaux->irq);
|
||||
@@ -557,7 +557,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
|
||||
*/
|
||||
err = tegra_dpaux_pad_config(dpaux, DPAUX_PADCTL_FUNC_I2C);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto err_pm_disable;
|
||||
|
||||
#ifdef CONFIG_GENERIC_PINCONF
|
||||
dpaux->desc.name = dev_name(&pdev->dev);
|
||||
@@ -570,7 +570,8 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
|
||||
dpaux->pinctrl = devm_pinctrl_register(&pdev->dev, &dpaux->desc, dpaux);
|
||||
if (IS_ERR(dpaux->pinctrl)) {
|
||||
dev_err(&pdev->dev, "failed to register pincontrol\n");
|
||||
return PTR_ERR(dpaux->pinctrl);
|
||||
err = PTR_ERR(dpaux->pinctrl);
|
||||
goto err_pm_disable;
|
||||
}
|
||||
#endif
|
||||
/* enable and clear all interrupts */
|
||||
@@ -586,10 +587,15 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
|
||||
err = devm_of_dp_aux_populate_ep_devices(&dpaux->aux);
|
||||
if (err < 0) {
|
||||
dev_err(dpaux->dev, "failed to populate AUX bus: %d\n", err);
|
||||
return err;
|
||||
goto err_pm_disable;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_pm_disable:
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int tegra_dpaux_remove(struct platform_device *pdev)
|
||||
|
||||
Reference in New Issue
Block a user