Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4896ad authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9d831745 on remote branch 

Change-Id: I370ca081a2d55094148a83218dc83712519c3fa1
parents c8be54f0 9d831745

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -18,4 +18,13 @@ ifeq ($(CONFIG_ARCH_LITO), y) 
LINUXINCLUDE    += -include $(srctree)/techpack/video/config/litovidconf.h

endif



# auto-detect subdirs

ifeq ($(CONFIG_ARCH_BENGAL), y)

include $(srctree)/techpack/video/config/bengalvid.conf

endif



ifeq ($(CONFIG_ARCH_BENGAL), y)

LINUXINCLUDE    += -include $(srctree)/techpack/video/config/bengalvidconf.h

endif



obj-y +=msm/

config/bengalvid.conf

0 → 100644
+1 −0
Original line number Diff line number Diff line 
export CONFIG_MSM_VIDC_V4L2=y

config/bengalvidconf.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 */



#define CONFIG_MSM_VIDC_V4L2 1

msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ msm-vidc-objs := vidc/msm_v4l2_vidc.o \ 
                vidc/msm_vdec.o \

                vidc/msm_venc.o \

                vidc/msm_cvp_internal.o \

                vidc/msm_cvp_external.o \

                vidc/msm_smem.o \

                vidc/msm_vidc_debug.o \

                vidc/msm_vidc_res_parse.o \

                vidc/hfi_common.o \

                vidc/hfi_ar50.o \

                vidc/hfi_ar50_lt.o \

                vidc/hfi_iris1.o \

                vidc/hfi_iris2.o \

                vidc/hfi_response_handler.o \

msm/vidc/hfi_ar50.c

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#include "hfi_common.h"

#include "hfi_io_common.h"



void __interrupt_init_ar50(struct venus_hfi_device *device)

void __interrupt_init_ar50(struct venus_hfi_device *device, u32 sid)

{

	__write_register(device, WRAPPER_INTR_MASK,

			WRAPPER_INTR_MASK_A2HVCODEC_BMSK);

			WRAPPER_INTR_MASK_A2HVCODEC_BMSK, sid);

}