samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri İşlemler Paketler Projeler Sürüm Wiki Aktivite

msm: eva: rename cvp to eva for private h and such

Kaynağa Gözat 
renamed cvp to eva for msm_eva_private.h and
other source and header depending on this file

Change-Id: I987cfedca62c82e5e26af230b4f36c84f1318a95
Signed-off-by: Yu SI <ysi@codeaurora.org>
Bu işleme şunda yer alıyor:
Yu SI
2020-09-25 18:35:11 -07:00
ebeveyn 10b7267132
işleme 5f1c0b90c3
12 değiştirilmiş dosya ile 279 ekleme ve 279 silme
Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

172
include/uapi/eva/media/msm_eva_private.h
Dosyayı Görüntüle

@@ -2,81 +2,81 @@
/*
* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*/
#ifndef __MSM_CVP_PRIVATE_H__
#define __MSM_CVP_PRIVATE_H__
#ifndef __MSM_EVA_PRIVATE_H__
#define __MSM_EVA_PRIVATE_H__
#include <linux/types.h>
/* Commands type */
#define CVP_KMD_CMD_BASE 0x10000000
#define CVP_KMD_CMD_START (CVP_KMD_CMD_BASE + 0x1000)
#define EVA_KMD_CMD_BASE 0x10000000
#define EVA_KMD_CMD_START (EVA_KMD_CMD_BASE + 0x1000)
/*
* userspace clients pass one of the below arguments type
* in struct cvp_kmd_arg (@type field).
* in struct eva_kmd_arg (@type field).
*/
/*
* CVP_KMD_GET_SESSION_INFO - this argument type is used to
* EVA_KMD_GET_SESSION_INFO - this argument type is used to
* get the session information from driver. it passes
* struct cvp_kmd_session_info {}
* struct eva_kmd_session_info {}
*/
#define CVP_KMD_GET_SESSION_INFO (CVP_KMD_CMD_START + 1)
#define EVA_KMD_GET_SESSION_INFO (EVA_KMD_CMD_START + 1)
/*
* CVP_KMD_REGISTER_BUFFER - this argument type is used to
* EVA_KMD_REGISTER_BUFFER - this argument type is used to
* register the buffer to driver. it passes
* struct cvp_kmd_buffer {}
* struct eva_kmd_buffer {}
*/
#define CVP_KMD_REGISTER_BUFFER (CVP_KMD_CMD_START + 3)
#define EVA_KMD_REGISTER_BUFFER (EVA_KMD_CMD_START + 3)
/*
* CVP_KMD_REGISTER_BUFFER - this argument type is used to
* EVA_KMD_REGISTER_BUFFER - this argument type is used to
* unregister the buffer to driver. it passes
* struct cvp_kmd_buffer {}
* struct eva_kmd_buffer {}
*/
#define CVP_KMD_UNREGISTER_BUFFER (CVP_KMD_CMD_START + 4)
#define EVA_KMD_UNREGISTER_BUFFER (EVA_KMD_CMD_START + 4)
#define CVP_KMD_UPDATE_POWER (CVP_KMD_CMD_START + 17)
#define EVA_KMD_UPDATE_POWER (EVA_KMD_CMD_START + 17)
#define CVP_KMD_SEND_CMD_PKT (CVP_KMD_CMD_START + 64)
#define EVA_KMD_SEND_CMD_PKT (EVA_KMD_CMD_START + 64)
#define CVP_KMD_RECEIVE_MSG_PKT (CVP_KMD_CMD_START + 65)
#define EVA_KMD_RECEIVE_MSG_PKT (EVA_KMD_CMD_START + 65)
#define CVP_KMD_SET_SYS_PROPERTY (CVP_KMD_CMD_START + 66)
#define EVA_KMD_SET_SYS_PROPERTY (EVA_KMD_CMD_START + 66)
#define CVP_KMD_GET_SYS_PROPERTY (CVP_KMD_CMD_START + 67)
#define EVA_KMD_GET_SYS_PROPERTY (EVA_KMD_CMD_START + 67)
#define CVP_KMD_SESSION_CONTROL (CVP_KMD_CMD_START + 68)
#define EVA_KMD_SESSION_CONTROL (EVA_KMD_CMD_START + 68)
#define CVP_KMD_SEND_FENCE_CMD_PKT (CVP_KMD_CMD_START + 69)
#define EVA_KMD_SEND_FENCE_CMD_PKT (EVA_KMD_CMD_START + 69)
#define CVP_KMD_FLUSH_ALL (CVP_KMD_CMD_START + 70)
#define EVA_KMD_FLUSH_ALL (EVA_KMD_CMD_START + 70)
#define CVP_KMD_FLUSH_FRAME (CVP_KMD_CMD_START + 71)
#define EVA_KMD_FLUSH_FRAME (EVA_KMD_CMD_START + 71)
/* flags */
#define CVP_KMD_FLAG_UNSECURE 0x00000000
#define CVP_KMD_FLAG_SECURE 0x00000001
#define EVA_KMD_FLAG_UNSECURE 0x00000000
#define EVA_KMD_FLAG_SECURE 0x00000001
/* buffer type */
#define CVP_KMD_BUFTYPE_INPUT 0x00000001
#define CVP_KMD_BUFTYPE_OUTPUT 0x00000002
#define CVP_KMD_BUFTYPE_INTERNAL_1 0x00000003
#define CVP_KMD_BUFTYPE_INTERNAL_2 0x00000004
#define EVA_KMD_BUFTYPE_INPUT 0x00000001
#define EVA_KMD_BUFTYPE_OUTPUT 0x00000002
#define EVA_KMD_BUFTYPE_INTERNAL_1 0x00000003
#define EVA_KMD_BUFTYPE_INTERNAL_2 0x00000004
/**
* struct cvp_kmd_session_info - session information
* struct eva_kmd_session_info - session information
* @session_id: current session id
*/
struct cvp_kmd_session_info {
struct eva_kmd_session_info {
__u32 session_id;
__u32 reserved[10];
};
/**
* struct cvp_kmd_buffer - buffer information to be registered
* struct eva_kmd_buffer - buffer information to be registered
* @index: index of buffer
* @type: buffer type
* @fd: file descriptor of buffer
@@ -85,7 +85,7 @@ struct cvp_kmd_session_info {
* @pixelformat: fourcc format
* @flags: buffer flags
*/
struct cvp_kmd_buffer {
struct eva_kmd_buffer {
__u32 index;
__u32 type;
__u32 fd;
@@ -97,24 +97,24 @@ struct cvp_kmd_buffer {
};
/**
* struct cvp_kmd_send_cmd - sending generic HFI command
* struct eva_kmd_send_cmd - sending generic HFI command
* @cmd_address_fd: file descriptor of cmd_address
* @cmd_size: allocated size of buffer
*/
struct cvp_kmd_send_cmd {
struct eva_kmd_send_cmd {
__u32 cmd_address_fd;
__u32 cmd_size;
__u32 reserved[10];
};
/**
* struct cvp_kmd_client_data - store generic client
* struct eva_kmd_client_data - store generic client
* data
* @transactionid: transaction id
* @client_data1: client data to be used during callback
* @client_data2: client data to be used during callback
*/
struct cvp_kmd_client_data {
struct eva_kmd_client_data {
__u32 transactionid;
__u32 client_data1;
__u32 client_data2;
@@ -123,47 +123,47 @@ struct cvp_kmd_client_data {
#define MAX_HFI_PKT_SIZE 470
struct cvp_kmd_hfi_packet {
struct eva_kmd_hfi_packet {
__u32 pkt_data[MAX_HFI_PKT_SIZE];
};
#define CVP_KMD_PROP_HFI_VERSION 1
#define CVP_KMD_PROP_SESSION_TYPE 2
#define CVP_KMD_PROP_SESSION_KERNELMASK 3
#define CVP_KMD_PROP_SESSION_PRIORITY 4
#define CVP_KMD_PROP_SESSION_SECURITY 5
#define CVP_KMD_PROP_SESSION_DSPMASK 6
#define EVA_KMD_PROP_HFI_VERSION 1
#define EVA_KMD_PROP_SESSION_TYPE 2
#define EVA_KMD_PROP_SESSION_KERNELMASK 3
#define EVA_KMD_PROP_SESSION_PRIORITY 4
#define EVA_KMD_PROP_SESSION_SECURITY 5
#define EVA_KMD_PROP_SESSION_DSPMASK 6
#define CVP_KMD_PROP_PWR_FDU 0x10
#define CVP_KMD_PROP_PWR_ICA 0x11
#define CVP_KMD_PROP_PWR_OD 0x12
#define CVP_KMD_PROP_PWR_MPU 0x13
#define CVP_KMD_PROP_PWR_FW 0x14
#define CVP_KMD_PROP_PWR_DDR 0x15
#define CVP_KMD_PROP_PWR_SYSCACHE 0x16
#define CVP_KMD_PROP_PWR_FDU_OP 0x17
#define CVP_KMD_PROP_PWR_ICA_OP 0x18
#define CVP_KMD_PROP_PWR_OD_OP 0x19
#define CVP_KMD_PROP_PWR_MPU_OP 0x1A
#define CVP_KMD_PROP_PWR_FW_OP 0x1B
#define CVP_KMD_PROP_PWR_DDR_OP 0x1C
#define CVP_KMD_PROP_PWR_SYSCACHE_OP 0x1D
#define CVP_KMD_PROP_PWR_FPS_FDU 0x1E
#define CVP_KMD_PROP_PWR_FPS_MPU 0x1F
#define CVP_KMD_PROP_PWR_FPS_OD 0x20
#define CVP_KMD_PROP_PWR_FPS_ICA 0x21
#define EVA_KMD_PROP_PWR_FDU 0x10
#define EVA_KMD_PROP_PWR_ICA 0x11
#define EVA_KMD_PROP_PWR_OD 0x12
#define EVA_KMD_PROP_PWR_MPU 0x13
#define EVA_KMD_PROP_PWR_FW 0x14
#define EVA_KMD_PROP_PWR_DDR 0x15
#define EVA_KMD_PROP_PWR_SYSCACHE 0x16
#define EVA_KMD_PROP_PWR_FDU_OP 0x17
#define EVA_KMD_PROP_PWR_ICA_OP 0x18
#define EVA_KMD_PROP_PWR_OD_OP 0x19
#define EVA_KMD_PROP_PWR_MPU_OP 0x1A
#define EVA_KMD_PROP_PWR_FW_OP 0x1B
#define EVA_KMD_PROP_PWR_DDR_OP 0x1C
#define EVA_KMD_PROP_PWR_SYSCACHE_OP 0x1D
#define EVA_KMD_PROP_PWR_FPS_FDU 0x1E
#define EVA_KMD_PROP_PWR_FPS_MPU 0x1F
#define EVA_KMD_PROP_PWR_FPS_OD 0x20
#define EVA_KMD_PROP_PWR_FPS_ICA 0x21
#define MAX_KMD_PROP_NUM_PER_PACKET 8
#define MAX_KMD_PROP_TYPE (CVP_KMD_PROP_PWR_FPS_ICA + 1)
#define MAX_KMD_PROP_TYPE (EVA_KMD_PROP_PWR_FPS_ICA + 1)
struct cvp_kmd_sys_property {
struct eva_kmd_sys_property {
__u32 prop_type;
__u32 data;
};
struct cvp_kmd_sys_properties {
struct eva_kmd_sys_properties {
__u32 prop_num;
struct cvp_kmd_sys_property prop_data[MAX_KMD_PROP_NUM_PER_PACKET];
struct eva_kmd_sys_property prop_data[MAX_KMD_PROP_NUM_PER_PACKET];
};
#define SESSION_CREATE 1
@@ -172,45 +172,45 @@ struct cvp_kmd_sys_properties {
#define SESSION_STOP 4
#define SESSION_INFO 5
struct cvp_kmd_session_control {
struct eva_kmd_session_control {
__u32 ctrl_type;
__u32 ctrl_data[8];
};
#define MAX_HFI_FENCE_SIZE 16
#define MAX_HFI_FENCE_OFFSET (MAX_HFI_PKT_SIZE-MAX_HFI_FENCE_SIZE)
struct cvp_kmd_hfi_fence_packet {
struct eva_kmd_hfi_fence_packet {
__u32 pkt_data[MAX_HFI_FENCE_OFFSET];
__u32 fence_data[MAX_HFI_FENCE_SIZE];
__u64 frame_id;
};
struct cvp_kmd_fence {
struct eva_kmd_fence {
__s32 h_synx;
__u32 secure_key;
};
struct cvp_kmd_fence_ctrl {
struct eva_kmd_fence_ctrl {
__u32 magic;
__u32 reserved;
__u64 frame_id;
__u32 num_fences;
__u32 output_index;
struct cvp_kmd_fence fences[MAX_HFI_FENCE_SIZE/2];
struct eva_kmd_fence fences[MAX_HFI_FENCE_SIZE/2];
};
#define MAX_FENCE_DATA_SIZE (MAX_HFI_FENCE_SIZE + 6)
struct cvp_kmd_hfi_synx_packet {
struct eva_kmd_hfi_synx_packet {
__u32 pkt_data[MAX_HFI_PKT_SIZE];
union {
__u32 fence_data[MAX_FENCE_DATA_SIZE];
struct cvp_kmd_fence_ctrl fc;
struct eva_kmd_fence_ctrl fc;
};
};
/**
* struct cvp_kmd_arg
* struct eva_kmd_arg
*
* @type: command type
* @buf_offset: offset to buffer list in the command
@@ -225,25 +225,25 @@ struct cvp_kmd_hfi_synx_packet {
* @sys_properties System properties read or set by user library
* @hfi_fence_pkt: HFI fence packet created by user library
*/
struct cvp_kmd_arg {
struct eva_kmd_arg {
__u32 type;
__u32 buf_offset;
__u32 buf_num;
union cvp_data_t {
struct cvp_kmd_session_info session;
struct cvp_kmd_buffer regbuf;
struct cvp_kmd_buffer unregbuf;
struct cvp_kmd_send_cmd send_cmd;
struct cvp_kmd_hfi_packet hfi_pkt;
struct cvp_kmd_sys_properties sys_properties;
struct cvp_kmd_hfi_fence_packet hfi_fence_pkt;
struct cvp_kmd_hfi_synx_packet hfi_synx_pkt;
struct cvp_kmd_session_control session_ctrl;
union eva_data_t {
struct eva_kmd_session_info session;
struct eva_kmd_buffer regbuf;
struct eva_kmd_buffer unregbuf;
struct eva_kmd_send_cmd send_cmd;
struct eva_kmd_hfi_packet hfi_pkt;
struct eva_kmd_sys_properties sys_properties;
struct eva_kmd_hfi_fence_packet hfi_fence_pkt;
struct eva_kmd_hfi_synx_packet hfi_synx_pkt;
struct eva_kmd_session_control session_ctrl;
__u64 frame_id;
} data;
};
struct cvp_kmd_request_power {
struct eva_kmd_request_power {
__u32 deprecated;
};
#endif

4
msm/eva/cvp_hfi.c
Dosyayı Görüntüle

@@ -2438,10 +2438,10 @@ err_create_pkt:
}
static int iris_hfi_session_send(void *sess,
struct cvp_kmd_hfi_packet *in_pkt)
struct eva_kmd_hfi_packet *in_pkt)
{
int rc = 0;
struct cvp_kmd_hfi_packet pkt;
struct eva_kmd_hfi_packet pkt;
struct cvp_hal_session *session = sess;
struct iris_hfi_device *device;

2
msm/eva/cvp_hfi_api.h
Dosyayı Görüntüle

@@ -340,7 +340,7 @@ struct cvp_hfi_device {
int (*session_abort)(void *session);
int (*session_set_buffers)(void *sess, u32 iova, u32 size);
int (*session_release_buffers)(void *sess);
int (*session_send)(void *sess, struct cvp_kmd_hfi_packet *in_pkt);
int (*session_send)(void *sess, struct eva_kmd_hfi_packet *in_pkt);
int (*session_flush)(void *sess);
int (*scale_clocks)(void *dev, u32 freq);
int (*vote_bus)(void *dev, struct cvp_bus_vote_data *data,

4
msm/eva/hfi_packetization.c
Dosyayı Görüntüle

@@ -340,9 +340,9 @@ int cvp_create_pkt_cmd_session_release_buffers(
}
int cvp_create_pkt_cmd_session_send(
struct cvp_kmd_hfi_packet *out_pkt,
struct eva_kmd_hfi_packet *out_pkt,
struct cvp_hal_session *session,
struct cvp_kmd_hfi_packet *in_pkt)
struct eva_kmd_hfi_packet *in_pkt)
{
int def_idx;
struct cvp_hal_session_cmd_pkt *ptr =

4
msm/eva/hfi_packetization.h
Dosyayı Görüntüle

@@ -65,9 +65,9 @@ struct cvp_hfi_packetization_ops {
struct cvp_hfi_cmd_session_sync_process_packet *pkt,
struct cvp_hal_session *session);
int (*session_send)(
struct cvp_kmd_hfi_packet *out_pkt,
struct eva_kmd_hfi_packet *out_pkt,
struct cvp_hal_session *session,
struct cvp_kmd_hfi_packet *in_pkt);
struct eva_kmd_hfi_packet *in_pkt);
};
struct cvp_hfi_packetization_ops *cvp_hfi_get_pkt_ops_handle(

158
msm/eva/msm_cvp.c
Dosyayı Görüntüle

@@ -15,7 +15,7 @@ struct cvp_power_level {
};
static int msm_cvp_get_session_info(struct msm_cvp_inst *inst,
struct cvp_kmd_session_info *session)
struct eva_kmd_session_info *session)
{
int rc = 0;
struct msm_cvp_inst *s;
@@ -29,7 +29,7 @@ static int msm_cvp_get_session_info(struct msm_cvp_inst *inst,
if (!s)
return -ECONNRESET;
s->cur_cmd_type = CVP_KMD_GET_SESSION_INFO;
s->cur_cmd_type = EVA_KMD_GET_SESSION_INFO;
session->session_id = hash32_ptr(inst->session);
dprintk(CVP_SESS, "%s: id 0x%x\n", __func__, session->session_id);
@@ -84,7 +84,7 @@ static bool cvp_msg_pending(struct cvp_session_queue *sq,
static int cvp_wait_process_message(struct msm_cvp_inst *inst,
struct cvp_session_queue *sq, u64 *ktid,
unsigned long timeout,
struct cvp_kmd_hfi_packet *out)
struct eva_kmd_hfi_packet *out)
{
struct cvp_session_msg *msg = NULL;
struct cvp_hfi_msg_session_hdr *hdr;
@@ -126,7 +126,7 @@ exit:
}
static int msm_cvp_session_receive_hfi(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *out_pkt)
struct eva_kmd_hfi_packet *out_pkt)
{
unsigned long wait_time;
struct cvp_session_queue *sq;
@@ -142,7 +142,7 @@ static int msm_cvp_session_receive_hfi(struct msm_cvp_inst *inst,
if (!s)
return -ECONNRESET;
s->cur_cmd_type = CVP_KMD_RECEIVE_MSG_PKT;
s->cur_cmd_type = EVA_KMD_RECEIVE_MSG_PKT;
wait_time = msecs_to_jiffies(CVP_MAX_WAIT_TIME);
sq = &inst->session_queue;
@@ -155,7 +155,7 @@ static int msm_cvp_session_receive_hfi(struct msm_cvp_inst *inst,
static int msm_cvp_session_process_hfi(
struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int in_offset,
unsigned int in_buf_num)
{
@@ -174,7 +174,7 @@ static int msm_cvp_session_process_hfi(
if (!s)
return -ECONNRESET;
inst->cur_cmd_type = CVP_KMD_SEND_CMD_PKT;
inst->cur_cmd_type = EVA_KMD_SEND_CMD_PKT;
hdev = inst->core->device;
pkt_idx = get_pkt_index((struct cvp_hal_session_cmd_pkt *)in_pkt);
@@ -467,7 +467,7 @@ static int cvp_fence_proc(struct msm_cvp_inst *inst,
}
rc = call_hfi_op(hdev, session_send, (void *)inst->session,
(struct cvp_kmd_hfi_packet *)pkt);
(struct eva_kmd_hfi_packet *)pkt);
if (rc) {
dprintk(CVP_ERR, "%s %s: Failed in call_hfi_op %d, %x\n",
current->comm, __func__, pkt->size, pkt->packet_type);
@@ -477,7 +477,7 @@ static int cvp_fence_proc(struct msm_cvp_inst *inst,
timeout = msecs_to_jiffies(CVP_MAX_WAIT_TIME);
rc = cvp_wait_process_message(inst, sq, &ktid, timeout,
(struct cvp_kmd_hfi_packet *)&hdr);
(struct eva_kmd_hfi_packet *)&hdr);
if (get_msg_size((struct cvp_hfi_msg_session_hdr *) &hdr)
== sizeof(struct cvp_hfi_msg_session_hdr_ext)) {
struct cvp_hfi_msg_session_hdr_ext *fhdr =
@@ -608,13 +608,13 @@ exit:
}
static int msm_cvp_session_process_hfi_fence(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
int rc = 0;
int idx;
struct cvp_kmd_hfi_fence_packet *fence_pkt;
struct cvp_kmd_hfi_synx_packet *synx_pkt;
struct cvp_kmd_fence_ctrl *kfc;
struct eva_kmd_hfi_fence_packet *fence_pkt;
struct eva_kmd_hfi_synx_packet *synx_pkt;
struct eva_kmd_fence_ctrl *kfc;
struct cvp_hfi_cmd_session_hdr *pkt;
unsigned int offset, buf_num, in_offset, in_buf_num;
struct msm_cvp_inst *s;
@@ -669,7 +669,7 @@ static int msm_cvp_session_process_hfi_fence(struct msm_cvp_inst *inst,
dprintk(CVP_ERR, "Incorrect buf num and offset in cmd\n");
goto exit;
}
rc = msm_cvp_map_frame(inst, (struct cvp_kmd_hfi_packet *)pkt, offset,
rc = msm_cvp_map_frame(inst, (struct eva_kmd_hfi_packet *)pkt, offset,
buf_num);
if (rc)
goto exit;
@@ -975,7 +975,7 @@ static int msm_cvp_update_power(struct msm_cvp_inst *inst)
if (!s)
return -ECONNRESET;
inst->cur_cmd_type = CVP_KMD_UPDATE_POWER;
inst->cur_cmd_type = EVA_KMD_UPDATE_POWER;
core = inst->core;
mutex_lock(&core->clk_lock);
@@ -988,7 +988,7 @@ static int msm_cvp_update_power(struct msm_cvp_inst *inst)
}
static int msm_cvp_register_buffer(struct msm_cvp_inst *inst,
struct cvp_kmd_buffer *buf)
struct eva_kmd_buffer *buf)
{
struct cvp_hfi_device *hdev;
struct cvp_hal_session *session;
@@ -1007,7 +1007,7 @@ static int msm_cvp_register_buffer(struct msm_cvp_inst *inst,
if (!s)
return -ECONNRESET;
inst->cur_cmd_type = CVP_KMD_REGISTER_BUFFER;
inst->cur_cmd_type = EVA_KMD_REGISTER_BUFFER;
session = (struct cvp_hal_session *)inst->session;
if (!session) {
dprintk(CVP_ERR, "%s: invalid session\n", __func__);
@@ -1025,7 +1025,7 @@ exit:
}
static int msm_cvp_unregister_buffer(struct msm_cvp_inst *inst,
struct cvp_kmd_buffer *buf)
struct eva_kmd_buffer *buf)
{
struct msm_cvp_inst *s;
int rc = 0;
@@ -1042,7 +1042,7 @@ static int msm_cvp_unregister_buffer(struct msm_cvp_inst *inst,
if (!s)
return -ECONNRESET;
inst->cur_cmd_type = CVP_KMD_UNREGISTER_BUFFER;
inst->cur_cmd_type = EVA_KMD_UNREGISTER_BUFFER;
print_client_buffer(CVP_HFI, "unregister", inst, buf);
rc = msm_cvp_unmap_buf_dsp(inst, buf);
@@ -1180,7 +1180,7 @@ static int cvp_fence_thread_stop(struct msm_cvp_inst *inst)
}
static int msm_cvp_session_start(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
struct cvp_session_queue *sq;
@@ -1199,10 +1199,10 @@ static int msm_cvp_session_start(struct msm_cvp_inst *inst,
}
static int msm_cvp_session_stop(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
struct cvp_session_queue *sq;
struct cvp_kmd_session_control *sc = &arg->data.session_ctrl;
struct eva_kmd_session_control *sc = &arg->data.session_ctrl;
sq = &inst->session_queue;
@@ -1250,9 +1250,9 @@ int msm_cvp_session_queue_stop(struct msm_cvp_inst *inst)
}
static int msm_cvp_session_ctrl(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
struct cvp_kmd_session_control *ctrl = &arg->data.session_ctrl;
struct eva_kmd_session_control *ctrl = &arg->data.session_ctrl;
int rc = 0;
unsigned int ctrl_type;
@@ -1284,9 +1284,9 @@ static int msm_cvp_session_ctrl(struct msm_cvp_inst *inst,
}
static int msm_cvp_get_sysprop(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
struct cvp_kmd_sys_properties *props = &arg->data.sys_properties;
struct eva_kmd_sys_properties *props = &arg->data.sys_properties;
struct cvp_hfi_device *hdev;
struct iris_hfi_device *hfi;
int i, rc = 0;
@@ -1301,7 +1301,7 @@ static int msm_cvp_get_sysprop(struct msm_cvp_inst *inst,
for (i = 0; i < props->prop_num; i++) {
switch (props->prop_data[i].prop_type) {
case CVP_KMD_PROP_HFI_VERSION:
case EVA_KMD_PROP_HFI_VERSION:
{
props->prop_data[i].data = hfi->version;
break;
@@ -1316,10 +1316,10 @@ static int msm_cvp_get_sysprop(struct msm_cvp_inst *inst,
}
static int msm_cvp_set_sysprop(struct msm_cvp_inst *inst,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
struct cvp_kmd_sys_properties *props = &arg->data.sys_properties;
struct cvp_kmd_sys_property *prop_array;
struct eva_kmd_sys_properties *props = &arg->data.sys_properties;
struct eva_kmd_sys_property *prop_array;
struct cvp_session_prop *session_prop;
int i, rc = 0;
@@ -1339,77 +1339,77 @@ static int msm_cvp_set_sysprop(struct msm_cvp_inst *inst,
for (i = 0; i < props->prop_num; i++) {
switch (prop_array[i].prop_type) {
case CVP_KMD_PROP_SESSION_TYPE:
case EVA_KMD_PROP_SESSION_TYPE:
session_prop->type = prop_array[i].data;
break;
case CVP_KMD_PROP_SESSION_KERNELMASK:
case EVA_KMD_PROP_SESSION_KERNELMASK:
session_prop->kernel_mask = prop_array[i].data;
break;
case CVP_KMD_PROP_SESSION_PRIORITY:
case EVA_KMD_PROP_SESSION_PRIORITY:
session_prop->priority = prop_array[i].data;
break;
case CVP_KMD_PROP_SESSION_SECURITY:
case EVA_KMD_PROP_SESSION_SECURITY:
session_prop->is_secure = prop_array[i].data;
break;
case CVP_KMD_PROP_SESSION_DSPMASK:
case EVA_KMD_PROP_SESSION_DSPMASK:
session_prop->dsp_mask = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FDU:
case EVA_KMD_PROP_PWR_FDU:
session_prop->fdu_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_ICA:
case EVA_KMD_PROP_PWR_ICA:
session_prop->ica_cycles =
div_by_1dot5(prop_array[i].data);
break;
case CVP_KMD_PROP_PWR_OD:
case EVA_KMD_PROP_PWR_OD:
session_prop->od_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_MPU:
case EVA_KMD_PROP_PWR_MPU:
session_prop->mpu_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FW:
case EVA_KMD_PROP_PWR_FW:
session_prop->fw_cycles =
div_by_1dot5(prop_array[i].data);
break;
case CVP_KMD_PROP_PWR_DDR:
case EVA_KMD_PROP_PWR_DDR:
session_prop->ddr_bw = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_SYSCACHE:
case EVA_KMD_PROP_PWR_SYSCACHE:
session_prop->ddr_cache = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FDU_OP:
case EVA_KMD_PROP_PWR_FDU_OP:
session_prop->fdu_op_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_ICA_OP:
case EVA_KMD_PROP_PWR_ICA_OP:
session_prop->ica_op_cycles =
div_by_1dot5(prop_array[i].data);
break;
case CVP_KMD_PROP_PWR_OD_OP:
case EVA_KMD_PROP_PWR_OD_OP:
session_prop->od_op_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_MPU_OP:
case EVA_KMD_PROP_PWR_MPU_OP:
session_prop->mpu_op_cycles = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FW_OP:
case EVA_KMD_PROP_PWR_FW_OP:
session_prop->fw_op_cycles =
div_by_1dot5(prop_array[i].data);
break;
case CVP_KMD_PROP_PWR_DDR_OP:
case EVA_KMD_PROP_PWR_DDR_OP:
session_prop->ddr_op_bw = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_SYSCACHE_OP:
case EVA_KMD_PROP_PWR_SYSCACHE_OP:
session_prop->ddr_op_cache = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FPS_FDU:
case EVA_KMD_PROP_PWR_FPS_FDU:
session_prop->fps[HFI_HW_FDU] = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FPS_MPU:
case EVA_KMD_PROP_PWR_FPS_MPU:
session_prop->fps[HFI_HW_MPU] = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FPS_OD:
case EVA_KMD_PROP_PWR_FPS_OD:
session_prop->fps[HFI_HW_OD] = prop_array[i].data;
break;
case CVP_KMD_PROP_PWR_FPS_ICA:
case EVA_KMD_PROP_PWR_FPS_ICA:
session_prop->fps[HFI_HW_ICA] = prop_array[i].data;
break;
default:
@@ -1740,7 +1740,7 @@ static int cvp_flush_frame(struct msm_cvp_inst *inst, u64 frame_id)
return rc;
}
int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct cvp_kmd_arg *arg)
int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct eva_kmd_arg *arg)
{
int rc = 0;
@@ -1750,9 +1750,9 @@ int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct cvp_kmd_arg *arg)
}
dprintk(CVP_HFI, "%s: arg->type = %x", __func__, arg->type);
if (arg->type != CVP_KMD_SESSION_CONTROL &&
arg->type != CVP_KMD_SET_SYS_PROPERTY &&
arg->type != CVP_KMD_GET_SYS_PROPERTY) {
if (arg->type != EVA_KMD_SESSION_CONTROL &&
arg->type != EVA_KMD_SET_SYS_PROPERTY &&
arg->type != EVA_KMD_GET_SYS_PROPERTY) {
rc = session_state_check_init(inst);
if (rc) {
@@ -1764,69 +1764,69 @@ int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct cvp_kmd_arg *arg)
}
switch (arg->type) {
case CVP_KMD_GET_SESSION_INFO:
case EVA_KMD_GET_SESSION_INFO:
{
struct cvp_kmd_session_info *session =
(struct cvp_kmd_session_info *)&arg->data.session;
struct eva_kmd_session_info *session =
(struct eva_kmd_session_info *)&arg->data.session;
rc = msm_cvp_get_session_info(inst, session);
break;
}
case CVP_KMD_UPDATE_POWER:
case EVA_KMD_UPDATE_POWER:
{
rc = msm_cvp_update_power(inst);
break;
}
case CVP_KMD_REGISTER_BUFFER:
case EVA_KMD_REGISTER_BUFFER:
{
struct cvp_kmd_buffer *buf =
(struct cvp_kmd_buffer *)&arg->data.regbuf;
struct eva_kmd_buffer *buf =
(struct eva_kmd_buffer *)&arg->data.regbuf;
rc = msm_cvp_register_buffer(inst, buf);
break;
}
case CVP_KMD_UNREGISTER_BUFFER:
case EVA_KMD_UNREGISTER_BUFFER:
{
struct cvp_kmd_buffer *buf =
(struct cvp_kmd_buffer *)&arg->data.unregbuf;
struct eva_kmd_buffer *buf =
(struct eva_kmd_buffer *)&arg->data.unregbuf;
rc = msm_cvp_unregister_buffer(inst, buf);
break;
}
case CVP_KMD_RECEIVE_MSG_PKT:
case EVA_KMD_RECEIVE_MSG_PKT:
{
struct cvp_kmd_hfi_packet *out_pkt =
(struct cvp_kmd_hfi_packet *)&arg->data.hfi_pkt;
struct eva_kmd_hfi_packet *out_pkt =
(struct eva_kmd_hfi_packet *)&arg->data.hfi_pkt;
rc = msm_cvp_session_receive_hfi(inst, out_pkt);
break;
}
case CVP_KMD_SEND_CMD_PKT:
case EVA_KMD_SEND_CMD_PKT:
{
struct cvp_kmd_hfi_packet *in_pkt =
(struct cvp_kmd_hfi_packet *)&arg->data.hfi_pkt;
struct eva_kmd_hfi_packet *in_pkt =
(struct eva_kmd_hfi_packet *)&arg->data.hfi_pkt;
rc = msm_cvp_session_process_hfi(inst, in_pkt,
arg->buf_offset, arg->buf_num);
break;
}
case CVP_KMD_SEND_FENCE_CMD_PKT:
case EVA_KMD_SEND_FENCE_CMD_PKT:
{
rc = msm_cvp_session_process_hfi_fence(inst, arg);
break;
}
case CVP_KMD_SESSION_CONTROL:
case EVA_KMD_SESSION_CONTROL:
rc = msm_cvp_session_ctrl(inst, arg);
break;
case CVP_KMD_GET_SYS_PROPERTY:
case EVA_KMD_GET_SYS_PROPERTY:
rc = msm_cvp_get_sysprop(inst, arg);
break;
case CVP_KMD_SET_SYS_PROPERTY:
case EVA_KMD_SET_SYS_PROPERTY:
rc = msm_cvp_set_sysprop(inst, arg);
break;
case CVP_KMD_FLUSH_ALL:
case EVA_KMD_FLUSH_ALL:
rc = cvp_flush_all(inst);
break;
case CVP_KMD_FLUSH_FRAME:
case EVA_KMD_FLUSH_FRAME:
rc = cvp_flush_frame(inst, arg->data.frame_id);
break;
default:

6
msm/eva/msm_cvp.h
Dosyayı Görüntüle

@@ -16,20 +16,20 @@ static inline bool is_buf_param_valid(u32 buf_num, u32 offset)
{
int max_buf_num;
max_buf_num = sizeof(struct cvp_kmd_hfi_packet) /
max_buf_num = sizeof(struct eva_kmd_hfi_packet) /
sizeof(struct cvp_buf_type);
if (buf_num > max_buf_num)
return false;
if ((offset + buf_num * sizeof(struct cvp_buf_type)) >
sizeof(struct cvp_kmd_hfi_packet))
sizeof(struct eva_kmd_hfi_packet))
return false;
return true;
}
int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct cvp_kmd_arg *arg);
int msm_cvp_handle_syscall(struct msm_cvp_inst *inst, struct eva_kmd_arg *arg);
int msm_cvp_session_init(struct msm_cvp_inst *inst);
int msm_cvp_session_deinit(struct msm_cvp_inst *inst);
int msm_cvp_session_queue_stop(struct msm_cvp_inst *inst);

22
msm/eva/msm_cvp_buf.c
Dosyayı Görüntüle

@@ -69,7 +69,7 @@ void print_cvp_buffer(u32 tag, const char *str, struct msm_cvp_inst *inst,
}
void print_client_buffer(u32 tag, const char *str,
struct msm_cvp_inst *inst, struct cvp_kmd_buffer *cbuf)
struct msm_cvp_inst *inst, struct eva_kmd_buffer *cbuf)
{
if (!(tag & msm_cvp_debug) || !inst || !cbuf)
return;
@@ -80,7 +80,7 @@ void print_client_buffer(u32 tag, const char *str,
cbuf->offset, cbuf->size, cbuf->type, cbuf->flags);
}
int msm_cvp_map_buf_dsp(struct msm_cvp_inst *inst, struct cvp_kmd_buffer *buf)
int msm_cvp_map_buf_dsp(struct msm_cvp_inst *inst, struct eva_kmd_buffer *buf)
{
int rc = 0;
bool found = false;
@@ -193,7 +193,7 @@ exit:
return rc;
}
int msm_cvp_unmap_buf_dsp(struct msm_cvp_inst *inst, struct cvp_kmd_buffer *buf)
int msm_cvp_unmap_buf_dsp(struct msm_cvp_inst *inst, struct eva_kmd_buffer *buf)
{
int rc = 0;
bool found;
@@ -265,10 +265,10 @@ void msm_cvp_cache_operations(struct msm_cvp_smem *smem, u32 type,
}
switch (type) {
case CVP_KMD_BUFTYPE_INPUT:
case EVA_KMD_BUFTYPE_INPUT:
cache_op = SMEM_CACHE_CLEAN;
break;
case CVP_KMD_BUFTYPE_OUTPUT:
case EVA_KMD_BUFTYPE_OUTPUT:
cache_op = SMEM_CACHE_INVALIDATE;
break;
default:
@@ -485,7 +485,7 @@ u32 msm_cvp_map_frame_buf(struct msm_cvp_inst *inst,
frame->nr++;
type = CVP_KMD_BUFTYPE_INPUT | CVP_KMD_BUFTYPE_OUTPUT;
type = EVA_KMD_BUFTYPE_INPUT | EVA_KMD_BUFTYPE_OUTPUT;
msm_cvp_cache_operations(smem, type, buf->offset, buf->size);
iova = smem->device_addr + buf->offset;
@@ -501,7 +501,7 @@ static void msm_cvp_unmap_frame_buf(struct msm_cvp_inst *inst,
struct msm_cvp_smem *smem = NULL;
struct cvp_internal_buf *buf;
type = CVP_KMD_BUFTYPE_OUTPUT;
type = EVA_KMD_BUFTYPE_OUTPUT;
for (i = 0; i < frame->nr; ++i) {
buf = &frame->bufs[i];
@@ -560,7 +560,7 @@ void msm_cvp_unmap_frame(struct msm_cvp_inst *inst, u64 ktid)
}
int msm_cvp_unmap_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num)
{
struct cvp_hfi_cmd_session_hdr *cmd_hdr;
@@ -611,7 +611,7 @@ int msm_cvp_unmap_user_persist(struct msm_cvp_inst *inst,
}
int msm_cvp_mark_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num)
{
struct cvp_hfi_cmd_session_hdr *cmd_hdr;
@@ -660,7 +660,7 @@ int msm_cvp_mark_user_persist(struct msm_cvp_inst *inst,
}
int msm_cvp_map_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num)
{
struct cvp_buf_type *buf;
@@ -691,7 +691,7 @@ int msm_cvp_map_user_persist(struct msm_cvp_inst *inst,
}
int msm_cvp_map_frame(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num)
{
struct cvp_buf_type *buf;

14
msm/eva/msm_cvp_buf.h
Dosyayı Görüntüle

@@ -142,7 +142,7 @@ void print_cvp_buffer(u32 tag, const char *str,
struct cvp_internal_buf *cbuf);
void print_client_buffer(u32 tag, const char *str,
struct msm_cvp_inst *inst,
struct cvp_kmd_buffer *cbuf);
struct eva_kmd_buffer *cbuf);
void print_smem(u32 tag, const char *str,
struct msm_cvp_inst *inst,
struct msm_cvp_smem *smem);
@@ -173,25 +173,25 @@ struct cvp_internal_buf *cvp_allocate_arp_bufs(struct msm_cvp_inst *inst,
u32 buffer_size);
int cvp_release_arp_buffers(struct msm_cvp_inst *inst);
int msm_cvp_map_buf_dsp(struct msm_cvp_inst *inst,
struct cvp_kmd_buffer *buf);
struct eva_kmd_buffer *buf);
int msm_cvp_unmap_buf_dsp(struct msm_cvp_inst *inst,
struct cvp_kmd_buffer *buf);
struct eva_kmd_buffer *buf);
void msm_cvp_cache_operations(struct msm_cvp_smem *smem,
u32 type, u32 offset, u32 size);
u32 msm_cvp_map_frame_buf(struct msm_cvp_inst *inst,
struct cvp_buf_type *buf,
struct msm_cvp_frame *frame);
int msm_cvp_mark_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num);
int msm_cvp_map_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num);
int msm_cvp_unmap_user_persist(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num);
int msm_cvp_map_frame(struct msm_cvp_inst *inst,
struct cvp_kmd_hfi_packet *in_pkt,
struct eva_kmd_hfi_packet *in_pkt,
unsigned int offset, unsigned int buf_num);
void msm_cvp_unmap_frame(struct msm_cvp_inst *inst, u64 ktid);
int msm_cvp_session_deinit_buffers(struct msm_cvp_inst *inst);

2
msm/eva/msm_cvp_core.c
Dosyayı Görüntüle

@@ -34,7 +34,7 @@ int msm_cvp_poll(void *instance, struct file *filp,
EXPORT_SYMBOL(msm_cvp_poll);
int msm_cvp_private(void *cvp_inst, unsigned int cmd,
struct cvp_kmd_arg *arg)
struct eva_kmd_arg *arg)
{
int rc = 0;
struct msm_cvp_inst *inst = (struct msm_cvp_inst *)cvp_inst;

2
msm/eva/msm_cvp_core.h
Dosyayı Görüntüle

@@ -35,6 +35,6 @@ int msm_cvp_suspend(int core_id);
int msm_cvp_poll(void *instance, struct file *filp,
struct poll_table_struct *pt);
int msm_cvp_private(void *cvp_inst, unsigned int cmd,
struct cvp_kmd_arg *arg);
struct eva_kmd_arg *arg);
#endif

168
msm/eva/msm_cvp_ioctl.c
Dosyayı Görüntüle

@@ -7,10 +7,10 @@
#include "cvp_private.h"
#include "cvp_hfi_api.h"
static int _get_pkt_hdr_from_user(struct cvp_kmd_arg __user *up,
static int _get_pkt_hdr_from_user(struct eva_kmd_arg __user *up,
struct cvp_hal_session_cmd_pkt *pkt_hdr)
{
struct cvp_kmd_hfi_packet *u;
struct eva_kmd_hfi_packet *u;
struct cvp_hfi_msg_session_hdr *hdr;
hdr = (struct cvp_hfi_msg_session_hdr *)pkt_hdr;
@@ -41,10 +41,10 @@ set_default_pkt_hdr:
return 0;
}
static int _get_fence_pkt_hdr_from_user(struct cvp_kmd_arg __user *up,
static int _get_fence_pkt_hdr_from_user(struct eva_kmd_arg __user *up,
struct cvp_hal_session_cmd_pkt *pkt_hdr)
{
struct cvp_kmd_hfi_synx_packet __user *u;
struct eva_kmd_hfi_synx_packet __user *u;
u = &up->data.hfi_synx_pkt;
@@ -61,11 +61,11 @@ static int _get_fence_pkt_hdr_from_user(struct cvp_kmd_arg __user *up,
}
/* Size is in unit of u32 */
static int _copy_pkt_from_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up,
static int _copy_pkt_from_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up,
unsigned int size)
{
struct cvp_kmd_hfi_packet *k, *u;
struct eva_kmd_hfi_packet *k, *u;
int i;
k = &kp->data.hfi_pkt;
@@ -78,8 +78,8 @@ static int _copy_pkt_from_user(struct cvp_kmd_arg *kp,
}
static int _copy_synx_data_from_user(
struct cvp_kmd_hfi_synx_packet *k,
struct cvp_kmd_hfi_synx_packet __user *u)
struct eva_kmd_hfi_synx_packet *k,
struct eva_kmd_hfi_synx_packet __user *u)
{
int i;
@@ -93,8 +93,8 @@ static int _copy_synx_data_from_user(
/* Size is in unit of u32 */
static int _copy_fence_data_from_user_deprecate(
struct cvp_kmd_hfi_fence_packet *k,
struct cvp_kmd_hfi_fence_packet __user *u)
struct eva_kmd_hfi_fence_packet *k,
struct eva_kmd_hfi_fence_packet __user *u)
{
int i;
@@ -111,11 +111,11 @@ static int _copy_fence_data_from_user_deprecate(
return 0;
}
static int _copy_fence_pkt_from_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up)
{ struct cvp_kmd_hfi_synx_packet *k;
struct cvp_kmd_hfi_synx_packet __user *u;
struct cvp_kmd_hfi_fence_packet __user *u1;
static int _copy_fence_pkt_from_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up)
{ struct eva_kmd_hfi_synx_packet *k;
struct eva_kmd_hfi_synx_packet __user *u;
struct eva_kmd_hfi_fence_packet __user *u1;
int i;
k = &kp->data.hfi_synx_pkt;
@@ -133,11 +133,11 @@ static int _copy_fence_pkt_from_user(struct cvp_kmd_arg *kp,
return _copy_synx_data_from_user(k, u);
else
return _copy_fence_data_from_user_deprecate(
(struct cvp_kmd_hfi_fence_packet *)k, u1);
(struct eva_kmd_hfi_fence_packet *)k, u1);
}
static int _copy_frameid_from_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up)
static int _copy_frameid_from_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up)
{
if (get_user(kp->data.frame_id, &up->data.frame_id)) {
dprintk(CVP_ERR, "Failed to get frame id from user\n");
@@ -147,10 +147,10 @@ static int _copy_frameid_from_user(struct cvp_kmd_arg *kp,
return 0;
}
static int _copy_sysprop_from_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up)
static int _copy_sysprop_from_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up)
{
struct cvp_kmd_sys_properties *k, *u;
struct eva_kmd_sys_properties *k, *u;
k = &kp->data.sys_properties;
u = &up->data.sys_properties;
@@ -164,14 +164,14 @@ static int _copy_sysprop_from_user(struct cvp_kmd_arg *kp,
}
return _copy_pkt_from_user(kp, up,
(k->prop_num*((sizeof(struct cvp_kmd_sys_property)>>2)+1)));
(k->prop_num*((sizeof(struct eva_kmd_sys_property)>>2)+1)));
}
static int _copy_pkt_to_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up,
static int _copy_pkt_to_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up,
unsigned int size)
{
struct cvp_kmd_hfi_packet *k, *u;
struct eva_kmd_hfi_packet *k, *u;
int i;
k = &kp->data.hfi_pkt;
@@ -183,11 +183,11 @@ static int _copy_pkt_to_user(struct cvp_kmd_arg *kp,
return 0;
}
static int _copy_fence_pkt_to_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up)
static int _copy_fence_pkt_to_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up)
{
struct cvp_kmd_hfi_synx_packet *k;
struct cvp_kmd_hfi_synx_packet __user *u;
struct eva_kmd_hfi_synx_packet *k;
struct eva_kmd_hfi_synx_packet __user *u;
int i;
k = &kp->data.hfi_synx_pkt;
@@ -200,11 +200,11 @@ static int _copy_fence_pkt_to_user(struct cvp_kmd_arg *kp,
return 0;
}
static int _copy_sysprop_to_user(struct cvp_kmd_arg *kp,
struct cvp_kmd_arg __user *up)
static int _copy_sysprop_to_user(struct eva_kmd_arg *kp,
struct eva_kmd_arg __user *up)
{
struct cvp_kmd_sys_properties *k;
struct cvp_kmd_sys_properties __user *u;
struct eva_kmd_sys_properties *k;
struct eva_kmd_sys_properties __user *u;
int i;
k = &kp->data.sys_properties;
@@ -218,9 +218,9 @@ static int _copy_sysprop_to_user(struct cvp_kmd_arg *kp,
}
static void print_hfi_short(struct cvp_kmd_arg __user *up)
static void print_hfi_short(struct eva_kmd_arg __user *up)
{
struct cvp_kmd_hfi_packet *pkt;
struct eva_kmd_hfi_packet *pkt;
unsigned int words[5];
pkt = &up->data.hfi_pkt;
@@ -236,8 +236,8 @@ static void print_hfi_short(struct cvp_kmd_arg __user *up)
}
static int _copy_session_ctrl_to_user(
struct cvp_kmd_session_control *k,
struct cvp_kmd_session_control *u)
struct eva_kmd_session_control *k,
struct eva_kmd_session_control *u)
{
int i;
@@ -250,8 +250,8 @@ static int _copy_session_ctrl_to_user(
}
static int _get_session_ctrl_from_user(
struct cvp_kmd_session_control *k,
struct cvp_kmd_session_control *u)
struct eva_kmd_session_control *k,
struct eva_kmd_session_control *u)
{
int i;
@@ -265,8 +265,8 @@ static int _get_session_ctrl_from_user(
}
static int _get_session_info_from_user(
struct cvp_kmd_session_info *k,
struct cvp_kmd_session_info __user *u)
struct eva_kmd_session_info *k,
struct eva_kmd_session_info __user *u)
{
int i;
@@ -279,13 +279,13 @@ static int _get_session_info_from_user(
return 0;
}
static int convert_from_user(struct cvp_kmd_arg *kp,
static int convert_from_user(struct eva_kmd_arg *kp,
unsigned long arg,
struct msm_cvp_inst *inst)
{
int rc = 0;
int i;
struct cvp_kmd_arg __user *up = (struct cvp_kmd_arg *)arg;
struct eva_kmd_arg __user *up = (struct eva_kmd_arg *)arg;
struct cvp_hal_session_cmd_pkt pkt_hdr;
int pkt_idx;
@@ -304,10 +304,10 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
return -EFAULT;
switch (kp->type) {
case CVP_KMD_GET_SESSION_INFO:
case EVA_KMD_GET_SESSION_INFO:
{
struct cvp_kmd_session_info *k;
struct cvp_kmd_session_info __user *u;
struct eva_kmd_session_info *k;
struct eva_kmd_session_info __user *u;
k = &kp->data.session;
u = &up->data.session;
@@ -318,9 +318,9 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
break;
}
case CVP_KMD_REGISTER_BUFFER:
case EVA_KMD_REGISTER_BUFFER:
{
struct cvp_kmd_buffer *k, *u;
struct eva_kmd_buffer *k, *u;
k = &kp->data.regbuf;
u = &up->data.regbuf;
@@ -337,9 +337,9 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
return -EFAULT;
break;
}
case CVP_KMD_UNREGISTER_BUFFER:
case EVA_KMD_UNREGISTER_BUFFER:
{
struct cvp_kmd_buffer *k, *u;
struct eva_kmd_buffer *k, *u;
k = &kp->data.unregbuf;
u = &up->data.unregbuf;
@@ -356,7 +356,7 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
return -EFAULT;
break;
}
case CVP_KMD_SEND_CMD_PKT:
case EVA_KMD_SEND_CMD_PKT:
{
if (_get_pkt_hdr_from_user(up, &pkt_hdr)) {
dprintk(CVP_ERR, "Invalid syscall: %x, %x, %x\n",
@@ -367,7 +367,7 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
rc = _copy_pkt_from_user(kp, up, (pkt_hdr.size >> 2));
break;
}
case CVP_KMD_SEND_FENCE_CMD_PKT:
case EVA_KMD_SEND_FENCE_CMD_PKT:
{
if (_get_fence_pkt_hdr_from_user(up, &pkt_hdr)) {
dprintk(CVP_ERR, "Invalid syscall: %x, %x, %x\n",
@@ -389,11 +389,11 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
rc = _copy_fence_pkt_from_user(kp, up);
break;
}
case CVP_KMD_RECEIVE_MSG_PKT:
case EVA_KMD_RECEIVE_MSG_PKT:
break;
case CVP_KMD_SESSION_CONTROL:
case EVA_KMD_SESSION_CONTROL:
{
struct cvp_kmd_session_control *k, *u;
struct eva_kmd_session_control *k, *u;
k = &kp->data.session_ctrl;
u = &up->data.session_ctrl;
@@ -401,7 +401,7 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
rc = _get_session_ctrl_from_user(k, u);
break;
}
case CVP_KMD_GET_SYS_PROPERTY:
case EVA_KMD_GET_SYS_PROPERTY:
{
if (_copy_sysprop_from_user(kp, up)) {
dprintk(CVP_ERR, "Failed to get sysprop from user\n");
@@ -409,7 +409,7 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
}
break;
}
case CVP_KMD_SET_SYS_PROPERTY:
case EVA_KMD_SET_SYS_PROPERTY:
{
if (_copy_sysprop_from_user(kp, up)) {
dprintk(CVP_ERR, "Failed to set sysprop from user\n");
@@ -417,10 +417,10 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
}
break;
}
case CVP_KMD_FLUSH_ALL:
case CVP_KMD_UPDATE_POWER:
case EVA_KMD_FLUSH_ALL:
case EVA_KMD_UPDATE_POWER:
break;
case CVP_KMD_FLUSH_FRAME:
case EVA_KMD_FLUSH_FRAME:
{
if (_copy_frameid_from_user(kp, up))
return -EFAULT;
@@ -437,8 +437,8 @@ static int convert_from_user(struct cvp_kmd_arg *kp,
}
static int _put_user_session_info(
struct cvp_kmd_session_info *k,
struct cvp_kmd_session_info __user *u)
struct eva_kmd_session_info *k,
struct eva_kmd_session_info __user *u)
{
int i;
@@ -452,11 +452,11 @@ static int _put_user_session_info(
return 0;
}
static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
static int convert_to_user(struct eva_kmd_arg *kp, unsigned long arg)
{
int rc = 0;
int i, size;
struct cvp_kmd_arg __user *up = (struct cvp_kmd_arg *)arg;
struct eva_kmd_arg __user *up = (struct eva_kmd_arg *)arg;
struct cvp_hal_session_cmd_pkt pkt_hdr;
if (!kp || !up) {
@@ -468,9 +468,9 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
return -EFAULT;
switch (kp->type) {
case CVP_KMD_RECEIVE_MSG_PKT:
case EVA_KMD_RECEIVE_MSG_PKT:
{
struct cvp_kmd_hfi_packet *k, *u;
struct eva_kmd_hfi_packet *k, *u;
struct cvp_hfi_msg_session_hdr *hdr;
k = &kp->data.hfi_pkt;
@@ -482,10 +482,10 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
return -EFAULT;
break;
}
case CVP_KMD_GET_SESSION_INFO:
case EVA_KMD_GET_SESSION_INFO:
{
struct cvp_kmd_session_info *k;
struct cvp_kmd_session_info __user *u;
struct eva_kmd_session_info *k;
struct eva_kmd_session_info __user *u;
k = &kp->data.session;
u = &up->data.session;
@@ -496,9 +496,9 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
break;
}
case CVP_KMD_REGISTER_BUFFER:
case EVA_KMD_REGISTER_BUFFER:
{
struct cvp_kmd_buffer *k, *u;
struct eva_kmd_buffer *k, *u;
k = &kp->data.regbuf;
u = &up->data.regbuf;
@@ -515,9 +515,9 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
return -EFAULT;
break;
}
case CVP_KMD_UNREGISTER_BUFFER:
case EVA_KMD_UNREGISTER_BUFFER:
{
struct cvp_kmd_buffer *k, *u;
struct eva_kmd_buffer *k, *u;
k = &kp->data.unregbuf;
u = &up->data.unregbuf;
@@ -534,7 +534,7 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
return -EFAULT;
break;
}
case CVP_KMD_SEND_CMD_PKT:
case EVA_KMD_SEND_CMD_PKT:
{
if (_get_pkt_hdr_from_user(up, &pkt_hdr))
return -EFAULT;
@@ -544,7 +544,7 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
rc = _copy_pkt_to_user(kp, up, (pkt_hdr.size >> 2));
break;
}
case CVP_KMD_SEND_FENCE_CMD_PKT:
case EVA_KMD_SEND_FENCE_CMD_PKT:
{
if (_get_fence_pkt_hdr_from_user(up, &pkt_hdr))
return -EFAULT;
@@ -555,16 +555,16 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
rc = _copy_fence_pkt_to_user(kp, up);
break;
}
case CVP_KMD_SESSION_CONTROL:
case EVA_KMD_SESSION_CONTROL:
{
struct cvp_kmd_session_control *k, *u;
struct eva_kmd_session_control *k, *u;
k = &kp->data.session_ctrl;
u = &up->data.session_ctrl;
rc = _copy_session_ctrl_to_user(k, u);
break;
}
case CVP_KMD_GET_SYS_PROPERTY:
case EVA_KMD_GET_SYS_PROPERTY:
{
if (_copy_sysprop_to_user(kp, up)) {
dprintk(CVP_ERR, "Fail to copy sysprop to user\n");
@@ -572,10 +572,10 @@ static int convert_to_user(struct cvp_kmd_arg *kp, unsigned long arg)
}
break;
}
case CVP_KMD_FLUSH_ALL:
case CVP_KMD_FLUSH_FRAME:
case CVP_KMD_SET_SYS_PROPERTY:
case CVP_KMD_UPDATE_POWER:
case EVA_KMD_FLUSH_ALL:
case EVA_KMD_FLUSH_FRAME:
case EVA_KMD_SET_SYS_PROPERTY:
case EVA_KMD_UPDATE_POWER:
break;
default:
dprintk(CVP_ERR, "%s: unknown cmd type 0x%x\n",
@@ -591,7 +591,7 @@ static long cvp_ioctl(struct msm_cvp_inst *inst,
unsigned int cmd, unsigned long arg)
{
int rc;
struct cvp_kmd_arg *karg;
struct eva_kmd_arg *karg;
if (!inst) {
dprintk(CVP_ERR, "%s: invalid params\n", __func__);