From patchwork Tue Apr 23 23:20:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10913819 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 7648D14DB for ; Tue, 23 Apr 2019 23:21:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65D93285D6 for ; Tue, 23 Apr 2019 23:21:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 590A428969; Tue, 23 Apr 2019 23:21:05 +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 DFAE9285D6 for ; Tue, 23 Apr 2019 23:21:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8477B8972C; Tue, 23 Apr 2019 23:21:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id C73518972C for ; Tue, 23 Apr 2019 23:21:00 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id k19so8366498pgh.0 for ; Tue, 23 Apr 2019 16:21:00 -0700 (PDT) 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=NavZJnCijO9Xgd1fYNTsT4nFIUnXmDF4DUF9KLSKa8s=; b=l9niYl/jlyzk+FSN1f7sNbOYoH2keDaLyXhrnSoBXxzcyouV3cC4UczGQeso1p+7s/ SswtKkHfCGTHw/brxOi0mrsLOLii0Wk4enWDV9tjF9Q+e8Y8UnQkqipL4yr6BAnyPI6j r8JaeOEFnz5PTvtQtQoZWLHS5+jNNkkJZXLTxYKGC2iO8xTjpNN5anXgM8iS2EKX+Mec 5+FWmBUWLcYbwuRxVPGbcm3h74oAa4x1rIRmZBtdYxsxDDEIKwC1wGIoxQSoPthlB2TP OcRgHyiNo0H+dLFYOwa1T5LQo6MpV8Pb7ARoZvZl38MZE78CPgZ+6gjqtP/HQDW6o40b 83hg== X-Gm-Message-State: APjAAAVFYpo/VJTronoqHi+l9ue5Izt62aii4UKTrbVPoLxlOphSojhG +sNqr8gPIz5Ot9uz+BdifJS88Q== X-Google-Smtp-Source: APXvYqzD4QynVFTos1b3S6bLRazbb2S/EkNoO7qqGPhC/30BV19dHzRGKoO9sUU/B4YLIn1NZJSyEQ== X-Received: by 2002:a65:63d5:: with SMTP id n21mr27387406pgv.330.1556061660095; Tue, 23 Apr 2019 16:21:00 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:20:59 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH 00/25] drm: Kirin driver cleanups to prep for Kirin960 support Date: Tue, 23 Apr 2019 16:20:31 -0700 Message-Id: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=NavZJnCijO9Xgd1fYNTsT4nFIUnXmDF4DUF9KLSKa8s=; b=hC4NW+8gok1RSfCxLS5C6T6hvAIPOhK5ittLcKshLPJZLJhMQtFc5FqObQZp0NyDjP D9inMf3uhkNleZV0LxB6pc77ChLOXfTiOoGQ9yX7vVYFKja9cZfE+I/ywuIvrHAl7hHD oaSRJpiOSxMZqVBZOOsfDklhgMwx/wYA8HYhJxcI5MkuNB8UkGPhPlE61XHgRR9yoHwv bW71bgtwlNRhP7/CPImdHmmAF4w0qLgbdxvY9/5XS4Fza0FgLNVrph08yKXwY1s7RsxV +jRMH0zdFc2VefaIpz+kbjJR24cJ1KQ3+s71kdf9yka3e1e7OIpqCu9agy68ZMchS7Tp 64Nw== 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: YiPing Xu , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patchset contains one fix (in the front, so its easier to eventually backport), and a series of changes from YiPing to refactor the kirin drm driver so that it can be used on both kirin620 based devices (like the original HiKey board) as well as kirin960 based devices (like the HiKey960 board). The full kirin960 drm support is still being refactored, but as this base kirin rework was getting to be substantial, I wanted to send out the first chunk for some initial review, so that the review burden wasn't overwhelming. The full HiKey960 patch stack can be found here: https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/hikey960-mainline-WIP Feedback would be greatly appreciated! thanks -john Cc: YiPing Xu Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Da Lv (1): drm: kirin: Fix for hikey620 display offset problem John Stultz (3): drm: kirin: Remove HISI_KIRIN_DW_DSI config option drm: kirin: Remove unreachable return drm: kirin: Move workqueue to ade_hw_ctx structure Xu YiPing (21): drm: kirin: Remove uncessary parameter indirection drm: kirin: Remove out_format from ade_crtc drm: kirin: Rename ade_plane to kirin_plane drm: kirin: Rename ade_crtc to kirin_crtc drm: kirin: Dynamically allocate the hw_ctx drm: kirin: Move request irq handle in ade hw ctx alloc drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h drm: kirin: Reanme dc_ops to kirin_drm_data drm: kirin: Move ade crtc/plane help functions to driver_data drm: kirin: Move channel formats to driver data drm: kirin: Move mode config function to driver_data drm: kirin: Move plane number and primay plane in driver data drm: kirin: Move config max_width and max_height to driver data drm: kirin: Move drm driver to driver data drm: kirin: Add register connect helper functions in drm init drm: kirin: Rename plane_init and crtc_init drm: kirin: Fix dev->driver_data setting drm: kirin: Make driver_data variable non-global drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data drm: kirin: Pass driver data to crtc init and plane init drm: kirin: Move ade drm init to kirin drm drv drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +- drivers/gpu/drm/hisilicon/kirin/Makefile | 4 +- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 6 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 354 ++++++++++-------------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 253 ++++++++++++----- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 +++- 6 files changed, 376 insertions(+), 299 deletions(-) Reviewed-by: Sam Ravnborg