From patchwork Fri May 3 09:53:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 2516561 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork2.kernel.org (Postfix) with ESMTP id A3367DF2E5 for ; Fri, 3 May 2013 09:55:41 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r439raH1015042; Fri, 3 May 2013 04:53:37 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r439ra3Y021841; Fri, 3 May 2013 04:53:36 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Fri, 3 May 2013 04:53:36 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r439rZ4W005454; Fri, 3 May 2013 04:53:36 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 7AA3080627; Fri, 3 May 2013 04:53:35 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 93C9780626 for ; Fri, 3 May 2013 04:53:33 -0500 (CDT) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id r439rXki006046 for ; Fri, 3 May 2013 04:53:33 -0500 (CDT) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id r439rWS1011627 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 3 May 2013 04:53:33 -0500 Received: from [216.82.253.163:43313] by server-16.bemta-7.messagelabs.com id 46/74-01807-C1983815; Fri, 03 May 2013 09:53:32 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-12.tower-166.messagelabs.com!1367574810!2801272!1 X-Originating-IP: [209.85.192.170] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2344 invoked from network); 3 May 2013 09:53:31 -0000 Received: from mail-pd0-f170.google.com (HELO mail-pd0-f170.google.com) (209.85.192.170) by server-12.tower-166.messagelabs.com with RC4-SHA encrypted SMTP; 3 May 2013 09:53:31 -0000 Received: by mail-pd0-f170.google.com with SMTP id 10so837583pdi.29 for ; Fri, 03 May 2013 02:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=tg0nEaO+F5f4wKgSPIWeA/kUSX+QeRnplpKBwp3FCN8=; b=WFbkX0XYMaqieAIHrm/AIKhSaOxywbcC1zORzhlmi+FXs/YU5KvM424+h1hLmhPjOz yPDvpqj32CyHyMCCNmAuXz/Qao3/HTDSu2YzREFdb++7gqkOakKmht9tElF5wRFG0mXr +UjIqBlhbhNm6MnOCoBYMvJWI0heGFRHCTkNnxbpY32gTESuU1f3kadC5OKvqOQ+Sz81 qsLgnw8CVtbSx2XIAD2cSTSZBIn2SvpKf5zlkxUHR3kQcjk0EQfcgzrhDpjcLFIm7Nz5 3H4xC5czER37F8TOll7wR3O8AFJO/LRqSb8zMrxmaovx1J5DkoQ8PFnsTvhkdTGPjuBP zuPQ== X-Received: by 10.66.177.46 with SMTP id cn14mr14386628pac.4.1367574791771; Fri, 03 May 2013 02:53:11 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id qi1sm12150775pac.21.2013.05.03.02.53.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 02:53:10 -0700 (PDT) From: Prabhakar Lad To: LMML , Mauro Carvalho Chehab Subject: [PATCH] media: davinci: vpbe: fix layer availability for NV12 format Date: Fri, 3 May 2013 15:23:03 +0530 Message-ID: <1367574783-19090-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 CC: DLOS , LKML X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Lad, Prabhakar For NV12 format, even if display data is single image, both VIDWIN0 and VIDWIN1 parameters must be used. The start address of Y data plane and C data plane is configured in VIDEOWIN0ADH/L and VIDEOWIN1ADH/L respectively. cuurently only one layer was requested, which is suffice for yuv422, but for yuv420(NV12) two layers are required and fix the same by requesting for other layer if pix fmt is NV12 during set_fmt. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpbe_display.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 0341dcc..f2ee07b 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -922,6 +922,22 @@ 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 && + cpu_is_davinci_dm365()) { + 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,