samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Bifurcation 0
Code Tickets Demandes d'ajout Actions Paquets Projets Publications Wiki Activité

Merge "video: driver: remove unsupported ioctls from ioctls ops"

Parcourir la source
Cette révision appartient à :
qctecmdr
2021-09-03 18:00:54 -07:00
révisé par Gerrit - the friendly Code Review server
Parent 5735f81874 034d732cc7
révision 00630500c4
3 fichiers modifiés avec 47 ajouts et 5 suppressions
Télécharger le Fichier Patch Télécharger le Fichier des Différences Développer tous les fichiers Réduire tous les fichiers

3
driver/vidc/inc/msm_vidc_core.h
Voir le fichier

@@ -99,7 +99,8 @@ struct msm_vidc_core {
u32 packet_size;
u8 *response_packet;
struct v4l2_file_operations *v4l2_file_ops;
struct v4l2_ioctl_ops *v4l2_ioctl_ops;
struct v4l2_ioctl_ops *v4l2_ioctl_ops_enc;
struct v4l2_ioctl_ops *v4l2_ioctl_ops_dec;
struct v4l2_ctrl_ops *v4l2_ctrl_ops;
struct vb2_ops *vb2_ops;
struct vb2_mem_ops *vb2_mem_ops;

44
driver/vidc/src/msm_vidc_platform.c
Voir le fichier

@@ -20,7 +20,45 @@ static struct v4l2_file_operations msm_v4l2_file_operations = {
.poll = msm_v4l2_poll,
};
static struct v4l2_ioctl_ops msm_v4l2_ioctl_ops = {
static struct v4l2_ioctl_ops msm_v4l2_ioctl_ops_enc = {
.vidioc_querycap = msm_v4l2_querycap,
.vidioc_enum_fmt_vid_cap = msm_v4l2_enum_fmt,
.vidioc_enum_fmt_vid_out = msm_v4l2_enum_fmt,
.vidioc_enum_framesizes = msm_v4l2_enum_framesizes,
.vidioc_enum_frameintervals = msm_v4l2_enum_frameintervals,
.vidioc_try_fmt_vid_cap_mplane = msm_v4l2_try_fmt,
.vidioc_try_fmt_vid_out_mplane = msm_v4l2_try_fmt,
.vidioc_s_fmt_vid_cap = msm_v4l2_s_fmt,
.vidioc_s_fmt_vid_out = msm_v4l2_s_fmt,
.vidioc_s_fmt_vid_cap_mplane = msm_v4l2_s_fmt,
.vidioc_s_fmt_vid_out_mplane = msm_v4l2_s_fmt,
.vidioc_s_fmt_meta_out = msm_v4l2_s_fmt,
.vidioc_s_fmt_meta_cap = msm_v4l2_s_fmt,
.vidioc_g_fmt_vid_cap = msm_v4l2_g_fmt,
.vidioc_g_fmt_vid_out = msm_v4l2_g_fmt,
.vidioc_g_fmt_vid_cap_mplane = msm_v4l2_g_fmt,
.vidioc_g_fmt_vid_out_mplane = msm_v4l2_g_fmt,
.vidioc_g_fmt_meta_out = msm_v4l2_g_fmt,
.vidioc_g_fmt_meta_cap = msm_v4l2_g_fmt,
.vidioc_g_selection = msm_v4l2_g_selection,
.vidioc_s_selection = msm_v4l2_s_selection,
.vidioc_s_parm = msm_v4l2_s_parm,
.vidioc_g_parm = msm_v4l2_g_parm,
.vidioc_reqbufs = msm_v4l2_reqbufs,
.vidioc_qbuf = msm_v4l2_qbuf,
.vidioc_dqbuf = msm_v4l2_dqbuf,
.vidioc_streamon = msm_v4l2_streamon,
.vidioc_streamoff = msm_v4l2_streamoff,
.vidioc_s_ctrl = msm_v4l2_s_ctrl,
.vidioc_g_ctrl = msm_v4l2_g_ctrl,
.vidioc_queryctrl = msm_v4l2_queryctrl,
.vidioc_querymenu = msm_v4l2_querymenu,
.vidioc_subscribe_event = msm_v4l2_subscribe_event,
.vidioc_unsubscribe_event = msm_v4l2_unsubscribe_event,
.vidioc_encoder_cmd = msm_v4l2_encoder_cmd,
};
static struct v4l2_ioctl_ops msm_v4l2_ioctl_ops_dec = {
.vidioc_querycap = msm_v4l2_querycap,
.vidioc_enum_fmt_vid_cap = msm_v4l2_enum_fmt,
.vidioc_enum_fmt_vid_out = msm_v4l2_enum_fmt,
@@ -56,7 +94,6 @@ static struct v4l2_ioctl_ops msm_v4l2_ioctl_ops = {
.vidioc_subscribe_event = msm_v4l2_subscribe_event,
.vidioc_unsubscribe_event = msm_v4l2_unsubscribe_event,
.vidioc_decoder_cmd = msm_v4l2_decoder_cmd,
.vidioc_encoder_cmd = msm_v4l2_encoder_cmd,
};
static struct v4l2_ctrl_ops msm_v4l2_ctrl_ops = {
@@ -89,7 +126,8 @@ static int msm_vidc_init_ops(struct msm_vidc_core *core)
d_vpr_h("%s: initialize ops\n", __func__);
core->v4l2_file_ops = &msm_v4l2_file_operations;
core->v4l2_ioctl_ops = &msm_v4l2_ioctl_ops;
core->v4l2_ioctl_ops_enc = &msm_v4l2_ioctl_ops_enc;
core->v4l2_ioctl_ops_dec = &msm_v4l2_ioctl_ops_dec;
core->v4l2_ctrl_ops = &msm_v4l2_ctrl_ops;
core->vb2_ops = &msm_vb2_ops;
core->vb2_mem_ops = &msm_vb2_mem_ops;

5
driver/vidc/src/msm_vidc_probe.c
Voir le fichier

@@ -140,7 +140,10 @@ static int msm_vidc_register_video_device(struct msm_vidc_core *core,
core->vdev[index].vdev.release =
msm_vidc_release_video_device;
core->vdev[index].vdev.fops = core->v4l2_file_ops;
core->vdev[index].vdev.ioctl_ops = core->v4l2_ioctl_ops;
if (type == MSM_VIDC_DECODER)
core->vdev[index].vdev.ioctl_ops = core->v4l2_ioctl_ops_dec;
else
core->vdev[index].vdev.ioctl_ops = core->v4l2_ioctl_ops_enc;
core->vdev[index].vdev.vfl_dir = VFL_DIR_M2M;
core->vdev[index].type = type;
core->vdev[index].vdev.v4l2_dev = &core->v4l2_dev;