From patchwork Thu Jan 31 17:36:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 10791067 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 7D85114E1 for ; Thu, 31 Jan 2019 17:36:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65A6131018 for ; Thu, 31 Jan 2019 17:36:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5863231283; Thu, 31 Jan 2019 17:36:07 +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 A7B4931018 for ; Thu, 31 Jan 2019 17:36:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81DDC6E13D; Thu, 31 Jan 2019 17:36:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id F36416E13D for ; Thu, 31 Jan 2019 17:36:02 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 401BCA78; Thu, 31 Jan 2019 09:36:02 -0800 (PST) Received: from e110455-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DF4173F59C; Thu, 31 Jan 2019 09:36:01 -0800 (PST) Received: by e110455-lin.cambridge.arm.com (Postfix, from userid 1000) id 3B9596801B1; Thu, 31 Jan 2019 17:36:00 +0000 (GMT) Date: Thu, 31 Jan 2019 17:36:00 +0000 From: Liviu Dudau To: Dave Airlie , Daniel Vetter Subject: [PULL] malidp-next Message-ID: <20190131173600.GN25147@e110455-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.11.2 (2019-01-07) 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: James Qian Wang , MaliDP Maintainers , DRI devel Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi DRM maintainers, This pull includes the new Arm "komeda" DRM driver. It is currently hosted in the same repo as the other "mali-dp" driver because it is the next iteration of the IP. Please note that due to changes in the DRM framework, after merging the tree you will need to apply the following patch to resolve the build failure caused by commit b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") --8<--------------------------------------------------------- From: Stephen Rothwell Date: Tue, 15 Jan 2019 10:42:04 +1100 Subject: [PATCH] drm/komeda: merge fix for drm_atomic_private_obj_init() API change Signed-off-by: Stephen Rothwell Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 --8<--------------------------------------------------------- Thanks, Liviu The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c: Linux 5.0-rc1 (2019-01-06 17:08:20 -0800) are available in the Git repository at: git://linux-arm.org/linux-ld.git for-upstream/mali-dp for you to fetch changes up to dcc9d76b6d834d06a317e27fa8242d7e009135ac: drm/komeda: Off by one in komeda_fb_get_pixel_addr() (2019-01-30 13:46:17 +0000) ---------------------------------------------------------------- Brian Starkey (1): drm/afbc: Add AFBC modifier usage documentation Dan Carpenter (1): drm/komeda: Off by one in komeda_fb_get_pixel_addr() Liviu Dudau (1): drm: arm/komeda: Remove IRQ parsing from initial series james qian wang (Arm Technology China) (10): drm/arm: Delete redundant CONFIG_DRM_ARM drm/komeda: komeda_dev/pipeline/component definition and initialzation dt/bindings: drm/komeda: Add DT bindings for ARM display processor D71 drm/komeda: Build komeda to be a platform module drm/komeda: Add DT parsing drm/komeda: Add komeda_format_caps for format handling drm/komeda: Add komeda_framebuffer drm/komeda: Attach komeda_dev to DRM-KMS drm/doc: Add initial komeda driver documentation MAINTAINERS: Add maintainer for Arm komeda driver .../devicetree/bindings/display/arm,komeda.txt | 73 +++ Documentation/gpu/afbc.rst | 235 ++++++++++ Documentation/gpu/drivers.rst | 2 + Documentation/gpu/komeda-kms.rst | 488 +++++++++++++++++++++ MAINTAINERS | 15 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/arm/Kconfig | 12 +- drivers/gpu/drm/arm/Makefile | 1 + drivers/gpu/drm/arm/display/Kbuild | 3 + drivers/gpu/drm/arm/display/Kconfig | 14 + drivers/gpu/drm/arm/display/include/malidp_io.h | 42 ++ .../gpu/drm/arm/display/include/malidp_product.h | 23 + drivers/gpu/drm/arm/display/include/malidp_utils.h | 16 + drivers/gpu/drm/arm/display/komeda/Makefile | 21 + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 111 +++++ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 106 +++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 186 ++++++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 110 +++++ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 144 ++++++ .../drm/arm/display/komeda/komeda_format_caps.c | 75 ++++ .../drm/arm/display/komeda/komeda_format_caps.h | 89 ++++ .../drm/arm/display/komeda/komeda_framebuffer.c | 165 +++++++ .../drm/arm/display/komeda/komeda_framebuffer.h | 34 ++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 167 +++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 113 +++++ .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 200 +++++++++ .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 359 +++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 109 +++++ .../drm/arm/display/komeda/komeda_private_obj.c | 88 ++++ include/uapi/drm/drm_fourcc.h | 3 + 30 files changed, 2998 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt create mode 100644 Documentation/gpu/afbc.rst create mode 100644 Documentation/gpu/komeda-kms.rst create mode 100644 drivers/gpu/drm/arm/display/Kbuild create mode 100644 drivers/gpu/drm/arm/display/Kconfig create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h create mode 100644 drivers/gpu/drm/arm/display/include/malidp_product.h create mode 100644 drivers/gpu/drm/arm/display/include/malidp_utils.h create mode 100644 drivers/gpu/drm/arm/display/komeda/Makefile create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_plane.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c index 9edfd6ab0c12..f1c9e3fefa86 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c @@ -45,7 +45,7 @@ static int komeda_pipeline_obj_add(struct komeda_kms_dev *kms, return -ENOMEM; st->pipe = pipe; - drm_atomic_private_obj_init(&pipe->obj, &st->obj, + drm_atomic_private_obj_init(&kms->base, &pipe->obj, &st->obj, &komeda_pipeline_obj_funcs); return 0;