Commit b228cf38 authored by Vikash Garodia's avatar Vikash Garodia Committed by Mauro Carvalho Chehab
Browse files

media: venus: set ubwc configuration on specific video hardware 



UBWC configuration parameters would vary across video hardware
generations. At the same time, driver is expected to configure these
parameters, without relying on video firmware to use the default
configurations.
Setting the configuration parameters for sc7280.

Signed-off-by: default avatarVikash Garodia <quic_vgarodia@quicinc.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b4d1d5c6

drivers/media/platform/qcom/venus/core.c

+5 −0
Original line number Diff line number Diff line
@@ -845,6 +845,10 @@ static const struct reg_val sm7280_reg_preset[] = { 
	{ 0xb0088, 0 },

};



static const struct hfi_ubwc_config sc7280_ubwc_config = {

	0, 0, {1, 1, 1, 0, 0, 0}, 8, 32, 14, 0, 0, {0, 0}

};



static const struct venus_resources sc7280_res = {

	.freq_tbl = sc7280_freq_table,

	.freq_tbl_size = ARRAY_SIZE(sc7280_freq_table),
@@ -854,6 +858,7 @@ static const struct venus_resources sc7280_res = { 
	.bw_tbl_enc_size = ARRAY_SIZE(sc7280_bw_table_enc),

	.bw_tbl_dec = sc7280_bw_table_dec,

	.bw_tbl_dec_size = ARRAY_SIZE(sc7280_bw_table_dec),

	.ubwc_conf = &sc7280_ubwc_config,

	.clks = {"core", "bus", "iface"},

	.clks_num = 3,

	.vcodec0_clks = {"vcodec_core", "vcodec_bus"},

drivers/media/platform/qcom/venus/core.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "dbgfs.h"

#include "hfi.h"

#include "hfi_platform.h"

#include "hfi_helper.h"



#define VDBGL	"VenusLow : "

#define VDBGM	"VenusMed : "
@@ -57,6 +58,7 @@ struct venus_resources { 
	unsigned int bw_tbl_dec_size;

	const struct reg_val *reg_tbl;

	unsigned int reg_tbl_size;

	const struct hfi_ubwc_config *ubwc_conf;

	const char * const clks[VIDC_CLKS_NUM_MAX];

	unsigned int clks_num;

	const char * const vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX];

drivers/media/platform/qcom/venus/hfi_cmds.c

+9 −0
Original line number Diff line number Diff line
@@ -58,6 +58,15 @@ void pkt_sys_coverage_config(struct hfi_sys_set_property_pkt *pkt, u32 mode) 
	pkt->data[1] = mode;

}



void pkt_sys_ubwc_config(struct hfi_sys_set_property_pkt *pkt, const struct hfi_ubwc_config *hfi)

{

	pkt->hdr.size = struct_size(pkt, data, 1) + sizeof(*hfi);

	pkt->hdr.pkt_type = HFI_CMD_SYS_SET_PROPERTY;

	pkt->num_properties = 1;

	pkt->data[0] = HFI_PROPERTY_SYS_UBWC_CONFIG;

	memcpy(&pkt->data[1], hfi, sizeof(*hfi));

}



int pkt_sys_set_resource(struct hfi_sys_set_resource_pkt *pkt, u32 id, u32 size,

			 u32 addr, void *cookie)

{

drivers/media/platform/qcom/venus/hfi_cmds.h

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ void pkt_sys_init(struct hfi_sys_init_pkt *pkt, u32 arch_type); 
void pkt_sys_pc_prep(struct hfi_sys_pc_prep_pkt *pkt);

void pkt_sys_idle_indicator(struct hfi_sys_set_property_pkt *pkt, u32 enable);

void pkt_sys_power_control(struct hfi_sys_set_property_pkt *pkt, u32 enable);

void pkt_sys_ubwc_config(struct hfi_sys_set_property_pkt *pkt, const struct hfi_ubwc_config *hfi);

int pkt_sys_set_resource(struct hfi_sys_set_resource_pkt *pkt, u32 id, u32 size,

			 u32 addr, void *cookie);

int pkt_sys_unset_resource(struct hfi_sys_release_resource_pkt *pkt, u32 id,

drivers/media/platform/qcom/venus/hfi_helper.h

+20 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ 
#define HFI_PROPERTY_SYS_CODEC_POWER_PLANE_CTRL			0x5

#define HFI_PROPERTY_SYS_IMAGE_VERSION				0x6

#define HFI_PROPERTY_SYS_CONFIG_COVERAGE			0x7

#define HFI_PROPERTY_SYS_UBWC_CONFIG				0x8



/*

 * HFI_PROPERTY_PARAM_COMMON_START
@@ -626,6 +627,25 @@ struct hfi_debug_config { 
	u32 mode;

};



struct hfi_ubwc_config {

	u32 size;

	u32 packet_type;

	struct {

		u32 max_channel_override : 1;

		u32 mal_length_override : 1;

		u32 hb_override : 1;

		u32 bank_swzl_level_override : 1;

		u32 bank_spreading_override : 1;

		u32 reserved : 27;

		} override_bit_info;

	u32 max_channels;

	u32 mal_length;

	u32 highest_bank_bit;

	u32 bank_swzl_level;

	u32 bank_spreading;

	u32 reserved[2];

};



struct hfi_enable {

	u32 enable;

};