From 4319fa9335f2f3d7bb9279aa17b49a598d559f52 Mon Sep 17 00:00:00 2001 From: Jeevan Shriram Date: Mon, 18 Apr 2022 11:36:21 -0700 Subject: [PATCH 1/3] include: linux: Update usecase id for LLCC_VIDVSP Update Usecase id for LLCC_VIDVSP as per hardware settings. Change-Id: I92493bf7cfb8625748b22b111995cabc71feb1a1 Signed-off-by: Jeevan Shriram --- include/linux/soc/qcom/llcc-qcom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/soc/qcom/llcc-qcom.h b/include/linux/soc/qcom/llcc-qcom.h index 0a0ce7ab5abd..8eab6006c3bc 100644 --- a/include/linux/soc/qcom/llcc-qcom.h +++ b/include/linux/soc/qcom/llcc-qcom.h @@ -54,7 +54,7 @@ #define LLCC_CAMEXP4 52 #define LLCC_DISP_WB 53 #define LLCC_DISP_1 54 -#define LLCC_VIDVSP 55 +#define LLCC_VIDVSP 64 /** * llcc_slice_desc - Cache slice descriptor From 33e230f2ab733e84c97ad8b1a9211658cebb05e9 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Fri, 2 Sep 2022 17:02:30 -0700 Subject: [PATCH 2/3] include: gh_mem_notifier: Add __maybe_unused attribute Some external drivers use gh_mem_notifier_register() but not gh_mem_notifier_unregister(). This leads to an unused function warning during compilation, which then manifests as an error when -Werror is enabled. Add compiler attribute __maybe_unused to both functions to fix the above error. Change-Id: I42585f89c6aa4148ef1d1f72d3a8581e23e08110 Signed-off-by: Guru Das Srinagesh --- include/linux/gunyah/gh_mem_notifier.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/gunyah/gh_mem_notifier.h b/include/linux/gunyah/gh_mem_notifier.h index 92973e8d335e..dd483d21fa33 100644 --- a/include/linux/gunyah/gh_mem_notifier.h +++ b/include/linux/gunyah/gh_mem_notifier.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __GH_MEM_NOTIFIER_H @@ -33,14 +33,14 @@ void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag, void *data); void gh_mem_notifier_unregister(void *cookie); #else -static void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag, +static void __maybe_unused *gh_mem_notifier_register(enum gh_mem_notifier_tag tag, gh_mem_notifier_handler notif_handler, void *data) { return ERR_PTR(-EOPNOTSUPP); } -static void gh_mem_notifier_unregister(void *cookie) +static void __maybe_unused gh_mem_notifier_unregister(void *cookie) { } #endif From 899a47374048398d6008a98023188b4ca9f7fcb1 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Fri, 9 Sep 2022 15:41:24 -0700 Subject: [PATCH 3/3] android: abi_gki_aarch64_qcom: Add device_match_of_node Add device_match_of_node and also make sure that the list is alphabetically sorted. Change-Id: I23209f86e191d14d7c48cea7d57349b3d441727c Signed-off-by: Guru Das Srinagesh --- android/abi_gki_aarch64_qcom | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 1191477d7856..78fd56f7570b 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -160,8 +160,8 @@ cond_synchronize_rcu_expedited config_ep_by_speed configfs_register_group - configfs_unregister_group configfs_register_subsystem + configfs_unregister_group configfs_unregister_subsystem config_group_init config_group_init_type_name @@ -290,6 +290,7 @@ device_link_add device_match_fwnode device_match_name + device_match_of_node device_property_present device_property_read_string device_property_read_u16_array @@ -1380,8 +1381,8 @@ __rcu_read_unlock rcu_read_unlock_trace_special rcu_tasks_trace_qs_blkd - rcu_trc_cmpxchg_need_qs rcutorture_get_gp_data + rcu_trc_cmpxchg_need_qs rcu_unexpedite_gp rcuwait_wake_up rdev_get_drvdata