From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v2 4/5] drm/tegra: plane: Support horizontal reflection mode Date: Sun, 14 Jun 2020 23:01:20 +0300 Message-ID: <20200614200121.14147-5-digetx@gmail.com> References: <20200614200121.14147-1-digetx@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200614200121.14147-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Thierry Reding , Thomas Zimmermann , Derek Basehore , Sam Ravnborg , Laurent Pinchart , Sean Paul Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org Support horizontal reflection mode which will allow to support 180° rotation mode when combined with the vertical reflection. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/dc.c | 24 ++++++++++++++++++++---- drivers/gpu/drm/tegra/dc.h | 1 + drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/plane.h | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index ed282f88e409..f31bca27cde4 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -368,6 +368,12 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, h_size = window->src.w * bpp; v_size = window->src.h; + if (window->reflect_x) + h_offset += (window->src.w - 1) * bpp; + + if (window->reflect_y) + v_offset += window->src.h - 1; + value = V_PRESCALED_SIZE(v_size) | H_PRESCALED_SIZE(h_size); tegra_plane_writel(plane, value, DC_WIN_PRESCALED_SIZE); @@ -404,9 +410,6 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, tegra_plane_writel(plane, window->stride[0], DC_WIN_LINE_STRIDE); } - if (window->reflect_y) - v_offset += window->src.h - 1; - tegra_plane_writel(plane, h_offset, DC_WINBUF_ADDR_H_OFFSET); tegra_plane_writel(plane, v_offset, DC_WINBUF_ADDR_V_OFFSET); @@ -470,6 +473,9 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, value |= COLOR_EXPAND; } + if (window->reflect_x) + value |= H_DIRECTION; + if (window->reflect_y) value |= V_DIRECTION; @@ -601,7 +607,9 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) { struct tegra_plane_state *plane_state = to_tegra_plane_state(state); - unsigned int rotation = DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y; + unsigned int rotation = DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y; struct tegra_bo_tiling *tiling = &plane_state->tiling; struct tegra_plane *tegra = to_tegra_plane(plane); struct tegra_dc *dc = to_tegra_dc(state->crtc); @@ -641,6 +649,11 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, rotation = drm_rotation_simplify(state->rotation, rotation); + if (rotation & DRM_MODE_REFLECT_X) + plane_state->reflect_x = true; + else + plane_state->reflect_x = false; + if (rotation & DRM_MODE_REFLECT_Y) plane_state->reflect_y = true; else @@ -706,6 +719,7 @@ static void tegra_plane_atomic_update(struct drm_plane *plane, window.dst.w = drm_rect_width(&plane->state->dst); window.dst.h = drm_rect_height(&plane->state->dst); window.bits_per_pixel = fb->format->cpp[0] * 8; + window.reflect_x = state->reflect_x; window.reflect_y = tegra_fb_is_bottom_up(fb) || state->reflect_y; /* copy from state */ @@ -792,6 +806,7 @@ static struct drm_plane *tegra_primary_plane_create(struct drm_device *drm, err = drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); if (err < 0) dev_err(dc->dev, "failed to create rotation property: %d\n", @@ -1079,6 +1094,7 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm, err = drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); if (err < 0) dev_err(dc->dev, "failed to create rotation property: %d\n", diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index 98e1b625168e..051d03dcb9b0 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -136,6 +136,7 @@ struct tegra_dc_window { unsigned int stride[2]; unsigned long base[3]; unsigned int zpos; + bool reflect_x; bool reflect_y; struct tegra_bo_tiling tiling; diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index e05ef6013a97..4cd0461cc508 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -61,6 +61,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane) copy->tiling = state->tiling; copy->format = state->format; copy->swap = state->swap; + copy->reflect_x = state->reflect_x; copy->reflect_y = state->reflect_y; copy->opaque = state->opaque; diff --git a/drivers/gpu/drm/tegra/plane.h b/drivers/gpu/drm/tegra/plane.h index 8047fc916d8c..c691dd79b27b 100644 --- a/drivers/gpu/drm/tegra/plane.h +++ b/drivers/gpu/drm/tegra/plane.h @@ -46,6 +46,7 @@ struct tegra_plane_state { u32 format; u32 swap; + bool reflect_x; bool reflect_y; /* used for legacy blending support only */ -- 2.26.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 DFADCC433DF for ; Mon, 15 Jun 2020 07:28:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 B0FFE2068E for ; Mon, 15 Jun 2020 07:28:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vMkCjCpZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0FFE2068E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 824EE6E2D7; Mon, 15 Jun 2020 07:27:28 +0000 (UTC) Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by gabe.freedesktop.org (Postfix) with ESMTPS id 167D389F06 for ; Sun, 14 Jun 2020 20:01:47 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id w15so8262121lfe.11 for ; Sun, 14 Jun 2020 13:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lFel57lgzkdFi66A+blGOSEVo/1btB7qpZRFUjdwuaU=; b=vMkCjCpZdLUYv4suIqfx/3MUEZK1a6KD7CNZtbYGdSdsPJeaicMH3Vge7RWPzTknLh EBruytN8H/ucQwnaWfYH7FRtktEa54ZS9pRuJHdxX+TBGNZ58+vP5DndOQ1jQJk2T659 nf93A936pfBRYyHl5QXaT4NudEW35KwfecF/No1EP0u8FKIiOV6/WRaVGGw+cPhh02Ug l32ioBRxMnesvhq/nW7pCAeaeZq5jeS9AyVoni47+tY1jEYQ+trPXen6z486WezTghUw c2Ij7fzQh1vt3D7P1iQY646Fz4CuDgvZyru32vFUh6y+CNKN+LxsZZ600CJGSTuhefZq s99A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lFel57lgzkdFi66A+blGOSEVo/1btB7qpZRFUjdwuaU=; b=Wrbe8UO8U2FqOvgrFvNsdsEJt/xzk7FdhvVEyZE+g+mLDWQ9e0KQHIpWF1sbiYb+QI Efeg1T0L4B8HD4m5tcXwFD6VwWWyyHG21SsPSdmMLc1C9dW+2g6DBANPi4F6ZAxriJpw JKdONr//E588LA9Uk5RKM0zvLuInZzra24aNq4wEnXNuM5rool/kZdRTUsWi5x8ZT6fF 9fxIYWiv2mv0zU192M2brqIL0+HDR9QckLfaPmHAOfQefeI7gpxUmkgU1APi4CtCBl7S d/fXolBMikPK40KK6KcluiSHHmUolrSGyFe65ZTj7DHWipnx2nQ9fnQtmyUbYH3Jx9YF 8lOg== X-Gm-Message-State: AOAM531EkkEyst+e/JIL5/RGfgEHBHV+uz66Q/GViAsIOGueDe8lgExu VHqxrhvXGGoDBbc2gs8xEqY= X-Google-Smtp-Source: ABdhPJzNUu4NpTHxztFbm6URTJe+XIxQZ+nkTLzrk8ITpSUydiX1sZV0V1uqoL2VvkWht7I0fO+RYg== X-Received: by 2002:a19:c212:: with SMTP id l18mr11722963lfc.68.1592164905521; Sun, 14 Jun 2020 13:01:45 -0700 (PDT) Received: from localhost.localdomain (79-139-237-54.dynamic.spd-mgts.ru. [79.139.237.54]) by smtp.gmail.com with ESMTPSA id 144sm1422105lfm.87.2020.06.14.13.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 13:01:45 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Thomas Zimmermann , Derek Basehore , Sam Ravnborg , Laurent Pinchart , Sean Paul Subject: [PATCH v2 4/5] drm/tegra: plane: Support horizontal reflection mode Date: Sun, 14 Jun 2020 23:01:20 +0300 Message-Id: <20200614200121.14147-5-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200614200121.14147-1-digetx@gmail.com> References: <20200614200121.14147-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 15 Jun 2020 07:27:17 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" U3VwcG9ydCBob3Jpem9udGFsIHJlZmxlY3Rpb24gbW9kZSB3aGljaCB3aWxsIGFsbG93IHRvIHN1 cHBvcnQgMTgwwrAKcm90YXRpb24gbW9kZSB3aGVuIGNvbWJpbmVkIHdpdGggdGhlIHZlcnRpY2Fs IHJlZmxlY3Rpb24uCgpTaWduZWQtb2ZmLWJ5OiBEbWl0cnkgT3NpcGVua28gPGRpZ2V0eEBnbWFp bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMgICAgfCAyNCArKysrKysrKysr KysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS90ZWdyYS9kYy5oICAgIHwgIDEgKwogZHJp dmVycy9ncHUvZHJtL3RlZ3JhL3BsYW5lLmMgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vdGVncmEv cGxhbmUuaCB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYyBiL2RyaXZl cnMvZ3B1L2RybS90ZWdyYS9kYy5jCmluZGV4IGVkMjgyZjg4ZTQwOS4uZjMxYmNhMjdjZGU0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vdGVncmEvZGMuYwpAQCAtMzY4LDYgKzM2OCwxMiBAQCBzdGF0aWMgdm9pZCB0ZWdyYV9kY19z ZXR1cF93aW5kb3coc3RydWN0IHRlZ3JhX3BsYW5lICpwbGFuZSwKIAloX3NpemUgPSB3aW5kb3ct PnNyYy53ICogYnBwOwogCXZfc2l6ZSA9IHdpbmRvdy0+c3JjLmg7CiAKKwlpZiAod2luZG93LT5y ZWZsZWN0X3gpCisJCWhfb2Zmc2V0ICs9ICh3aW5kb3ctPnNyYy53IC0gMSkgKiBicHA7CisKKwlp ZiAod2luZG93LT5yZWZsZWN0X3kpCisJCXZfb2Zmc2V0ICs9IHdpbmRvdy0+c3JjLmggLSAxOwor CiAJdmFsdWUgPSBWX1BSRVNDQUxFRF9TSVpFKHZfc2l6ZSkgfCBIX1BSRVNDQUxFRF9TSVpFKGhf c2l6ZSk7CiAJdGVncmFfcGxhbmVfd3JpdGVsKHBsYW5lLCB2YWx1ZSwgRENfV0lOX1BSRVNDQUxF RF9TSVpFKTsKIApAQCAtNDA0LDkgKzQxMCw2IEBAIHN0YXRpYyB2b2lkIHRlZ3JhX2RjX3NldHVw X3dpbmRvdyhzdHJ1Y3QgdGVncmFfcGxhbmUgKnBsYW5lLAogCQl0ZWdyYV9wbGFuZV93cml0ZWwo cGxhbmUsIHdpbmRvdy0+c3RyaWRlWzBdLCBEQ19XSU5fTElORV9TVFJJREUpOwogCX0KIAotCWlm ICh3aW5kb3ctPnJlZmxlY3RfeSkKLQkJdl9vZmZzZXQgKz0gd2luZG93LT5zcmMuaCAtIDE7Ci0K IAl0ZWdyYV9wbGFuZV93cml0ZWwocGxhbmUsIGhfb2Zmc2V0LCBEQ19XSU5CVUZfQUREUl9IX09G RlNFVCk7CiAJdGVncmFfcGxhbmVfd3JpdGVsKHBsYW5lLCB2X29mZnNldCwgRENfV0lOQlVGX0FE RFJfVl9PRkZTRVQpOwogCkBAIC00NzAsNiArNDczLDkgQEAgc3RhdGljIHZvaWQgdGVncmFfZGNf c2V0dXBfd2luZG93KHN0cnVjdCB0ZWdyYV9wbGFuZSAqcGxhbmUsCiAJCXZhbHVlIHw9IENPTE9S X0VYUEFORDsKIAl9CiAKKwlpZiAod2luZG93LT5yZWZsZWN0X3gpCisJCXZhbHVlIHw9IEhfRElS RUNUSU9OOworCiAJaWYgKHdpbmRvdy0+cmVmbGVjdF95KQogCQl2YWx1ZSB8PSBWX0RJUkVDVElP TjsKIApAQCAtNjAxLDcgKzYwNyw5IEBAIHN0YXRpYyBpbnQgdGVncmFfcGxhbmVfYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgdGVncmFfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlID0g dG9fdGVncmFfcGxhbmVfc3RhdGUoc3RhdGUpOwotCXVuc2lnbmVkIGludCByb3RhdGlvbiA9IERS TV9NT0RFX1JPVEFURV8wIHwgRFJNX01PREVfUkVGTEVDVF9ZOworCXVuc2lnbmVkIGludCByb3Rh dGlvbiA9IERSTV9NT0RFX1JPVEFURV8wIHwKKwkJCQlEUk1fTU9ERV9SRUZMRUNUX1ggfAorCQkJ CURSTV9NT0RFX1JFRkxFQ1RfWTsKIAlzdHJ1Y3QgdGVncmFfYm9fdGlsaW5nICp0aWxpbmcgPSAm cGxhbmVfc3RhdGUtPnRpbGluZzsKIAlzdHJ1Y3QgdGVncmFfcGxhbmUgKnRlZ3JhID0gdG9fdGVn cmFfcGxhbmUocGxhbmUpOwogCXN0cnVjdCB0ZWdyYV9kYyAqZGMgPSB0b190ZWdyYV9kYyhzdGF0 ZS0+Y3J0Yyk7CkBAIC02NDEsNiArNjQ5LDExIEBAIHN0YXRpYyBpbnQgdGVncmFfcGxhbmVfYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJcm90YXRpb24gPSBkcm1fcm90 YXRpb25fc2ltcGxpZnkoc3RhdGUtPnJvdGF0aW9uLCByb3RhdGlvbik7CiAKKwlpZiAocm90YXRp b24gJiBEUk1fTU9ERV9SRUZMRUNUX1gpCisJCXBsYW5lX3N0YXRlLT5yZWZsZWN0X3ggPSB0cnVl OworCWVsc2UKKwkJcGxhbmVfc3RhdGUtPnJlZmxlY3RfeCA9IGZhbHNlOworCiAJaWYgKHJvdGF0 aW9uICYgRFJNX01PREVfUkVGTEVDVF9ZKQogCQlwbGFuZV9zdGF0ZS0+cmVmbGVjdF95ID0gdHJ1 ZTsKIAllbHNlCkBAIC03MDYsNiArNzE5LDcgQEAgc3RhdGljIHZvaWQgdGVncmFfcGxhbmVfYXRv bWljX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl3aW5kb3cuZHN0LncgPSBkcm1f cmVjdF93aWR0aCgmcGxhbmUtPnN0YXRlLT5kc3QpOwogCXdpbmRvdy5kc3QuaCA9IGRybV9yZWN0 X2hlaWdodCgmcGxhbmUtPnN0YXRlLT5kc3QpOwogCXdpbmRvdy5iaXRzX3Blcl9waXhlbCA9IGZi LT5mb3JtYXQtPmNwcFswXSAqIDg7CisJd2luZG93LnJlZmxlY3RfeCA9IHN0YXRlLT5yZWZsZWN0 X3g7CiAJd2luZG93LnJlZmxlY3RfeSA9IHRlZ3JhX2ZiX2lzX2JvdHRvbV91cChmYikgfHwgc3Rh dGUtPnJlZmxlY3RfeTsKIAogCS8qIGNvcHkgZnJvbSBzdGF0ZSAqLwpAQCAtNzkyLDYgKzgwNiw3 IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICp0ZWdyYV9wcmltYXJ5X3BsYW5lX2NyZWF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZHJtLAogCWVyciA9IGRybV9wbGFuZV9jcmVhdGVfcm90YXRpb25f cHJvcGVydHkoJnBsYW5lLT5iYXNlLAogCQkJCQkJIERSTV9NT0RFX1JPVEFURV8wLAogCQkJCQkJ IERSTV9NT0RFX1JPVEFURV8wIHwKKwkJCQkJCSBEUk1fTU9ERV9SRUZMRUNUX1ggfAogCQkJCQkJ IERSTV9NT0RFX1JFRkxFQ1RfWSk7CiAJaWYgKGVyciA8IDApCiAJCWRldl9lcnIoZGMtPmRldiwg ImZhaWxlZCB0byBjcmVhdGUgcm90YXRpb24gcHJvcGVydHk6ICVkXG4iLApAQCAtMTA3OSw2ICsx MDk0LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKnRlZ3JhX2RjX292ZXJsYXlfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sCiAJZXJyID0gZHJtX3BsYW5lX2NyZWF0ZV9y b3RhdGlvbl9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsCiAJCQkJCQkgRFJNX01PREVfUk9UQVRFXzAs CiAJCQkJCQkgRFJNX01PREVfUk9UQVRFXzAgfAorCQkJCQkJIERSTV9NT0RFX1JFRkxFQ1RfWCB8 CiAJCQkJCQkgRFJNX01PREVfUkVGTEVDVF9ZKTsKIAlpZiAoZXJyIDwgMCkKIAkJZGV2X2Vycihk Yy0+ZGV2LCAiZmFpbGVkIHRvIGNyZWF0ZSByb3RhdGlvbiBwcm9wZXJ0eTogJWRcbiIsCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuaCBiL2RyaXZlcnMvZ3B1L2RybS90ZWdy YS9kYy5oCmluZGV4IDk4ZTFiNjI1MTY4ZS4uMDUxZDAzZGNiOWIwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vdGVncmEvZGMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuaApA QCAtMTM2LDYgKzEzNiw3IEBAIHN0cnVjdCB0ZWdyYV9kY193aW5kb3cgewogCXVuc2lnbmVkIGlu dCBzdHJpZGVbMl07CiAJdW5zaWduZWQgbG9uZyBiYXNlWzNdOwogCXVuc2lnbmVkIGludCB6cG9z OworCWJvb2wgcmVmbGVjdF94OwogCWJvb2wgcmVmbGVjdF95OwogCiAJc3RydWN0IHRlZ3JhX2Jv X3RpbGluZyB0aWxpbmc7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvcGxhbmUu YyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9wbGFuZS5jCmluZGV4IGUwNWVmNjAxM2E5Ny4uNGNk MDQ2MWNjNTA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvcGxhbmUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvcGxhbmUuYwpAQCAtNjEsNiArNjEsNyBAQCB0ZWdyYV9w bGFuZV9hdG9taWNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogCWNv cHktPnRpbGluZyA9IHN0YXRlLT50aWxpbmc7CiAJY29weS0+Zm9ybWF0ID0gc3RhdGUtPmZvcm1h dDsKIAljb3B5LT5zd2FwID0gc3RhdGUtPnN3YXA7CisJY29weS0+cmVmbGVjdF94ID0gc3RhdGUt PnJlZmxlY3RfeDsKIAljb3B5LT5yZWZsZWN0X3kgPSBzdGF0ZS0+cmVmbGVjdF95OwogCWNvcHkt Pm9wYXF1ZSA9IHN0YXRlLT5vcGFxdWU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90 ZWdyYS9wbGFuZS5oIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL3BsYW5lLmgKaW5kZXggODA0N2Zj OTE2ZDhjLi5jNjkxZGQ3OWIyN2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9w bGFuZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9wbGFuZS5oCkBAIC00Niw2ICs0Niw3 IEBAIHN0cnVjdCB0ZWdyYV9wbGFuZV9zdGF0ZSB7CiAJdTMyIGZvcm1hdDsKIAl1MzIgc3dhcDsK IAorCWJvb2wgcmVmbGVjdF94OwogCWJvb2wgcmVmbGVjdF95OwogCiAJLyogdXNlZCBmb3IgbGVn YWN5IGJsZW5kaW5nIHN1cHBvcnQgb25seSAqLwotLSAKMi4yNi4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 8C622C433DF for ; Sun, 14 Jun 2020 20:02:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 614E72074D for ; Sun, 14 Jun 2020 20:02:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vMkCjCpZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727909AbgFNUB4 (ORCPT ); Sun, 14 Jun 2020 16:01:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726938AbgFNUBr (ORCPT ); Sun, 14 Jun 2020 16:01:47 -0400 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02511C08C5C5; Sun, 14 Jun 2020 13:01:47 -0700 (PDT) Received: by mail-lf1-x142.google.com with SMTP id d27so3706655lfq.5; Sun, 14 Jun 2020 13:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lFel57lgzkdFi66A+blGOSEVo/1btB7qpZRFUjdwuaU=; b=vMkCjCpZdLUYv4suIqfx/3MUEZK1a6KD7CNZtbYGdSdsPJeaicMH3Vge7RWPzTknLh EBruytN8H/ucQwnaWfYH7FRtktEa54ZS9pRuJHdxX+TBGNZ58+vP5DndOQ1jQJk2T659 nf93A936pfBRYyHl5QXaT4NudEW35KwfecF/No1EP0u8FKIiOV6/WRaVGGw+cPhh02Ug l32ioBRxMnesvhq/nW7pCAeaeZq5jeS9AyVoni47+tY1jEYQ+trPXen6z486WezTghUw c2Ij7fzQh1vt3D7P1iQY646Fz4CuDgvZyru32vFUh6y+CNKN+LxsZZ600CJGSTuhefZq s99A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lFel57lgzkdFi66A+blGOSEVo/1btB7qpZRFUjdwuaU=; b=EoP0ccg6wIlOn6g/GpmFGdi1hqCrifmsoeXXwerD39f2AUbOncDrXFOEmedOYoEQjQ tByBHmpFciIi33o8WcXNZhITi5Ko8JGNHFmwv+ZZlumv9sKV8/LnzNQtc7G3H9ARl0+U 9qoyHajewJJCRVM3mQ61ke5M0133PTfGaUCrsgJyySoDpDdQS9GT0zaIfoQiH/n3BXxS bNaqznsS66l1qDFC2I/MbAZKTMsdgFXzdQ7pDXYTq49YfL71VgNcoAROFc/M+ok530o+ Zw9k5UTPR0HTUjTExMuytnFbdawXN6DbQ1aPXtoojhpm3btLgmOZC8EdpOIqgH1lMPw2 6ljA== X-Gm-Message-State: AOAM532ILANr0KaFE1kHgxVzcs/tiM12uTt7/BvxmJDxvz+/c0cusYqg XpyzeAYddvcPnkm7Wei2nLs= X-Google-Smtp-Source: ABdhPJzNUu4NpTHxztFbm6URTJe+XIxQZ+nkTLzrk8ITpSUydiX1sZV0V1uqoL2VvkWht7I0fO+RYg== X-Received: by 2002:a19:c212:: with SMTP id l18mr11722963lfc.68.1592164905521; Sun, 14 Jun 2020 13:01:45 -0700 (PDT) Received: from localhost.localdomain (79-139-237-54.dynamic.spd-mgts.ru. [79.139.237.54]) by smtp.gmail.com with ESMTPSA id 144sm1422105lfm.87.2020.06.14.13.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 13:01:45 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Thomas Zimmermann , Derek Basehore , Sam Ravnborg , Laurent Pinchart , Sean Paul Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] drm/tegra: plane: Support horizontal reflection mode Date: Sun, 14 Jun 2020 23:01:20 +0300 Message-Id: <20200614200121.14147-5-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200614200121.14147-1-digetx@gmail.com> References: <20200614200121.14147-1-digetx@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Support horizontal reflection mode which will allow to support 180° rotation mode when combined with the vertical reflection. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/dc.c | 24 ++++++++++++++++++++---- drivers/gpu/drm/tegra/dc.h | 1 + drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/plane.h | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index ed282f88e409..f31bca27cde4 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -368,6 +368,12 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, h_size = window->src.w * bpp; v_size = window->src.h; + if (window->reflect_x) + h_offset += (window->src.w - 1) * bpp; + + if (window->reflect_y) + v_offset += window->src.h - 1; + value = V_PRESCALED_SIZE(v_size) | H_PRESCALED_SIZE(h_size); tegra_plane_writel(plane, value, DC_WIN_PRESCALED_SIZE); @@ -404,9 +410,6 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, tegra_plane_writel(plane, window->stride[0], DC_WIN_LINE_STRIDE); } - if (window->reflect_y) - v_offset += window->src.h - 1; - tegra_plane_writel(plane, h_offset, DC_WINBUF_ADDR_H_OFFSET); tegra_plane_writel(plane, v_offset, DC_WINBUF_ADDR_V_OFFSET); @@ -470,6 +473,9 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, value |= COLOR_EXPAND; } + if (window->reflect_x) + value |= H_DIRECTION; + if (window->reflect_y) value |= V_DIRECTION; @@ -601,7 +607,9 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) { struct tegra_plane_state *plane_state = to_tegra_plane_state(state); - unsigned int rotation = DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y; + unsigned int rotation = DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y; struct tegra_bo_tiling *tiling = &plane_state->tiling; struct tegra_plane *tegra = to_tegra_plane(plane); struct tegra_dc *dc = to_tegra_dc(state->crtc); @@ -641,6 +649,11 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, rotation = drm_rotation_simplify(state->rotation, rotation); + if (rotation & DRM_MODE_REFLECT_X) + plane_state->reflect_x = true; + else + plane_state->reflect_x = false; + if (rotation & DRM_MODE_REFLECT_Y) plane_state->reflect_y = true; else @@ -706,6 +719,7 @@ static void tegra_plane_atomic_update(struct drm_plane *plane, window.dst.w = drm_rect_width(&plane->state->dst); window.dst.h = drm_rect_height(&plane->state->dst); window.bits_per_pixel = fb->format->cpp[0] * 8; + window.reflect_x = state->reflect_x; window.reflect_y = tegra_fb_is_bottom_up(fb) || state->reflect_y; /* copy from state */ @@ -792,6 +806,7 @@ static struct drm_plane *tegra_primary_plane_create(struct drm_device *drm, err = drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); if (err < 0) dev_err(dc->dev, "failed to create rotation property: %d\n", @@ -1079,6 +1094,7 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm, err = drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | + DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); if (err < 0) dev_err(dc->dev, "failed to create rotation property: %d\n", diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index 98e1b625168e..051d03dcb9b0 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -136,6 +136,7 @@ struct tegra_dc_window { unsigned int stride[2]; unsigned long base[3]; unsigned int zpos; + bool reflect_x; bool reflect_y; struct tegra_bo_tiling tiling; diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index e05ef6013a97..4cd0461cc508 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -61,6 +61,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane) copy->tiling = state->tiling; copy->format = state->format; copy->swap = state->swap; + copy->reflect_x = state->reflect_x; copy->reflect_y = state->reflect_y; copy->opaque = state->opaque; diff --git a/drivers/gpu/drm/tegra/plane.h b/drivers/gpu/drm/tegra/plane.h index 8047fc916d8c..c691dd79b27b 100644 --- a/drivers/gpu/drm/tegra/plane.h +++ b/drivers/gpu/drm/tegra/plane.h @@ -46,6 +46,7 @@ struct tegra_plane_state { u32 format; u32 swap; + bool reflect_x; bool reflect_y; /* used for legacy blending support only */ -- 2.26.0