aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/qcom/venus/hfi_helper.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h
index 17fcaf96f111..8d998e6e79c8 100644
--- a/drivers/media/platform/qcom/venus/hfi_helper.h
+++ b/drivers/media/platform/qcom/venus/hfi_helper.h
@@ -1077,13 +1077,15 @@ struct hfi_buffer_display_hold_count_actual {
u32 hold_count;
};
-/* HFI 4XX reorder the fields, use these macros */
+/* HFI 4XX/6XX reorder the fields, use these macros */
+#define HFI_BUFREQ_REORDER(ver) \
+ ((ver) == HFI_VERSION_4XX || (ver) == HFI_VERSION_6XX)
#define HFI_BUFREQ_HOLD_COUNT(bufreq, ver) \
- ((ver) == HFI_VERSION_4XX ? 0 : (bufreq)->hold_count)
+ (HFI_BUFREQ_REORDER(ver) ? 0 : (bufreq)->hold_count)
#define HFI_BUFREQ_COUNT_MIN(bufreq, ver) \
- ((ver) == HFI_VERSION_4XX ? (bufreq)->hold_count : (bufreq)->count_min)
+ (HFI_BUFREQ_REORDER(ver) ? (bufreq)->hold_count : (bufreq)->count_min)
#define HFI_BUFREQ_COUNT_MIN_HOST(bufreq, ver) \
- ((ver) == HFI_VERSION_4XX ? (bufreq)->count_min : 0)
+ (HFI_BUFREQ_REORDER(ver) ? (bufreq)->count_min : 0)
struct hfi_buffer_requirements {
u32 type;