From patchwork Tue Aug 20 23:06:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171859 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp179803ily; Tue, 20 Aug 2019 16:06:30 -0700 (PDT) X-Received: by 2002:a17:90a:be02:: with SMTP id a2mr2381991pjs.94.1566342390592; Tue, 20 Aug 2019 16:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342390; cv=none; d=google.com; s=arc-20160816; b=WZiwbAHK/DaULqqWa4GQOgujd2EnIErPoAxKQuWWhl6SMfwZwTLy1Bvu9+0rTPhG0O Kg67jf40CKo/FlgveQbIo0kIHx0DMMZHTowtCYRFTY0jbKOEJQDk2GS9lGiICOPWYCXg TRY5QsWNIkLRRJBEWFQzUco0BeNULl4icUBqgHoO/dvRJD22XdBXKMVVrwzESFQnnz2N /ghQR5wnK2aOwTvvekCMzetfEqxuTYStfvbhIBmC1NgNWFL+P2ZuK1HsGpmkm/SGsZmh ghp1fCOiXXB/QXkmSdS02uQi8brTk3+KpfbNjTDADtTHqH153E66quvCpLZQY63HWHD9 YocA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=ryVGrG9e9TLG77G8C99Y8FHgpTFEkxY3w2ym7UqLajQ=; b=EAkCQOLSPyKtbIMgEDDHo9Xd8QM1v8qv+AjorEyPzSV48lhXpSbjCwe8W2r2RCOJOn akQGUoCkhWkg+FwgHHWa/jQ5krOLthPTv8jDw9xwnakecOXK93GUQnjqZTAm7OG5gdhF JxFhDr8BZpKrUAYTLFwj74dbGcUUawl2SHYohmvClKByKFhgvhneklCVQpBXuylmkKkA p0WKN4GisSFgQnqn0q1EcobY8Ah17cEApkEJJjWoHIVX+VGfsusStRbk/FOaDjfBfkzY 2Ho8mkgz50efksy20qOm2x6h/OS/2y1c/pQBpDbOdGyPig6qwXKTskGPbm2zCu5EJF9R 1NIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvLo7b5o; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b84sor5617015pfb.57.2019.08.20.16.06.30 for (Google Transport Security); Tue, 20 Aug 2019 16:06:30 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvLo7b5o; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ryVGrG9e9TLG77G8C99Y8FHgpTFEkxY3w2ym7UqLajQ=; b=SvLo7b5oXDEKoxq5CyyOKxHb8DjsMtSbtA+l64JS8PbQNprKp/5rKAwnjVaSRZej+N 5Y3joc/TwMsyRDh16VqIEl6OBEI20tBiWPll08s3F1SbHMKu5AOlm4m5p+1Q5UKHL+WJ IPC+nrI6EGoq+9OmY+LOcNZI2XtInSONlxh6ltFePerDnpUEe6pirUOW8cJyTWm36jKg cMghCRZDgHGkFLH8r2R12DD/QymlYfiGCH6e9qwQliJEDNgKpm1qih8xo9A5SbuZTDC3 SC5QCdMJ/YAZ80sK7XDYPUerY3h7a2t8tcwKX1wjS2ImDSTFQhhsFNT8GR5bPzeKQU7P QfHg== 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=ryVGrG9e9TLG77G8C99Y8FHgpTFEkxY3w2ym7UqLajQ=; b=gAkzCUYeSlA6Ny9Lsd5fIJO1HU8QqSAKQiZBH222hmS+jbFOWyQUj38CtudSgc66iG pRxxul2gkiAZKMv/IfU7PWH5tGO9ij63LM+SPjSyUcPmpGBiWYVoUoD8bWYpbS+bsfu0 W7yL/vo3U8W9nrFv5ZN9seb1R4PNBgXJ/xHv2sl1VGFwxI+qMd7AAmQ0EgoWnR0fgLjV Dey9mn1ZtXjt6OngI/oe2aFrawUGVuocaDGSNHFixk/KYzcPlYDEJ76ZVhq0JX4wvtn0 PXhPKqs6JJBppj2sbVktfEAeHG/8HrOXbCin7MzISaIah0q6sv6bnT1/ULr1k58seYTw WaOA== X-Gm-Message-State: APjAAAViBRTITfTVJ13p9vmTzMwJ+qe0X41p/N2GaVeyKQZANGPZxN/u eTp7kFDdDEDkDYnSk9pxCChUbDGl X-Google-Smtp-Source: APXvYqxbdTcern/qekwcKh1V7jWD3jUbS4fVYztkrvYCDaXS4gUd4pNM6l5b7XRrj8Vc34pnD8zU3A== X-Received: by 2002:aa7:8106:: with SMTP id b6mr32592440pfi.5.1566342390162; Tue, 20 Aug 2019 16:06:30 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q4sm27564747pff.183.2019.08.20.16.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:29 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v5 00/25] drm: Kirin driver cleanups to prep for Kirin960 support Date: Tue, 20 Aug 2019 23:06:01 +0000 Message-Id: <20190820230626.23253-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 Sending this out again (apologies!), to address a few issues Sam found. 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, 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 thanks -john New in v5: * Whitespace changes and few logic simplifications to get checkpatch.pl --strict to pass, as noted by Sam * Fix for one of my patches which broke building the kirin driver as a module. Again noted by Sam. Cc: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg 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 | 3 +- .../gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 + .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 351 +++++++----------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 250 +++++++++---- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 ++- 6 files changed, 367 insertions(+), 296 deletions(-) -- 2.17.1