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

Commit 2d2e41a7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Enable LLC bandwidth configuration"

parents 7954017a ac170f9a

drivers/media/platform/msm/vidc/governors/msm_vidc_dyn_gov.c

+1 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ static int __event_handler(struct devfreq *devfreq, unsigned int event, 
	switch (event) {

	case DEVFREQ_GOV_START:

	case DEVFREQ_GOV_RESUME:

	case DEVFREQ_GOV_SUSPEND:

		mutex_lock(&devfreq->lock);

		rc = update_devfreq(devfreq);

		mutex_unlock(&devfreq->lock);

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

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ int msm_comm_vote_bus(struct msm_vidc_core *core) 
		}

		vote_data[i].work_mode = inst->clk_data.work_mode;

		fill_recon_stats(inst, &vote_data[i]);



		if (core->resources.sys_cache_enabled)

			vote_data[i].use_sys_cache = true;



		i++;

	}

	mutex_unlock(&core->lock);

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width); 
u32 get_frame_size_rgba(int plane, u32 height, u32 width);

u32 get_frame_size_nv21(int plane, u32 height, u32 width);

u32 get_frame_size_tp10_ubwc(int plane, u32 height, u32 width);

void msm_comm_set_use_sys_cache(struct msm_vidc_inst *inst);

struct vb2_buffer *msm_comm_get_vb_using_vidc_buffer(

		struct msm_vidc_inst *inst, struct msm_vidc_buffer *mbuf);

struct msm_vidc_buffer *msm_comm_get_buffer_using_device_planes(

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

+8 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ enum clock_properties { 
	CLOCK_PROP_HAS_MEM_RETENTION    = 1 << 1,

};



#define PERF_GOV "performance"



static inline struct device *msm_iommu_get_ctx(const char *ctx_name)

{

	return NULL;
@@ -426,6 +428,8 @@ static int msm_vidc_populate_bus(struct device *dev, 
	buses->bus_tbl = temp_table;

	bus = &buses->bus_tbl[buses->count];



	memset(bus, 0x0, sizeof(struct bus_info));



	rc = of_property_read_string(dev->of_node, "label", &temp_name);

	if (rc) {

		dprintk(VIDC_ERR, "'label' not found in node\n");
@@ -457,9 +461,12 @@ static int msm_vidc_populate_bus(struct device *dev, 
		rc = 0;

		dprintk(VIDC_DBG,

				"'qcom,bus-governor' not found, default to performance governor\n");

		bus->governor = "performance";

		bus->governor = PERF_GOV;

	}



	if (!strcmp(bus->governor, PERF_GOV))

		bus->is_prfm_gov_used = true;



	rc = of_property_read_u32_array(dev->of_node, "qcom,bus-range-kbps",

			range, ARRAY_SIZE(range));

	if (rc) {

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

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ struct bus_info { 
	struct devfreq_dev_profile devfreq_prof;

	struct devfreq *devfreq;

	struct msm_bus_client_handle *client;

	bool is_prfm_gov_used;

};



struct bus_set {