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: 10669981 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 9B41915A6 for ; Tue, 6 Nov 2018 09:40:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 890392A13D for ; Tue, 6 Nov 2018 09:40:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77F4F2A198; Tue, 6 Nov 2018 09:40:10 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3423A2A13D for ; Tue, 6 Nov 2018 09:40:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D19E46E39B; Tue, 6 Nov 2018 09:40:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18D276E39B for ; Tue, 6 Nov 2018 09:40:07 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id o15-v6so9023476wrv.4 for ; Tue, 06 Nov 2018 01:40:07 -0800 (PST) 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=N5c5gD6JpVYxlfZNvZGYHLOSgxufiPXAklj/6Kv9C1Eb8PjaFNpJu9otOlE4MY9xZy BXDdMpqQg1Q8xGAkrj5LYDsBvb0JLKq1dkFYQE050yUV6LnCigtBSaS3I5NGNqQypzAF XHIqAFxJQemP6XjQTmSym2xwqOwJwVUXqUaKsQIwYTbLgkURuksrUrXsJ3XF3wTVP+HW iBkByXnLsctHUZK1t/meK81Uub2n65KQAEa/UMhdiorVK1bTMiGU9U3VVLjqcH5L4U5+ fuLs0h8YRSBoBhsQL/GnLDXh4dkBSTC9mcGYd8xQzbhhhrrMO/3+Nwh7xUqN41J2etuh W0qw== X-Gm-Message-State: AGRZ1gImL/4MsOVGYjeU5+QuFsWfc75lczIXK3/w38gv6LQCsw5f0fCp A4MT0EdXJK/SKw91wiT4mDkJd7VxoQ4= 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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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