video-driver: enable ddk compilation and additional changes on Bazel.
msm_video and video modules compile using ddk. Change-Id: I5ddba19f973a13807a80c8d619bcc83b09307787
This commit is contained in:
@@ -35,6 +35,7 @@ LOCAL_MODULE_KBUILD_NAME := msm_video/msm_video.ko
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_DEBUG_ENABLE := true
|
||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||
ENABLE_DDK_BUILD := false
|
||||
|
||||
LOCAL_REQUIRED_MODULES := mmrm-module-symvers
|
||||
LOCAL_REQUIRED_MODULES += hw-fence-module-symvers
|
||||
|
@@ -10,7 +10,7 @@ ddk_headers(
|
||||
hdrs = glob([
|
||||
"include/uapi/vidc/media/*.h",
|
||||
]),
|
||||
includes = ["include/uapi/vidc/media"]
|
||||
includes = ["include/uapi/vidc"]
|
||||
)
|
||||
|
||||
ddk_headers(
|
||||
|
@@ -13,6 +13,7 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/iommu.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/stringify.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0))
|
||||
#include <linux/dma-iommu.h>
|
||||
#endif
|
||||
@@ -29,14 +30,13 @@
|
||||
#include "msm_vidc_core.h"
|
||||
#include "msm_vidc_memory.h"
|
||||
#include "venus_hfi.h"
|
||||
#include "video_generated_h"
|
||||
|
||||
#define BASE_DEVICE_NUMBER 32
|
||||
|
||||
struct msm_vidc_core *g_core;
|
||||
|
||||
const char video_banner[] = "Video-Banner: (" VIDEO_COMPILE_BY "@"
|
||||
VIDEO_COMPILE_HOST ") (" VIDEO_COMPILE_TIME ")";
|
||||
const char video_banner[] = "Video-Banner: (" __stringify(VIDEO_COMPILE_BY) "@"
|
||||
__stringify(VIDEO_COMPILE_HOST) ") (" __stringify(VIDEO_COMPILE_TIME) ")";
|
||||
|
||||
static inline bool is_video_device(struct device *dev)
|
||||
{
|
||||
|
@@ -6,11 +6,10 @@ def define_pineapple():
|
||||
target = "pineapple",
|
||||
registry = video_driver_modules,
|
||||
modules = [
|
||||
"msm_video"
|
||||
# "video"
|
||||
"msm_video",
|
||||
"video",
|
||||
],
|
||||
config_options = [
|
||||
"CONFIG_MSM_VIDC_IRIS33",
|
||||
"CONFIG_MSM_VIDC_PINEAPPLE",
|
||||
],
|
||||
)
|
@@ -98,6 +98,5 @@ def define_target_variant_modules(target, variant, registry, modules, config_opt
|
||||
)
|
||||
|
||||
def define_consolidate_gki_modules(target, registry, modules, config_options = []):
|
||||
# print(modules)
|
||||
define_target_variant_modules(target, "consolidate", registry, modules, config_options)
|
||||
define_target_variant_modules(target, "gki", registry, modules, config_options)
|
@@ -5,7 +5,7 @@ module_entry = video_driver_modules.register
|
||||
|
||||
module_entry(
|
||||
name = "msm_video",
|
||||
srcs = [ # vidc common files
|
||||
srcs = [
|
||||
"driver/vidc/src/msm_vidc_v4l2.c",
|
||||
"driver/vidc/src/msm_vidc_vb2.c",
|
||||
"driver/vidc/src/msm_vidc.c",
|
||||
@@ -30,23 +30,29 @@ module_entry(
|
||||
"driver/vidc/src/hfi_packet.c",
|
||||
"driver/vidc/src/venus_hfi_response.c",
|
||||
"driver/platform/common/src/msm_vidc_platform.c",
|
||||
"driver/platform/common/src/msm_vidc_platform_ext.c",
|
||||
"driver/variant/common/src/msm_vidc_variant.c",
|
||||
"driver/vidc/src/msm_vidc_synx.c",
|
||||
],
|
||||
config_srcs = {
|
||||
"CONFIG_MSM_VIDC_IRIS33" : [
|
||||
"CONFIG_MSM_VIDC_PINEAPPLE" : [
|
||||
"driver/variant/iris33/src/msm_vidc_buffer_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_bus_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_clock_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_power_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_iris33.c",
|
||||
],
|
||||
"CONFIG_MSM_VIDC_PINEAPPLE" : [
|
||||
"driver/platform/pineapple/src/msm_vidc_pineapple.c",
|
||||
],
|
||||
}
|
||||
},
|
||||
deps = [
|
||||
"//techpack/mm-drivers:hw_fence_headers",
|
||||
"//techpack/synx-kernel:synx_headers",
|
||||
],
|
||||
)
|
||||
|
||||
module_entry(
|
||||
name = "video",
|
||||
srcs = [ # vidc common files
|
||||
srcs = [
|
||||
"driver/vidc/src/msm_vidc_v4l2.c",
|
||||
"driver/vidc/src/msm_vidc_vb2.c",
|
||||
"driver/vidc/src/msm_vidc.c",
|
||||
@@ -71,15 +77,13 @@ module_entry(
|
||||
"driver/variant/common/src/msm_vidc_variant.c",
|
||||
],
|
||||
config_srcs = {
|
||||
"CONFIG_MSM_VIDC_IRIS33" : [
|
||||
"driver/variant/iris33/src/msm_vidc_buffer_iris33.c",
|
||||
"driver/variant/iris3/src/msm_vidc_power_iris3.o",
|
||||
"driver/variant/iris3/src/msm_vidc_bus_iris3.o",
|
||||
"driver/variant/iris3/src/msm_vidc_clock_iris3.o",
|
||||
"driver/variant/iris3/src/msm_vidc_iris3.o"
|
||||
],
|
||||
"CONFIG_MSM_VIDC_PINEAPPLE" : [
|
||||
"driver/platform/pineapple/src/msm_vidc_pineapple.c",
|
||||
"driver/platform/pineapple/src/pineapple.c",
|
||||
"driver/variant/iris33/src/msm_vidc_buffer_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_power_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_bus_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_clock_iris33.c",
|
||||
"driver/variant/iris33/src/msm_vidc_iris33.c",
|
||||
],
|
||||
}
|
||||
)
|
Reference in New Issue
Block a user