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: 4107721 Return-Path: X-Original-To: patchwork-linux-arm@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 149B79F271 for ; Sun, 4 May 2014 15:29:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C20F2040F for ; Sun, 4 May 2014 15:29:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75949203EC for ; Sun, 4 May 2014 15:29:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WgyJp-0006qF-Cy; Sun, 04 May 2014 15:27:09 +0000 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WgyJh-0006J0-8A for linux-arm-kernel@lists.infradead.org; Sun, 04 May 2014 15:27:02 +0000 Received: by mail-pd0-f173.google.com with SMTP id y10so3423079pdj.32 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=RcQniKT6OIGqCpWPeWCmnVnauaZiD5hYe6xLHd+f5amp7h17a8hj7lE6hzLM1Dk2Kd LDANApaKPnaTzZlNg712UKsBjre8xKOtIF2IQkc6qRkCAXozYZZwecq9SnvD3pNMRU9g FepkBMOwsHZtyuwBrCQTlaz0QvNWnqnuBnFk7Gy2vbIsSdQv5CoOmgzoy2B6aKYCeZRq c7BhSFe0bgH/Y17EJUJApyL90aeBqIfyJDPegrsjOSKbIvCmZp2hR4OAsUCUmDVxQ6vy IFmIJaayE9cRDvfuaasX9udEs1qMpmvyUE7z9Djfr7PVGXPD4FkXPjC7GlH+IKvqZvGw SgyA== X-Gm-Message-State: ALoCoQkvMJ792G6tUQeB0vFJu5LqHsUKGxbLQ2dRwwCbctgqnm9xZBaQIVAao6klL2QovnJ8T2bC 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140504_082701_305842_228545D0 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -0.1 (/) Cc: linux-samsung-soc@vger.kernel.org, Joonyoung Shim , David Airlie , Seung-Woo Kim , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Kyungmin Park , seanpaul@chromium.org, Daniel Kurtz , marcheu@chromium.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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;