redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] vpbe_display: convert g/s_crop to g/s_selection 

This is part of a final push to convert all drivers to g/s_selection.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Prabhakar Lad <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
hifive-unleashed-5.1
Hans Verkuil 2016-07-03 07:53:31 -03:00 committed by Mauro Carvalho Chehab
parent ffc2a6bb55
commit 516aca3333
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/media/platform/davinci/vpbe_display.c
View File

@ -440,7 +440,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,
/* /*
* Application initially set the image format. Current display * Application initially set the image format. Current display
* size is obtained from the vpbe display controller. expected_xsize * size is obtained from the vpbe display controller. expected_xsize
* and expected_ysize are set through S_CROP ioctl. Based on this, * and expected_ysize are set through S_SELECTION ioctl. Based on this,
* driver will calculate the scale factors for vertical and * driver will calculate the scale factors for vertical and
* horizontal direction so that the image is displayed scaled * horizontal direction so that the image is displayed scaled
* and expanded. Application uses expansion to display the image * and expanded. Application uses expansion to display the image
@ -649,24 +649,23 @@ static int vpbe_display_querycap(struct file *file, void *priv,
return 0; return 0;
} }
static int vpbe_display_s_crop(struct file *file, void *priv, static int vpbe_display_s_selection(struct file *file, void *priv,
const struct v4l2_crop *crop) struct v4l2_selection *sel)
{ {
struct vpbe_layer *layer = video_drvdata(file); struct vpbe_layer *layer = video_drvdata(file);
struct vpbe_display *disp_dev = layer->disp_dev; struct vpbe_display *disp_dev = layer->disp_dev;
struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
struct osd_layer_config *cfg = &layer->layer_info.config; struct osd_layer_config *cfg = &layer->layer_info.config;
struct osd_state *osd_device = disp_dev->osd_device; struct osd_state *osd_device = disp_dev->osd_device;
struct v4l2_rect rect = crop->c; struct v4l2_rect rect = sel->r;
int ret; int ret;
v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
"VIDIOC_S_CROP, layer id = %d\n", layer->device_id); "VIDIOC_S_SELECTION, layer id = %d\n", layer->device_id);
if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) { if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n"); sel->target != V4L2_SEL_TGT_CROP)
return -EINVAL; return -EINVAL;
}
if (rect.top < 0) if (rect.top < 0)
rect.top = 0; rect.top = 0;
@ -714,32 +713,45 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
else else
osd_device->ops.set_interpolation_filter(osd_device, 0); osd_device->ops.set_interpolation_filter(osd_device, 0);
sel->r = rect;
return 0; return 0;
} }
static int vpbe_display_g_crop(struct file *file, void *priv, static int vpbe_display_g_selection(struct file *file, void *priv,
struct v4l2_crop *crop) struct v4l2_selection *sel)
{ {
struct vpbe_layer *layer = video_drvdata(file); struct vpbe_layer *layer = video_drvdata(file);
struct osd_layer_config *cfg = &layer->layer_info.config; struct osd_layer_config *cfg = &layer->layer_info.config;
struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
struct osd_state *osd_device = layer->disp_dev->osd_device; struct osd_state *osd_device = layer->disp_dev->osd_device;
struct v4l2_rect *rect = &crop->c; struct v4l2_rect *rect = &sel->r;
v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
"VIDIOC_G_CROP, layer id = %d\n", "VIDIOC_G_SELECTION, layer id = %d\n",
layer->device_id); layer->device_id);
if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) { if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n"); return -EINVAL;
switch (sel->target) {
case V4L2_SEL_TGT_CROP:
osd_device->ops.get_layer_config(osd_device,
layer->layer_info.id, cfg);
rect->top = cfg->ypos;
rect->left = cfg->xpos;
rect->width = cfg->xsize;
rect->height = cfg->ysize;
break;
case V4L2_SEL_TGT_CROP_DEFAULT:
case V4L2_SEL_TGT_CROP_BOUNDS:
rect->left = 0;
rect->top = 0;
rect->width = vpbe_dev->current_timings.xres;
rect->height = vpbe_dev->current_timings.yres;
break;
default:
return -EINVAL; return -EINVAL;
} }
osd_device->ops.get_layer_config(osd_device,
layer->layer_info.id, cfg);
rect->top = cfg->ypos;
rect->left = cfg->xpos;
rect->width = cfg->xsize;
rect->height = cfg->ysize;
return 0; return 0;
} }
@ -752,13 +764,10 @@ static int vpbe_display_cropcap(struct file *file, void *priv,
v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_CROPCAP ioctl\n"); v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_CROPCAP ioctl\n");
cropcap->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
cropcap->bounds.left = 0; return -EINVAL;
cropcap->bounds.top = 0;
cropcap->bounds.width = vpbe_dev->current_timings.xres;
cropcap->bounds.height = vpbe_dev->current_timings.yres;
cropcap->pixelaspect = vpbe_dev->current_timings.aspect; cropcap->pixelaspect = vpbe_dev->current_timings.aspect;
cropcap->defrect = cropcap->bounds;
return 0; return 0;
} }
@ -1251,8 +1260,8 @@ static const struct v4l2_ioctl_ops vpbe_ioctl_ops = {
.vidioc_expbuf = vb2_ioctl_expbuf, .vidioc_expbuf = vb2_ioctl_expbuf,
.vidioc_cropcap = vpbe_display_cropcap, .vidioc_cropcap = vpbe_display_cropcap,
.vidioc_g_crop = vpbe_display_g_crop, .vidioc_g_selection = vpbe_display_g_selection,
.vidioc_s_crop = vpbe_display_s_crop, .vidioc_s_selection = vpbe_display_s_selection,
.vidioc_s_std = vpbe_display_s_std, .vidioc_s_std = vpbe_display_s_std,
.vidioc_g_std = vpbe_display_g_std, .vidioc_g_std = vpbe_display_g_std,