evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: sde: Remove output fence object after user request completed"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-23 05:56:52 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9bda357a1a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c
View file

@ -480,7 +480,7 @@ static void sde_rotator_stop_streaming(struct vb2_queue *q)
struct sde_rotator_vbinfo *vbinfo = struct sde_rotator_vbinfo *vbinfo =
&ctx->vbinfo_cap[i]; &ctx->vbinfo_cap[i];
if (vbinfo->fence && vbinfo->fd < 0) { if (vbinfo->fence) {
/* fence is not used */ /* fence is not used */
SDEDEV_DBG(rot_dev->dev, SDEDEV_DBG(rot_dev->dev,
"put fence s:%d t:%d i:%d\n", "put fence s:%d t:%d i:%d\n",
@ -1457,7 +1457,7 @@ static int sde_rotator_dqbuf(struct file *file,
&& (buf->index < ctx->nbuf_cap)) { && (buf->index < ctx->nbuf_cap)) {
int idx = buf->index; int idx = buf->index;
if (ctx->vbinfo_cap[idx].fence && ctx->vbinfo_cap[idx].fd < 0) { if (ctx->vbinfo_cap[idx].fence) {
/* fence is not used */ /* fence is not used */
SDEDEV_DBG(ctx->rot_dev->dev, "put fence s:%d i:%d\n", SDEDEV_DBG(ctx->rot_dev->dev, "put fence s:%d i:%d\n",
ctx->session_id, idx); ctx->session_id, idx);
@ -1854,6 +1854,7 @@ static long sde_rotator_private_ioctl(struct file *file, void *fh,
ctx->session_id); ctx->session_id);
return vbinfo->fd; return vbinfo->fd;
} }
vbinfo->fence = NULL;
} }
fence->fd = vbinfo->fd; fence->fd = vbinfo->fd;