---

yaml
---
r: 377167
b: refs/heads/master
c: bdea0d2
h: refs/heads/master
i:
  377165: b2dcb12
  377163: d6ac653
  377159: 5cc30b2
  377151: 3899324
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0391dc17bd5d7d6b1706d0be6472c4b352b57c05
+refs/heads/master: bdea0d222a21f864a811cf6666532334e622f7c6

trunk/drivers/media/platform/davinci/vpbe_display.c

@@ -916,6 +916,21 @@ static int vpbe_display_s_fmt(struct file *file, void *priv,
 	other video window */
 
 	layer->pix_fmt = *pixfmt;
+	if (pixfmt->pixelformat == V4L2_PIX_FMT_NV12) {
+		struct vpbe_layer *otherlayer;
+
+		otherlayer = _vpbe_display_get_other_win_layer(disp_dev, layer);
+		/* if other layer is available, only
+		 * claim it, do not configure it
+		 */
+		ret = osd_device->ops.request_layer(osd_device,
+						    otherlayer->layer_info.id);
+		if (ret < 0) {
+			v4l2_err(&vpbe_dev->v4l2_dev,
+				 "Display Manager failed to allocate layer\n");
+			return -EBUSY;
+		}
+	}
 
 	/* Get osd layer config */
 	osd_device->ops.get_layer_config(osd_device,