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

Browse Source 
Update Tegra DRM to align with Linux v6.14. The 'drm_client_setup.h' was
moved from the directory 'include/drm/' to 'include/drm/clients' and use
conftest to detect where it is located.

JIRA LINQPJ14-47

Change-Id: I1f1df6da4400e74d2f97926710ac0ddd5e6413e6
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3333837
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2025-04-03 15:33:06 +01:00
parent 540737a228
commit 3ad90175d1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,11 +21,13 @@
#else #else
#include <drm/drm_aperture.h> #include <drm/drm_aperture.h>
#endif #endif
#include <drm/drm_atomic.h> #if defined(NV_DRM_CLIENTS_DRM_CLIENT_SETUP_H_PRESENT) /* Linux v6.14 */
#include <drm/drm_atomic_helper.h> #include <drm/clients/drm_client_setup.h>
#if defined(NV_DRM_DRM_CLIENT_SETUP_H_PRESENT) /* Linux v6.13 */ #elif defined(NV_DRM_DRM_CLIENT_SETUP_H_PRESENT) /* Linux v6.13 */
#include <drm/drm_client_setup.h> #include <drm/drm_client_setup.h>
#endif #endif
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h> #include <drm/drm_debugfs.h>
#include <drm/drm_drv.h> #include <drm/drm_drv.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>

1
scripts/conftest/Makefile
View File

@@ -262,6 +262,7 @@ $(obj)/conftest/patches.h: $(NV_CONFTEST_SCRIPT)
# Each of these headers is checked for presence with a test #include; a # Each of these headers is checked for presence with a test #include; a
# corresponding #define will be generated in conftest/headers.h. # corresponding #define will be generated in conftest/headers.h.
NV_HEADER_PRESENCE_TESTS = \ NV_HEADER_PRESENCE_TESTS = \
drm/clients/drm_client_setup.h \
drm/display/drm_dp_aux_bus.h \ drm/display/drm_dp_aux_bus.h \
drm/display/drm_dp_helper.h \ drm/display/drm_dp_helper.h \
drm/display/drm_scdc_helper.h \ drm/display/drm_scdc_helper.h \