From patchwork Tue Nov 6 09:39:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10669991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9E7FF13A4 for ; Tue, 6 Nov 2018 09:40:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A62E2A278 for ; Tue, 6 Nov 2018 09:40:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DE612A28D; Tue, 6 Nov 2018 09:40:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 362FC2A278 for ; Tue, 6 Nov 2018 09:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject: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=IXMGH1Q+i/VqHQRjuG0XMCCShAA4T4yS6v3OwU779Qc=; b=Wza WYK9YAfVLrk87O5R53zX3xMNCKwKbytChhWdBaWsbI4hjud6LWUeJXJ+7Ogz0XW1EJDaV43nBSI8M aSMH74wTSwIS3hxy3SDvvnu62jIQyBqghKdP7c53P3LUxTkxslleOZyCiZybZmZel5WfbED6FP4p1 Od9qODHrO0xatcqTmUsOXZWuy6HKNo5A3FgYkvXucD5OZwOt06eWp/cpQYr9YoY0HgaYfbxfMjFNC ftj/Ks/XjOAXi9RmhH9A/9w1z3se7kCOKp8iZNibdPTuD/Hzdh/Of4+TDoH5igGqxJvjhZYAZ/SpB Z/GdIawtLVO1tIcX/NXAEEh1q6+TyiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJxqR-0003Ha-Kp; Tue, 06 Nov 2018 09:40:23 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJxqM-0002dj-4l for linux-arm-kernel@lists.infradead.org; Tue, 06 Nov 2018 09:40:19 +0000 Received: by mail-wr1-x441.google.com with SMTP id j26-v6so12677658wre.1 for ; Tue, 06 Nov 2018 01:40:06 -0800 (PST) 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; bh=HfNnbHeKEcbPNJPvCyFTqb9/GOXtzkY2zjSPRrdIZ0U=; b=zIaNLWmPg4aQ/VbeWJHTDHYHF1KEiyhyptyM6clSeuWQbA1gF8kKv/xFpnkiCGBfvW WNPLQFVnPwKVnhwcB+ewvvrwYHxEHRW/W3AmND8ZtG8ud6+PvPtoavYtSdGEW+e2WZNj 0t0zr0xiAB890DUbEiR1agXFaonAoHtyCGk0S9V9X+gS46vtdscc3bGC37YE0a/j7CSS /U2zDpE1OdLtET5DccS5IlqBsu5iUH5hKBT8Km3XcKKFQhIOHi2xm4xsU5gEIJ9oKSip TfpREGnsNmC3NnW6zQCz7ABq72kAe5+5jLU4Lnrw1YvMKETbosbafhDhij2X3y8SY8Q/ +LZw== 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; bh=HfNnbHeKEcbPNJPvCyFTqb9/GOXtzkY2zjSPRrdIZ0U=; b=azUtbx3ExX9LuPXMbjrpB0qT6VL0iueYuj3x4NGdCExJZabfUqYVh60RVny20UMAcP ib52x7AkmXOFjQTqzJj5WBApyNM8RdbGfjXDKYCq75XnWp383I9Ny9SJApntMzajqtqf KWSi2lobWndSkneLX/GlZFv5ghpyPlQqGolsvp2UNKI9zPwY9u02jnc4brllErSIIjGD BDwLRu3NzsZs9wWYI4E4+cPGWRiwFg5StvpzNHsRiia+EJePOZBLYIyADdrhiE55E6Vm Kbqgs8kTOsRBuVnQQDqk3j9kuZVOiprnd0TBl0lFElcavud97oMrToZD1Sq9urPVVFje 3bUA== X-Gm-Message-State: AGRZ1gJlzsbJ7mqt7msmRnuU5Nt0IMEycupUEM/kkN2gRhf0Ac5CEoId +d4HANC7TNdvJ7lDFrdjBEcMtw== X-Google-Smtp-Source: AJdET5deUI1UAnHLkabLrYT3aEMYhbX/f3/WJb0MAx6ub55jn+fAOA/XU42/vnrFMVBPgDUQvhZ+RQ== X-Received: by 2002:a5d:6a8d:: with SMTP id s13-v6mr7707642wru.179.1541497205423; Tue, 06 Nov 2018 01:40:05 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u13-v6sm29682434wrn.11.2018.11.06.01.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Nov 2018 01:40:04 -0800 (PST) From: Neil Armstrong To: dri-devel@lists.freedesktop.org Subject: [PATCH 0/3] drm/meson: Add support for Overlay and OSD Plane scaling Date: Tue, 6 Nov 2018 10:39:59 +0100 Message-Id: <1541497202-20570-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181106_014018_219665_8369A001 X-CRM114-Status: GOOD ( 13.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This serie adds support for : - Overlay Plane blended with the primary plane, we can describe as "behind" - Primary Plane up-scaling up to 5x factor to support the OSD plane being upscaled from 1920x1080 when the display mode is set as 3840x2160. These patches depends on the "drm/meson: Allow using optional canvas provider" patchset from Maxime Jourdan at [1] [1] https://patchwork.kernel.org/project/linux-amlogic/list/?series=38355 Neil Armstrong (3): drm/meson: Support Overlay plane for video rendering drm/meson: move OSD scaler management into plane atomic update drm/meson: Add primary plane scaling drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_canvas.c | 7 +- drivers/gpu/drm/meson/meson_canvas.h | 11 +- drivers/gpu/drm/meson/meson_crtc.c | 251 +++++++++++++- drivers/gpu/drm/meson/meson_drv.c | 29 +- drivers/gpu/drm/meson/meson_drv.h | 62 ++++ drivers/gpu/drm/meson/meson_overlay.c | 586 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/meson/meson_overlay.h | 14 + drivers/gpu/drm/meson/meson_plane.c | 177 ++++++++-- drivers/gpu/drm/meson/meson_registers.h | 3 + drivers/gpu/drm/meson/meson_viu.c | 15 + drivers/gpu/drm/meson/meson_vpp.c | 90 +++-- 12 files changed, 1156 insertions(+), 91 deletions(-) create mode 100644 drivers/gpu/drm/meson/meson_overlay.c create mode 100644 drivers/gpu/drm/meson/meson_overlay.h Acked-by: Daniel Vetter