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

Commit abd8869c authored by Vaibhav Deshu Venkatesh's avatar Vaibhav Deshu Venkatesh
Browse files

msm: vidc: Cleanup unused structures and features 



Lot of unused structures and features in kernel.
Clean this up. Also, pass correct buffer type for plane
constraints setting.

CRs-Fixed: 2368458
Change-Id: I6d09d76f8768a76806d601868348b5c63780ed11
Signed-off-by: default avatarVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
parent 68fffd43

drivers/media/platform/msm/vidc/hfi_packetization.c

+0 −14
Original line number Diff line number Diff line
@@ -304,19 +304,6 @@ int create_pkt_cmd_sys_release_resource( 
	return rc;

}



int create_pkt_cmd_sys_ping(struct hfi_cmd_sys_ping_packet *pkt)

{

	int rc = 0;



	if (!pkt)

		return -EINVAL;



	pkt->size = sizeof(struct hfi_cmd_sys_ping_packet);

	pkt->packet_type = HFI_CMD_SYS_PING;



	return rc;

}



inline int create_pkt_cmd_sys_session_init(

		struct hfi_cmd_sys_session_init_packet *pkt,

		struct hal_session *session,
@@ -829,7 +816,6 @@ static struct hfi_packetization_ops hfi_default = { 
	.sys_debug_config = create_pkt_cmd_sys_debug_config,

	.sys_coverage_config = create_pkt_cmd_sys_coverage_config,

	.sys_release_resource = create_pkt_cmd_sys_release_resource,

	.sys_ping = create_pkt_cmd_sys_ping,

	.sys_image_version = create_pkt_cmd_sys_image_version,

	.ssr_cmd = create_pkt_ssr_cmd,

	.session_init = create_pkt_cmd_sys_session_init,

drivers/media/platform/msm/vidc/hfi_packetization.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct hfi_packetization_ops { 
	int (*sys_release_resource)(

		struct hfi_cmd_sys_release_resource_packet *pkt,

		struct vidc_resource_hdr *resource_hdr);

	int (*sys_ping)(struct hfi_cmd_sys_ping_packet *pkt);

	int (*sys_image_version)(struct hfi_cmd_sys_get_property_packet *pkt);

	int (*ssr_cmd)(enum hal_ssr_trigger_type type,

		struct hfi_cmd_sys_test_ssr_packet *pkt);

drivers/media/platform/msm/vidc/msm_vdec.c

+0 −23
Original line number Diff line number Diff line
@@ -21,32 +21,9 @@ 
#define MIN_NUM_DEC_CAPTURE_BUFFERS 4

/* Y=16(0-9bits), Cb(10-19bits)=Cr(20-29bits)=128, black by default */

#define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8020010

#define MB_SIZE_IN_PIXEL (16 * 16)

#define MAX_VP9D_INST_COUNT 6

#define MAX_4K_MBPF 38736 /* (4096 * 2304 / 256) */



static const char *const mpeg_video_stream_format[] = {

	"NAL Format Start Codes",

	"NAL Format One NAL Per Buffer",

	"NAL Format One Byte Length",

	"NAL Format Two Byte Length",

	"NAL Format Four Byte Length",

	NULL

};



static const char *const mpeg_vidc_video_alloc_mode_type[] = {

	"Buffer Allocation Static",

	"Buffer Allocation Dynamic Buffer",

	NULL

};



static const char *const perf_level[] = {

	"Nominal",

	"Performance",

	"Turbo",

	NULL

};



static const char *const vp8_profile_level[] = {

	"Unused",

	"0.0",

drivers/media/platform/msm/vidc/msm_venc.c

+0 −31
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 
#define MAX_NUM_B_FRAMES 1



#define L_MODE V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY

#define MIN_TIME_RESOLUTION 1

#define MAX_TIME_RESOLUTION 0xFFFFFF

#define DEFAULT_TIME_RESOLUTION 0x7530

#define MIN_NUM_ENC_OUTPUT_BUFFERS 4

#define MIN_NUM_ENC_CAPTURE_BUFFERS 5
@@ -46,13 +43,6 @@ static const char *const mpeg_video_rate_control[] = { 
	NULL

};



static const char *const h264_video_entropy_cabac_model[] = {

	"Model 0",

	"Model 1",

	"Model 2",

	NULL

};



static const char *const vp8_profile_level[] = {

	"Unused",

	"0.0",
@@ -62,27 +52,6 @@ static const char *const vp8_profile_level[] = { 
	NULL

};



static const char *const perf_level[] = {

	"Nominal",

	"Performance",

	"Turbo",

	NULL

};



static const char *const mbi_statistics[] = {

	"Camcorder Default",

	"Mode 1",

	"Mode 2",

	"Mode 3",

	NULL

};



static const char *const timestamp_mode[] = {

	"Honor",

	"Ignore",

	NULL

};



static const char *const mpeg_video_stream_format[] = {

	"NAL Format Start Codes",

	"NAL Format One NAL Per Buffer",

drivers/media/platform/msm/vidc/msm_vidc_ar50_dyn_gov.c

+3 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void __dump(struct dump dump[], int len) 
			}

		}



		dprintk(VIDC_DBG, "%s", formatted_line);

		dprintk(VIDC_PROF, "%s", formatted_line);

	}

}
@@ -501,7 +501,7 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d, 
	llc.total = llc.dpb_read + llc.opb_read;



	/* Dump all the variables for easier debugging */

	if (msm_vidc_dyn_gov_debug) {

	if (msm_vidc_debug & VIDC_PROF) {

		struct dump dump[] = {

		{"DECODER PARAMETERS", "", DUMP_HEADER_MAGIC},

		{"LCU size", "%d", lcu_size},
@@ -785,7 +785,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d, 
	qsmmu_bw_overhead_factor = FP(1, 3, 100);

	ddr.total = fp_mult(ddr.total, qsmmu_bw_overhead_factor);



	if (msm_vidc_dyn_gov_debug) {

	if (msm_vidc_debug & VIDC_PROF) {

		struct dump dump[] = {

		{"ENCODER PARAMETERS", "", DUMP_HEADER_MAGIC},

		{"width", "%d", width},