From patchwork Tue Dec 18 14:12:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 1892421 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id E896EDF23A for ; Tue, 18 Dec 2012 14:49:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA7B5E62CC for ; Tue, 18 Dec 2012 06:49:28 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id AB17FE622B for ; Tue, 18 Dec 2012 05:51:33 -0800 (PST) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MF8003DLBTVJ920@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 18 Dec 2012 22:51:31 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 38.AF.12699.3E470D05; Tue, 18 Dec 2012 22:51:31 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-3c-50d074e3386c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 97.AF.12699.3E470D05; Tue, 18 Dec 2012 22:51:31 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MF8000A2BRD3R10@mmp1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 18 Dec 2012 22:51:31 +0900 (KST) From: Rahul Sharma To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/exynos: mixer: add support for extra resolutions Date: Tue, 18 Dec 2012 19:42:43 +0530 Message-id: <1355839963-28091-3-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1355839963-28091-1-git-send-email-rahul.sharma@samsung.com> References: <1355839963-28091-1-git-send-email-rahul.sharma@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsWyRsSkWvdxyYUAgxltxhZXvr5nc2D0uN99 nCmAMYrLJiU1J7MstUjfLoErY9Gez0wFlzgrtm/wb2D8yd7FyMkhIWAisbN/EyuELSZx4d56 ti5GLg4hgaWMEsfff2SBKdr24QUTRGIRo8SpNasYIZzVTBJtdy6BtbMJ6ErMPviMEcQWEVCW +DsRoohZoI1Rom//ZrB9wgKeEs2fnoGNZRFQlbj+YA1YnFfAQ6Jn7QJmiHUKEq3LDoHFOYHq H//tZAKxhYBq/n3azgzRKyDxbfIhoDkcQPWyEpsOMIPskhA4wyax7sJ9qN8kJQ6uuMEygVF4 ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYzAMDz975n0DsZVDRaHGAU4GJV4eH/Gnw8Q Yk0sK67MPcQowcGsJML7Ju5CgBBvSmJlVWpRfnxRaU5q8SFGH6BLJjJLiSbnA2MkryTe0NjE 3NTY1NLIyMzUFIewkjhvs0dKgJBAemJJanZqakFqEcw4Jg5OqQbGDfWWO5b1VBTNzJ9dzXfj CLP1QtYTL9ZMeX2l2cfiasm183EL7+7gOLhQ26yTkXV+5LTy+8uCPZl3rxFd5jnFUtm9+Z/W Pd0zK/V8GrgUzxxueDNjQ75MuP4O4aVS1RGLTqhzWWV28xl/NJpTKRW/8ERbntHX1rqZu46q yT7dHde+XmEWe0akEktxRqKhFnNRcSIAf4sXrHACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xgO7jkgsBBo8+yVlc+fqezYHR4373 caYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoxFez4zFVzirNi+wb+B 8Sd7FyMnh4SAicS2Dy+YIGwxiQv31rN1MXJxCAksYpQ4tWYVI4Szmkmi7c4lVpAqNgFdidkH nzGC2CICyhJ/J0IUMQu0MUr07d8MNlZYwFOi+dMzFhCbRUBV4vqDNWBxXgEPiZ61C5gh1ilI tC47BBbnBKp//LcT7AwhoJp/n7YzT2DkXcDIsIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMj OMifSe9gXNVgcYhRgINRiYf3Z/z5ACHWxLLiytxDjBIczEoivG/iLgQI8aYkVlalFuXHF5Xm pBYfYvQBumois5Rocj4wAvNK4g2NTcxNjU0tTSxMzCxxCCuJ8zZ7pAQICaQnlqRmp6YWpBbB jGPi4JRqYNxYKZ2cLHLppuCHoMNrv037WWDl6JCZemH6TJav2swd6+cx/E6Lf5109qSK/Mrk KO7bETHBHSwripc4G2TwzjeYvljvMHuHspGd4A3OHvU9pmZmHGVs+w1tTikXJZTPbeedHeO3 WLCkXT/ui0HTfc+ej19rl+VxXn8gPudbcfGmFw+X2xZuU2Ipzkg01GIuKk4EAHK0deufAgAA X-CFilter-Loop: Reflected X-Mailman-Approved-At: Tue, 18 Dec 2012 06:46:08 -0800 Cc: kgene.kim@samsung.com, seanpaul@google.com, sw0312.kim@samsung.com, joshi@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Extend the mixer configuration to include more resolutions that can be generated by the mixer. This adds 640x480, 720x576 and 1680x1050. Signed-off-by: Sean Paul Signed-off-by: Rahul Sharma --- drivers/gpu/drm/exynos/exynos_mixer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 21db895..6aedc0f 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -283,13 +283,13 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) MXR_CFG_SCAN_PROGRASSIVE); /* choosing between porper HD and SD mode */ - if (height == 480) + if (height <= 480) val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD; - else if (height == 576) + else if (height <= 576) val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD; - else if (height == 720) + else if (height <= 720) val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; - else if (height == 1080) + else if (height <= 1080) val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD; else val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;