rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Merge "msm: vidc: add check for bus scaling"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-06-17 12:57:36 -07:00
committed by Gerrit - the friendly Code Review server
parent 6c141ff6d8 bd02152791
commit e00937cabc
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/msm/vidc/venus_hfi.c
+35 -7
View File
@@ -2322,13 +2322,15 @@ static int venus_hfi_init_bus(struct venus_hfi_device *device)
bus_info = &device->resources.bus_info;
bus_info->ddr_handle[MSM_VIDC_ENCODER] =
msm_bus_scale_register_client(&device->res->bus_pdata[2]);
msm_bus_scale_register_client(
&device->res->bus_pdata[BUS_IDX_ENC_DDR]);
if (!bus_info->ddr_handle[MSM_VIDC_ENCODER]) {
dprintk(VIDC_ERR, "Failed to register bus scale client\n");
goto err_init_bus;
}
bus_info->ddr_handle[MSM_VIDC_DECODER] =
msm_bus_scale_register_client(&device->res->bus_pdata[3]);
msm_bus_scale_register_client(
&device->res->bus_pdata[BUS_IDX_DEC_DDR]);
if (!bus_info->ddr_handle[MSM_VIDC_DECODER]) {
dprintk(VIDC_ERR, "Failed to register bus scale client\n");
goto err_init_bus;
@@ -2337,7 +2339,7 @@ static int venus_hfi_init_bus(struct venus_hfi_device *device)
if (device->res->has_ocmem) {
bus_info->ocmem_handle[MSM_VIDC_ENCODER] =
msm_bus_scale_register_client(
&device->res->bus_pdata[0]);
&device->res->bus_pdata[BUS_IDX_ENC_OCMEM]);
if (!bus_info->ocmem_handle[MSM_VIDC_ENCODER]) {
dprintk(VIDC_ERR,
"Failed to register bus scale client\n");
@@ -2346,7 +2348,7 @@ static int venus_hfi_init_bus(struct venus_hfi_device *device)
bus_info->ocmem_handle[MSM_VIDC_DECODER] =
msm_bus_scale_register_client(
&device->res->bus_pdata[1]);
&device->res->bus_pdata[BUS_IDX_DEC_OCMEM]);
if (!bus_info->ocmem_handle[MSM_VIDC_DECODER]) {
dprintk(VIDC_ERR,
"Failed to register bus scale client\n");
@@ -2370,15 +2372,35 @@ static const u32 venus_hfi_bus_table[] = {
979200,
};
static int venus_hfi_get_bus_vector(int load)
static int venus_hfi_get_bus_vector(struct venus_hfi_device *device, int load,
enum session_type type, enum mem_type mtype)
{
int num_rows = sizeof(venus_hfi_bus_table)/(sizeof(u32));
int i, j;
int idx = 0;
if (!device || (mtype != DDR_MEM && mtype != OCMEM_MEM) ||
(type != MSM_VIDC_ENCODER && type != MSM_VIDC_DECODER)) {
dprintk(VIDC_ERR, "%s invalid params", __func__);
return -EINVAL;
}
for (i = 0; i < num_rows; i++) {
if (load <= venus_hfi_bus_table[i])
break;
}
if (type == MSM_VIDC_ENCODER)
idx = (mtype == DDR_MEM) ? BUS_IDX_ENC_DDR : BUS_IDX_ENC_OCMEM;
else
idx = (mtype == DDR_MEM) ? BUS_IDX_DEC_DDR : BUS_IDX_DEC_OCMEM;
j = clamp(i, 0, num_rows-1) + 1;
/* Ensure bus index remains within the supported range,
* as specified in the device dtsi file */
j = clamp(j, 0, device->res->bus_pdata[idx].num_usecases - 1);
dprintk(VIDC_DBG, "Required bus = %d\n", j);
return j;
}
@@ -2389,6 +2411,7 @@ static int venus_hfi_scale_bus(void *dev, int load,
int rc = 0;
u32 handle = 0;
struct venus_hfi_device *device = dev;
int bus_vector = 0;
if (!device) {
dprintk(VIDC_ERR, "%s invalid device handle %p",
@@ -2402,8 +2425,13 @@ static int venus_hfi_scale_bus(void *dev, int load,
handle = device->resources.bus_info.ocmem_handle[type];
if (handle) {
rc = msm_bus_scale_client_update_request(
handle, venus_hfi_get_bus_vector(load));
bus_vector = venus_hfi_get_bus_vector(device, load,
type, mtype);
if (bus_vector < 0) {
dprintk(VIDC_ERR, "Failed to get bus vector\n");
return -EINVAL;
}
rc = msm_bus_scale_client_update_request(handle, bus_vector);
if (rc)
dprintk(VIDC_ERR, "Failed to scale bus: %d\n", rc);
} else {
drivers/media/platform/msm/vidc/venus_hfi.h
+8
View File
@@ -116,6 +116,14 @@ enum vidc_hw_reg {
VIDC_HWREG_HVI_SOFTINTEN = 0xA,
};
enum bus_index {
BUS_IDX_ENC_OCMEM,
BUS_IDX_DEC_OCMEM,
BUS_IDX_ENC_DDR,
BUS_IDX_DEC_DDR,
BUS_IDX_MAX
};
struct vidc_mem_addr {
u8 *align_device_addr;
u8 *align_virtual_addr;