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 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

camera: Use conftest to find if media_entity_remote_pad() present

Browse Source 
Use conftest to determine if media_entity_remote_pad()
function is present or not

This function is removed by commit b2e44430b634 ("media:
mc-entity: Rename media_entity_remote_pad to media_pad_remote_pad_first")
in Linux 6.0

Bug 4387902

Change-Id: I816016731ac44a3c093438310f8e60bd166f2fd7
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3037917
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-12-19 09:26:44 +00:00
committed by mobile promotions
parent 90e2ac6ac7
commit b40e45535e
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/tegra/camera/vi/channel.c
View File

@@ -5,6 +5,8 @@
* Copyright (c) 2015-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * Copyright (c) 2015-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/ */
#include <nvidia/conftest.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/clk.h> #include <linux/clk.h>
@@ -1886,7 +1888,7 @@ int tegra_channel_init_subdevices(struct tegra_channel *chan)
int len = 0; int len = 0;
/* set_stream of CSI */ /* set_stream of CSI */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) #if defined(NV_MEDIA_ENTITY_REMOTE_PAD_PRESENT) /* Linux 6.0 */
pad = media_entity_remote_pad(&chan->pad); pad = media_entity_remote_pad(&chan->pad);
#else #else
pad = media_pad_remote_pad_first(&chan->pad); pad = media_pad_remote_pad_first(&chan->pad);
@@ -1916,7 +1918,7 @@ int tegra_channel_init_subdevices(struct tegra_channel *chan)
if (!(pad->flags & MEDIA_PAD_FL_SINK)) if (!(pad->flags & MEDIA_PAD_FL_SINK))
break; break;
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) #if defined(NV_MEDIA_ENTITY_REMOTE_PAD_PRESENT) /* Linux 6.0 */
pad = media_entity_remote_pad(pad); pad = media_entity_remote_pad(pad);
#else #else
pad = media_pad_remote_pad_first(pad); pad = media_pad_remote_pad_first(pad);

1
scripts/conftest/Makefile
View File

@@ -128,6 +128,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += iommu_map_has_gfp_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += kthread_complete_and_exit NV_CONFTEST_FUNCTION_COMPILE_TESTS += kthread_complete_and_exit
NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_read_c45 NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_read_c45
NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_write_c45 NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_write_c45
NV_CONFTEST_FUNCTION_COMPILE_TESTS += media_entity_remote_pad
NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_set_tso_max_size NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_set_tso_max_size
NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight
NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_get_named_gpio_flags NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_get_named_gpio_flags

16
scripts/conftest/conftest.sh
View File

@@ -945,6 +945,22 @@ compile_test() {
compile_check_conftest "$CODE" "NV_MDEV_GET_TYPE_GROUP_ID_PRESENT" "" "functions" compile_check_conftest "$CODE" "NV_MDEV_GET_TYPE_GROUP_ID_PRESENT" "" "functions"
;; ;;
media_entity_remote_pad)
#
# Determine if media_entity_remote_pad() function is present or not
#
# Removed by commit b2e44430b634 ("media: mc-entity: Rename
# media_entity_remote_pad() to media_pad_remote_pad_first()") in Linux 6.0
#
CODE="
#include <media/media-entity.h>
void conftest_media_entity_remote_pad(void) {
media_entity_remote_pad();
}"
compile_check_conftest "$CODE" "NV_MEDIA_ENTITY_REMOTE_PAD_PRESENT" "" "functions"
;;
vfio_device_mig_state) vfio_device_mig_state)
# #
# Determine if vfio_device_mig_state enum is present or not # Determine if vfio_device_mig_state enum is present or not