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.12

Browse Source 
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:
Jon Hunter
2025-04-02 16:18:31 +01:00
parent c9f69ea5d8
commit 6be033ba85
12 changed files with 189 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/conftest/Makefile
View File

@@ -123,8 +123,10 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += disk_check_media_change
NV_CONFTEST_FUNCTION_COMPILE_TESTS += dma_slave_config_struct_has_slave_id
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_framebuffers
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_debugfs_remove_files_has_root_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_display_info_struct_has_source_physical_address
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_driver_struct_has_date
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_driver_struct_has_irq_enabled_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_edid_connector_add_modes
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fb_helper_alloc_info
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fb_helper_prepare_has_preferred_bpp_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fb_helper_unregister_info

35
scripts/conftest/conftest.sh
View File

@@ -7146,6 +7146,22 @@ compile_test() {
compile_check_conftest "$CODE" "NV_DRM_DEBUGFS_REMOVE_FILES_HAS_ROOT_ARG" "" "types"
;;
drm_display_info_struct_has_source_physical_address)
#
# Determine if the 'drm_display_info' structure has a 'source_physical_address' field.
#
# This change was made by commit 82b599ece3b8 ("drm/edid: parse source physical
# address") in Linux v6.7.
#
CODE="
#include <drm/drm_connector.h>
int conftest_drm_display_info_struct_has_source_physical_address(void) {
return offsetof(struct drm_display_info, source_physical_address);
}"
compile_check_conftest "$CODE" "NV_DRM_DISPLAY_INFO_STRUCT_HAS_SOURCE_PHYSICAL_ADDRESS" "" "types"
;;
drm_driver_struct_has_date)
#
# Determine if the 'drm_driver' structure has a 'date' field.
@@ -7181,6 +7197,25 @@ compile_test() {
compile_check_conftest "$CODE" "NV_DRM_DRIVER_STRUCT_HAS_IRQ_ENABLED_ARG" "" "types"
;;
drm_edid_connector_add_modes)
#
# Determine if the function 'drm_edid_connector_add_modes' is present.
#
# In Linux v6.3, commit c533b5167c7e ("drm/edid: add separate
# drm_edid_connector_add_modes()") added the function
# drm_edid_connector_add_modes().
#
CODE="
#undef CONFIG_ACPI
#include <drm/drm_edid.h>
void conftest_drm_edid_connector_add_modes(void)
{
drm_edid_connector_add_modes();
}"
compile_check_conftest "$CODE" "NV_DRM_EDID_CONNECTOR_ADD_MODES_PRESENT" "" "functions"
;;
drm_fb_helper_alloc_info)
#
# Determine if the function 'drm_fb_helper_alloc_info' is present.