Merge "video: driver: Move adjust/set control_ext API's to common/platform_ext.h/.c"

driver/vidc/inc/msm_vidc_control_ext.h → driver/platform/common/inc/msm_vidc_platform_ext.h

@@ -3,8 +3,8 @@
  * Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
-#ifndef _MSM_VIDC_CONTROL_EXT_H_
-#define _MSM_VIDC_CONTROL_EXT_H_
+#ifndef _MSM_VIDC_PLATFORM_EXT_H_
+#define _MSM_VIDC_PLATFORM_EXT_H_
 
 #include "msm_vidc_control.h"
 

driver/vidc/src/msm_vidc_control_ext.c → driver/platform/common/src/msm_vidc_platform_ext.c

@@ -4,7 +4,7 @@
  */
 
 #include <media/v4l2_vidc_extensions.h>
-#include "msm_vidc_control_ext.h"
+#include "msm_vidc_platform_ext.h"
 #include "hfi_packet.h"
 #include "hfi_property.h"
 #include "venus_hfi.h"

driver/platform/kalama/src/msm_vidc_kalama.c

@@ -15,7 +15,7 @@
 #include "msm_vidc_platform.h"
 #include "msm_vidc_debug.h"
 #include "msm_vidc_internal.h"
-#include "msm_vidc_control_ext.h"
+#include "msm_vidc_platform_ext.h"
 #include "msm_vidc_memory_ext.h"
 #include "resources_ext.h"
 #include "msm_vidc_iris3.h"

driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -15,7 +15,7 @@
 #include "msm_vidc_platform.h"
 #include "msm_vidc_debug.h"
 #include "msm_vidc_internal.h"
-#include "msm_vidc_control_ext.h"
+#include "msm_vidc_platform_ext.h"
 #include "msm_vidc_memory_ext.h"
 #include "resources_ext.h"
 #include "msm_vidc_iris33.h"

msm_video/Kbuild

@@ -49,6 +49,7 @@ msm_video-objs += $(VIDEO_DRIVER_REL_PATH)/platform/kalama/src/msm_vidc_kalama.o
                   $(VIDEO_DRIVER_REL_PATH)/variant/iris3/src/msm_vidc_iris3.o
 endif
 msm_video-objs += $(VIDEO_DRIVER_REL_PATH)/platform/common/src/msm_vidc_platform.o \
+                  $(VIDEO_DRIVER_REL_PATH)/platform/common/src/msm_vidc_platform_ext.o \
                   $(VIDEO_DRIVER_REL_PATH)/variant/common/src/msm_vidc_variant.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_v4l2.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_vb2.o \
@@ -58,7 +59,6 @@ msm_video-objs += $(VIDEO_DRIVER_REL_PATH)/platform/common/src/msm_vidc_platform
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_driver.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_state.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_control.o \
-                  $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_control_ext.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_buffer.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_power.o \
                   $(VIDEO_DRIVER_REL_PATH)/vidc/src/msm_vidc_probe.o \