From patchwork Thu Jun 3 08:42:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 12296701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E944BC47082 for ; Thu, 3 Jun 2021 08:45:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A70546136E for ; Thu, 3 Jun 2021 08:45:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A70546136E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=LJcMnSA9SEYPSTrSz6ZbSaXgyOOgW1bKwKCOGGcpCPg=; b=jgG3Hdd+1d2t/D i0HPWWYNy/QZ2HXjqtJ971Z8u7ZMJf1iUI2NHJcg7oF0aDiCj/8bG9Kyy2ZDAFocILvfM4XpxwSKJ 5Wgh8E4335TVqWb7aNpeoJelKRFfud4eeFfX+KE8WFaPlFEtB6tlVtWvybcHk0q/uXMynEmQH1cHX kYr8wMA3dfITmYy/3oF9/L2HvbPtgwVBGhL8D9S6PsM6k9QedJGTCcjGSa/elPD1aQ4O4LPZQTUQx 0FiQMyB+4RPF2qM0/7WZsH84KIPz9rJOd0ZYor/zDz+Qcg/rYSBbtAvh+Xhl7saVmvp9W7PTTlDiT rHsDJtafka/+ayeJUHhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loiwn-007jdZ-OM; Thu, 03 Jun 2021 08:43:25 +0000 Received: from mail-wr1-f54.google.com ([209.85.221.54]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loiwk-007jcK-4t for linux-arm-kernel@lists.infradead.org; Thu, 03 Jun 2021 08:43:24 +0000 Received: by mail-wr1-f54.google.com with SMTP id m18so4988304wrv.2 for ; Thu, 03 Jun 2021 01:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SNU7JKX7aSeTK7xjNMO/CkhBcJ6lCl+AhfJOU6hzNns=; b=UcYf/2lHKlayXrEaOKqNHbasHUf900ovmhEA4V0P1Wk+dboPkf+FzAxPxvGpW20HfP E9Lsg9z2e/fUjxqj/kWVjzzJot9pWBGJA5FhHZVRD3JIYrD/vr/SxIvR3nX5tOGm1iww 5wznIGTaU/IafI8pnf7Kqn/+xJfnzs6kCRPAzfEsISk/ZVQ5gcEl0jC9AlRfKTadyPo/ qgXba2AMoZN4TbYq3EbT9TM/F1NnsaF8jLGCBL76eS/68b6EXEvJi+Qxm8iiEhp+tI7t PfF3UDvcMS27xUTx7XYMuVZ4jov1tvOUN4xFF3UgZpFrBLdYgo+UuJpNPREsDfk96YKH KQVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SNU7JKX7aSeTK7xjNMO/CkhBcJ6lCl+AhfJOU6hzNns=; b=Qzd2CCeTLkD1e0nmD2JRH2DYiWbYSK4bTiXwPAoiQ1fsw+XHxezXr8L3BtEI/DynIS KIPRh2NlTZ+95DhRkiyLaKjzea4TLUJm3yIOdc4Ew5VPF9dpe22qNB6aE6488/2ZsgDP po8g35F80jTDdeR4iadO6ZIhXO/U7t2BKdtqRpt5k9dzzyfK14QEcQmZfYhqotUWC+63 q1/2b+kd4WoWgdAvgtaGixTwNLLU6Gpatn5lapVAZnvRHScMpaP6j3gU0QxLjmb6MyWo ClnBqG9p49VwZ7yqHMPEOl9de9wlCkmqN+HvKjPu0QcGJ+zxeixcpI9YQ841mhig4V2N zdnQ== X-Gm-Message-State: AOAM531emQltqypMb0b91BrTlAHG5hVNGWXxL7YYUogcpVeHFzvsfyVc OeqxsdY5n0ig//nzImbD5KYI0g== X-Google-Smtp-Source: ABdhPJy7qovuJNSsahe4jvLCLnwO65bY2WkvJC3lTYs5vxvgnCuu7RfBP7fkELCrdwjh4mvAOlep/Q== X-Received: by 2002:adf:c38a:: with SMTP id p10mr23301663wrf.138.1622709739038; Thu, 03 Jun 2021 01:42:19 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:c7bb:ed8:463c:e094]) by smtp.gmail.com with ESMTPSA id l3sm2075176wmh.2.2021.06.03.01.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 01:42:18 -0700 (PDT) From: Neil Armstrong To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH] media: mexon-ge2d: fixup frames size in registers Date: Thu, 3 Jun 2021 10:42:15 +0200 Message-Id: <20210603084215.368764-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3555; h=from:subject; bh=fDG0y2ajd4sQMyG0ttCCWx537eEFDH2CjN5zlWNa1zc=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBguJXDk1ouZJkvROuDyWlgJHb+IMnkKLSjCy8YlusE quTE+ByJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCYLiVwwAKCRB33NvayMhJ0VhnEA COQ2pz5dPikIjqm1jDCwLx8nhXSLBFdWmsZY1qlZqYEd/NQP5xMY9dmAZvrhkMmQAxOM9UtbTw22Mv Y9SxNTE54KP4MHFCXKDjze5N9R1d0LFsx2IQo3N10+2Bz2YIV81zzWJX5XnGY2rkcKKtugUi3oOa1f ey0ZzNTZCW0t1qxTCx66gu+5rjYgXGomojS8bypnjSLk8n62wKvEhM/N/T8GcRHV6nPRusIPL4Co7m 37hbQbmko1SaMyvai7mOUwM/rN9dTz5dAxxjCYsDR+AN1VnSHgx+2Xsabk50ika5EY9FlCyT8B9kVX xY87plF1bFPFGxV7fjobtBxVmF5Pg/Gh9/JuqHGNJxitrPa94q0jKB3LBn3XjBp9CQcbNVjv8BuiNj WS+VSvpaFvJi90vrTrCcjHSnKf0nPieHrcyl6h/X/KJxDudYzKhiM05BZeI7mQqM3Mspphg9j8OKPS /SuO9ig5f+qVNUrh43JkI+NcB2T304g1M6v85VMoklON/E1P/5YAoUsrssrwdtzpO/wxe4/P1DFdWj wvOlWjgDokwriuHM8FCbgpTGl3mfRrlIBbTBO3sFJdodtpdB855S58hVAhl1JXO6d0FkZswKYB4ou1 idH+alnWju8Wqb539mGDpxjKgVuBWuXVbQUxB0/Q5W1VOt+Zkrj270KVTgVA== X-Developer-Key: i=narmstrong@baylibre.com; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210603_014322_212715_B848B518 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The CLIP, SRC & DST registers are coded to take the pixel/line start & end, starting from 0. Thus the end should be the width/height minus 1. It can be an issue with clipping and rotation, where it will add spurious lines from uninitialized or unwanted data with a shift in the result. Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit") Signed-off-by: Neil Armstrong --- drivers/media/platform/meson/ge2d/ge2d.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c index a1393fefa8ae..45b99964ea0a 100644 --- a/drivers/media/platform/meson/ge2d/ge2d.c +++ b/drivers/media/platform/meson/ge2d/ge2d.c @@ -215,35 +215,35 @@ static void ge2d_hw_start(struct meson_ge2d *ge2d) regmap_write(ge2d->map, GE2D_SRC1_CLIPY_START_END, FIELD_PREP(GE2D_START, ctx->in.crop.top) | - FIELD_PREP(GE2D_END, ctx->in.crop.top + ctx->in.crop.height)); + FIELD_PREP(GE2D_END, ctx->in.crop.top + ctx->in.crop.height - 1)); regmap_write(ge2d->map, GE2D_SRC1_CLIPX_START_END, FIELD_PREP(GE2D_START, ctx->in.crop.left) | - FIELD_PREP(GE2D_END, ctx->in.crop.left + ctx->in.crop.width)); + FIELD_PREP(GE2D_END, ctx->in.crop.left + ctx->in.crop.width - 1)); regmap_write(ge2d->map, GE2D_SRC2_CLIPY_START_END, FIELD_PREP(GE2D_START, ctx->out.crop.top) | - FIELD_PREP(GE2D_END, ctx->out.crop.top + ctx->out.crop.height)); + FIELD_PREP(GE2D_END, ctx->out.crop.top + ctx->out.crop.height - 1)); regmap_write(ge2d->map, GE2D_SRC2_CLIPX_START_END, FIELD_PREP(GE2D_START, ctx->out.crop.left) | - FIELD_PREP(GE2D_END, ctx->out.crop.left + ctx->out.crop.width)); + FIELD_PREP(GE2D_END, ctx->out.crop.left + ctx->out.crop.width - 1)); regmap_write(ge2d->map, GE2D_DST_CLIPY_START_END, FIELD_PREP(GE2D_START, ctx->out.crop.top) | - FIELD_PREP(GE2D_END, ctx->out.crop.top + ctx->out.crop.height)); + FIELD_PREP(GE2D_END, ctx->out.crop.top + ctx->out.crop.height - 1)); regmap_write(ge2d->map, GE2D_DST_CLIPX_START_END, FIELD_PREP(GE2D_START, ctx->out.crop.left) | - FIELD_PREP(GE2D_END, ctx->out.crop.left + ctx->out.crop.width)); + FIELD_PREP(GE2D_END, ctx->out.crop.left + ctx->out.crop.width - 1)); regmap_write(ge2d->map, GE2D_SRC1_Y_START_END, - FIELD_PREP(GE2D_END, ctx->in.pix_fmt.height)); + FIELD_PREP(GE2D_END, ctx->in.pix_fmt.height - 1)); regmap_write(ge2d->map, GE2D_SRC1_X_START_END, - FIELD_PREP(GE2D_END, ctx->in.pix_fmt.width)); + FIELD_PREP(GE2D_END, ctx->in.pix_fmt.width - 1)); regmap_write(ge2d->map, GE2D_SRC2_Y_START_END, - FIELD_PREP(GE2D_END, ctx->out.pix_fmt.height)); + FIELD_PREP(GE2D_END, ctx->out.pix_fmt.height - 1)); regmap_write(ge2d->map, GE2D_SRC2_X_START_END, - FIELD_PREP(GE2D_END, ctx->out.pix_fmt.width)); + FIELD_PREP(GE2D_END, ctx->out.pix_fmt.width - 1)); regmap_write(ge2d->map, GE2D_DST_Y_START_END, - FIELD_PREP(GE2D_END, ctx->out.pix_fmt.height)); + FIELD_PREP(GE2D_END, ctx->out.pix_fmt.height - 1)); regmap_write(ge2d->map, GE2D_DST_X_START_END, - FIELD_PREP(GE2D_END, ctx->out.pix_fmt.width)); + FIELD_PREP(GE2D_END, ctx->out.pix_fmt.width - 1)); /* Color, no blend, use source color */ reg = GE2D_ALU_DO_COLOR_OPERATION_LOGIC(LOGIC_OPERATION_COPY,