Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp304549ybz; Tue, 21 Apr 2020 09:19:52 -0700 (PDT) X-Google-Smtp-Source: APiQypKTUbw/ALc8Sb968uU0TIMwuYVqTUyhUrkT8OzyHBbAL27bRGYYmHtqUmqBSMm5heGjfTH9 X-Received: by 2002:a17:906:2ad4:: with SMTP id m20mr23019109eje.324.1587485991839; Tue, 21 Apr 2020 09:19:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587485991; cv=none; d=google.com; s=arc-20160816; b=TIljkp2gFaHMgM3YV7Qz2wt2DVdYfVrC50XTZMVpvcERJaszLJT1V5Gg/5pMaOEuzv TcKbN6olfuqX0+9ImYKQo2hZVoSVH+oPYOAG+Wf6gIsExVAotjSKVD9XlKdIDvuL9avZ NAYUU0pieEsHlx9LxuxOSoiKZIt3NqfNLDudK0ZoQw5+x4mcq2XN2MS030D8Mv1Ol+O2 w2+mfkSXYcl4074U2y9WHbdAC6I2MjgSdhmYwT71MSRZGGTSnlwOfMBXbolBFsathcoT vyX1XxucncYDPnXUY9tsjMk0sRCPcL6C1b83mN5GzYUdqbAi6iJQhOMj4pwcPzF/c2Eg 6kKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wEt0VLaSvhUT7nyu4RhagnuYQaTu9Oo49aJG5CKXEWA=; b=qyWRPhP0QrWoqcPd+RRdOHWDLY7b04xSDRZMT01Y1BReHoziBWPUrMP7z/520Q6WTc +lKU4WlI4doKqCw6SYCWJ8UhD+wSSc0tEsAsqSEEaP4/ZugzrITxFdDqcDHaUB186kt3 Gz156HrbQUB42etAP8aD/xY1vtj5btHS7jOJCtc+zuVb4tIP3LIqaTqb4TTI2QxrePn0 f3Odamn21nJ6F9TaP249U12rUbvZcggMXD+3GjvYrH+fgXVAF4fBwD6rO97hYzl+RfBk oL79M4sMxDuyhr+Wg1dFpUPfM0Qy2mg4uCPtkMuQD7ESI+SS8xF3MJGcUcJZXIoVZyZg R12g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=NGgecMLb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id df12si1828917edb.540.2020.04.21.09.19.28; Tue, 21 Apr 2020 09:19:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=NGgecMLb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729261AbgDUQQ1 (ORCPT + 99 others); Tue, 21 Apr 2020 12:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726012AbgDUQQJ (ORCPT ); Tue, 21 Apr 2020 12:16:09 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E282CC061A41 for ; Tue, 21 Apr 2020 09:16:08 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id u127so4390758wmg.1 for ; Tue, 21 Apr 2020 09:16:08 -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 :mime-version:content-transfer-encoding; bh=wEt0VLaSvhUT7nyu4RhagnuYQaTu9Oo49aJG5CKXEWA=; b=NGgecMLbtC3PDBUY6z/AYFi1locTndBe2dvXfhXuoT58q4xdHw4EWuhWQrT4AEepwJ rNDUYpKQnKVSC4ulOjpKkAL3AtXaWs/6ddc6Rqa5zbPUIgifptOHCtw4A2YBVZjn/9/P HTESIv5cj56mRjKJOb6zpszwPHwBKL2XzTxGmTkR5CzJheM8NWw4wdLAHa7aDkd9knxh OUvzYbI8Ig+gcy67146tEFuosPOTq+KikWJLSiy5fbskn8PzX66zbDwiWqdPIv4vItaJ oBvR6tJzVtmZfTMeeBq6MPaf5tmvEnP1O9QTKj1eCsQQ1XQQ5tB79W6VeFS7RmbKauEr gHeg== 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=wEt0VLaSvhUT7nyu4RhagnuYQaTu9Oo49aJG5CKXEWA=; b=PdrtEr6+2B64f4073z1la3GM4QcINd3sAo0Trim0GEpBrsxD3w5dXp+dS34eEhGOSJ 0A+iQBRm3VMvRy3YtUSQ4KsuV3d2Uw1iLbDJQTzfom97USUG24eqpmzOsEhKIRbq276+ 6tnfjMB2KvunEJn7T5Igaff/NKhsBeHtNCUYjHGPRXl67JK4VR8wAH5OhRZ0ep3OIDA1 hv4MqCujLgVgPJxsCrRc3tNLQiP9Ya+N0NrNuSDHcYkrX8doFBYnwwp6yajg/8vg1FZN icvoJbDU54Ms+H1vxFqqLMfjttqzq1wSW2Rx0Erg9jEZ4U+7umFXLEUvr7kRytN0zJ6H W0OQ== X-Gm-Message-State: AGi0PuZP8zPoaKzUpjtWVCgnGCic+G1QGeCeC483P77wfcgWe9cfdDmV Fo/Tc7t4ncSZZpd6elrYg4ZwCA== X-Received: by 2002:a1c:6a0b:: with SMTP id f11mr5608062wmc.123.1587485767562; Tue, 21 Apr 2020 09:16:07 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:2ec0:82b0:39cc:a07:8b48:cc56]) by smtp.gmail.com with ESMTPSA id m8sm4410873wrx.54.2020.04.21.09.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 09:16:06 -0700 (PDT) From: Neil Armstrong To: daniel@ffwll.ch, dri-devel@lists.freedesktop.org Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kevin Hilman Subject: [PATCH v6 2/6] drm/meson: add Amlogic Video FBC registers Date: Tue, 21 Apr 2020 18:15:55 +0200 Message-Id: <20200421161559.2347-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200421161559.2347-1-narmstrong@baylibre.com> References: <20200421161559.2347-1-narmstrong@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the registers of the VPU VD1 Amlogic FBC decoder module, and routing register. Tested-by: Kevin Hilman Signed-off-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_registers.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h index 8ea00546cd4e..08631fdfe4b9 100644 --- a/drivers/gpu/drm/meson/meson_registers.h +++ b/drivers/gpu/drm/meson/meson_registers.h @@ -144,10 +144,15 @@ #define VIU_SW_RESET_OSD1 BIT(0) #define VIU_MISC_CTRL0 0x1a06 #define VIU_CTRL0_VD1_AFBC_MASK 0x170000 +#define VIU_CTRL0_AFBC_TO_VD1 BIT(20) #define VIU_MISC_CTRL1 0x1a07 #define MALI_AFBC_MISC GENMASK(15, 8) #define D2D3_INTF_LENGTH 0x1a08 #define D2D3_INTF_CTRL0 0x1a09 +#define VD1_AFBCD0_MISC_CTRL 0x1a0a +#define VD1_AXI_SEL_AFBC (1 << 12) +#define AFBC_VD1_SEL (1 << 10) +#define VD2_AFBCD1_MISC_CTRL 0x1a0b #define VIU_OSD1_CTRL_STAT 0x1a10 #define VIU_OSD1_OSD_BLK_ENABLE BIT(0) #define VIU_OSD1_OSD_MEM_MODE_LINEAR BIT(2) @@ -365,6 +370,23 @@ #define VIU_OSD1_OETF_LUT_ADDR_PORT 0x1add #define VIU_OSD1_OETF_LUT_DATA_PORT 0x1ade #define AFBC_ENABLE 0x1ae0 +#define AFBC_MODE 0x1ae1 +#define AFBC_SIZE_IN 0x1ae2 +#define AFBC_DEC_DEF_COLOR 0x1ae3 +#define AFBC_CONV_CTRL 0x1ae4 +#define AFBC_LBUF_DEPTH 0x1ae5 +#define AFBC_HEAD_BADDR 0x1ae6 +#define AFBC_BODY_BADDR 0x1ae7 +#define AFBC_SIZE_OUT 0x1ae8 +#define AFBC_OUT_YSCOPE 0x1ae9 +#define AFBC_STAT 0x1aea +#define AFBC_VD_CFMT_CTRL 0x1aeb +#define AFBC_VD_CFMT_W 0x1aec +#define AFBC_MIF_HOR_SCOPE 0x1aed +#define AFBC_MIF_VER_SCOPE 0x1aee +#define AFBC_PIXEL_HOR_SCOPE 0x1aef +#define AFBC_PIXEL_VER_SCOPE 0x1af0 +#define AFBC_VD_CFMT_H 0x1af1 /* vpp */ #define VPP_DUMMY_DATA 0x1d00 -- 2.22.0