From patchwork Tue Oct 17 08:07:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10011101 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2C480600CC for ; Tue, 17 Oct 2017 08:09:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C8C0287A0 for ; Tue, 17 Oct 2017 08:09:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 114CE287D1; Tue, 17 Oct 2017 08:09:24 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 96BE9287D2 for ; Tue, 17 Oct 2017 08:09:23 +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:References: In-Reply-To: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:List-Owner; bh=TBIBEC09SX9jmuTSFj0DHAxUC0/n6BtRgfwP98PTsco=; b=m5PC1Zvc5QXi9LzfX5SjJybMzR MZ0XaDRvKANBqsfjFFcDUR26yBWf506Vq1W4LW6E/zjCYpjX9oKVxG92FDpDv+Jllk6o4z62ndfCp 6mPB1bviNwFBZbvB9C+YjyB1wxrmCeT8v8eVHjFy0Co5iUCP+xLhhT1atI7+bNtkl67JJWKEeOUhs KL6Hpxl8ajzAkciR7wIfRd0U8iPE1qJXVYrR6kKp/RDNwipLm0cpS4MX4cKm77wvYa/JqXfHcq82U 1CRnb+u/lkFbkvy3Y6p+yLhUVDV8aKrjU+99mA0F2JYb9BPbkomLdMxaYNP84sYc68bYAuJ6YXNFH 4fUxXQRQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e4MwE-0004th-Ow; Tue, 17 Oct 2017 08:09:22 +0000 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e4Mv8-0003tA-0A for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2017 08:08:20 +0000 Received: by mail-wr0-x22d.google.com with SMTP id g90so700349wrd.6 for ; Tue, 17 Oct 2017 01:07:53 -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:in-reply-to:references; bh=Y4UMFHNqUU84fgjvYrcNUgSsF7eKz5+oxkPFiOcWD/A=; b=DXbEHBr3+F+qtehmTBZ0OQGrNQiB/3AJNe0Tvlo1umAEhHg6aAK7W+2FiJ8GY/cP+P sPH2usVcvNS+X5rtS9LjZEaU3ESWKg34OHn/goL/r+O+QnyRDQKrxg55/okXczfmOTIZ fEb8eL2+aRVY7KEcfTqkNRd9JGJM4wVhnFybzS9IIywrlZWmPKTB4ehAFDA34+MJ1hCo DahIffh/xMme0fwnf7EwySNVNbxi9CZifsxjgkwb0qAdDNzvMMn/zSdlzOSxGXL47VwD GpIX5UVUyx7cCKWn5AdZe7i3oFg7tjujWacsWlvtCMTwI3QgVMKyYIIjFLOq50r2OoSW j/3A== 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; bh=Y4UMFHNqUU84fgjvYrcNUgSsF7eKz5+oxkPFiOcWD/A=; b=iXQqmlJxjSE6ceH3qHFu5Dbcw+4lDHo+ZauDDqmGXgtPBOqEtY/6xpReXW6yLjFcnc KahcEQM/9sViMbhSK3Tlg9Ecia+1JquuNs+ALfD2K0ewIiQeh/60Mhhx1Cbs4riNXNzB 0ALTL4DVOWPVyyKpXuULtn50f9ypihD2JVW6DHKQRahuMZQV7ivNyzpULcyYvWYp91z5 8qyRs0d0DM5VDodk93iBo2otQWmUekLYqtA6ugL62d4PUnKcU62s7oO5HZ2Dn8mu0Oeb M+bXgfGOnb3Ws8OdHpIcsaZWi2HXo0XTMhvBwrKCHwrjTGW+an2FjpsnRKhTKOTTDdpg k5fw== X-Gm-Message-State: AMCzsaVwg3RwNtAB/odxCqtRuvw6TpD5PwQ9omPDb0B4O1FwFTLm6eN4 mslSZjvjZMTvZ2orENFqfCTS29K5P6M= X-Google-Smtp-Source: ABhQp+SjPvFxcCGYTpevXATBw7Omca22Ofynq5AnPXVCyuF8SjFUDegcQ6Z8jFx02toBgl8tKT13Mw== X-Received: by 10.223.130.194 with SMTP id 60mr3044175wrc.168.1508227672086; Tue, 17 Oct 2017 01:07:52 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 188sm7798687wmg.45.2017.10.17.01.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Oct 2017 01:07:51 -0700 (PDT) From: Neil Armstrong To: airlied@linux.ie Subject: [PATCH 4/4] drm/meson: Add missing VPU init Date: Tue, 17 Oct 2017 10:07:44 +0200 Message-Id: <1508227664-11171-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508227664-11171-1-git-send-email-narmstrong@baylibre.com> References: <1508227664-11171-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171017_010814_212554_4B471D18 X-CRM114-Status: GOOD ( 10.35 ) 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, dri-devel@lists.freedesktop.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 The VPU init misses these configurations values. Signed-off-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_drv.c | 9 +++++++++ drivers/gpu/drm/meson/meson_registers.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 7742c7d..19a0d8d 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -150,6 +150,14 @@ static struct regmap_config meson_regmap_config = { .max_register = 0x1000, }; +static void meson_vpu_init(struct meson_drm *priv) +{ + writel_relaxed(0x210000, priv->io_base + _REG(VPU_RDARB_MODE_L1C1)); + writel_relaxed(0x10000, priv->io_base + _REG(VPU_RDARB_MODE_L1C2)); + writel_relaxed(0x900000, priv->io_base + _REG(VPU_RDARB_MODE_L2C1)); + writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); +} + static int meson_drv_bind_master(struct device *dev, bool has_components) { struct platform_device *pdev = to_platform_device(dev); @@ -221,6 +229,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) /* Hardware Initialization */ + meson_vpu_init(priv); meson_venc_init(priv); meson_vpp_init(priv); meson_viu_init(priv); diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h index 2847381..bca8714 100644 --- a/drivers/gpu/drm/meson/meson_registers.h +++ b/drivers/gpu/drm/meson/meson_registers.h @@ -1363,6 +1363,10 @@ #define VPU_PROT3_STAT_1 0x277a #define VPU_PROT3_STAT_2 0x277b #define VPU_PROT3_REQ_ONOFF 0x277c +#define VPU_RDARB_MODE_L1C1 0x2790 +#define VPU_RDARB_MODE_L1C2 0x2799 +#define VPU_RDARB_MODE_L2C1 0x279d +#define VPU_WRARB_MODE_L2C1 0x27a2 /* osd super scale */ #define OSDSR_HV_SIZEIN 0x3130