From patchwork Sun May 4 15:26:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kurtz X-Patchwork-Id: 4107611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 25C4F9F271 for ; Sun, 4 May 2014 15:26:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 639DE20148 for ; Sun, 4 May 2014 15:26:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 945BE2011B for ; Sun, 4 May 2014 15:26:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD1206E5FD; Sun, 4 May 2014 08:26:41 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by gabe.freedesktop.org (Postfix) with ESMTP id A1A1F6E5FB for ; Sun, 4 May 2014 08:26:40 -0700 (PDT) Received: by mail-pd0-f176.google.com with SMTP id y13so4875732pdi.21 for ; Sun, 04 May 2014 08:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sPMk6wY9KWnGEH18Fnv/+M4MrBprLuf28IZ97OlSRu0=; b=XdrPu1OZGt1Hdd1qO83GL9pBPwjsB5Pipp1gLorPAtpcHjEv7WKuHR82EfSSXoojEQ 2dXgJ1C+3EuZ7q21bW35kKjMhZeyrVllNelCC6gqdyxMl/6aqdEi6ipWGa5TisNODEFn bLtXik5A4ExN4unkuXFGEwlBpylA8ernCSSKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sPMk6wY9KWnGEH18Fnv/+M4MrBprLuf28IZ97OlSRu0=; b=SlK4dM+Ampkn9ZZuIFoOvFAuvA/TGDWOe34+cjghfGjfNdxbKLnLu3JCKd86YfHOVW ECaTajV9Ml3XpfJ7YOXF6c/tzvwu1b2/9lNCKnpwZdY5nJSSoc3BrCWdC/CNf28xkykt UhV9CRgBGVhnIRkL3iIJwFu205AyWbTE87I+QU/bDhkLFEKKQ1LHgU6LWtWIhg5OK/iS 04uTup5DaEHeNhbsad2snKI6VDj/iYHowzJ8zJOQ7yn2owECb53XkCB4pFxLSSQ0il38 PSfqycMJRSwCzoDl6Pl/BtDVCZ1n1imIbhBslHV6ER7H0b3/oyXyPZpaHavOBYlFtn1E DsCQ== X-Gm-Message-State: ALoCoQnd760dvxUa5IAtNWkD2A73S1RVFgFMhMa3sYzGhZmkFa0AOTqSZg3KOhAVAcIM9kHam44o X-Received: by 10.66.240.130 with SMTP id wa2mr61195058pac.73.1399217200348; Sun, 04 May 2014 08:26:40 -0700 (PDT) Received: from djkurtzt530-glaptop.hitronhub.home (123-193-41-132.dynamic.kbronet.com.tw. [123.193.41.132]) by mx.google.com with ESMTPSA id ry10sm48005129pab.38.2014.05.04.08.26.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 04 May 2014 08:26:39 -0700 (PDT) From: Daniel Kurtz To: Inki Dae , Kukjin Kim Subject: [PATCH 2/4] drm/exynos/mixer: use MXR_GRP_SXY_SY Date: Sun, 4 May 2014 23:26:19 +0800 Message-Id: <1399217181-26442-3-git-send-email-djkurtz@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a In-Reply-To: <1399217181-26442-1-git-send-email-djkurtz@chromium.org> References: <1399217181-26442-1-git-send-email-djkurtz@chromium.org> Cc: linux-samsung-soc@vger.kernel.org, Seung-Woo Kim , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Kyungmin Park , marcheu@chromium.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Mixer hardware supports offsetting dma from start of source buffer using the MXR_GRP_SXY register. Signed-off-by: Daniel Kurtz --- drivers/gpu/drm/exynos/exynos_mixer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 475eb49..40cf39b 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -529,13 +529,11 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) dst_x_offset = win_data->crtc_x; dst_y_offset = win_data->crtc_y; + src_x_offset = win_data->fb_x; + src_y_offset = win_data->fb_y; /* converting dma address base and source offset */ - dma_addr = win_data->dma_addr - + (win_data->fb_x * win_data->bpp >> 3) - + (win_data->fb_y * win_data->fb_width * win_data->bpp >> 3); - src_x_offset = 0; - src_y_offset = 0; + dma_addr = win_data->dma_addr; if (win_data->scan_flags & DRM_MODE_FLAG_INTERLACE) ctx->interlace = true;