From patchwork Thu Aug 1 03:44:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170279 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4835945ile; Wed, 31 Jul 2019 20:44:46 -0700 (PDT) X-Received: by 2002:a63:db45:: with SMTP id x5mr104125348pgi.293.1564631086391; Wed, 31 Jul 2019 20:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631086; cv=none; d=google.com; s=arc-20160816; b=t3oVdjYwYSUWpldzrvAytIXmvkNFD/8qmlpxedNlHCJpgYxRcY2XwsPew54sHOvRyi XTONYBAsnWSZ94pOUzcJ9BkDo+h5+T/Rt/RPtxZVbkwQDL2Aj9zmXceL0NHSFmr2ni72 cwktMZhae2W675TAUZgI+zkKBpnYKvm+aBwLff2jrtoTcf3gau7tsfJ+yjyvMFW0nrme ocAnsXTOTZV1xENhOcSdyvrEVenIupaj9E6n3szpa3jUbgoMLAioqDq0ud7uDpZAW7fR gHbjH9Yx/+DRaMxbGhydU8q45DuzhFrSVlT2W8tWzXRBj4lt93xrNjE0mXdvDtC6KZbB H78Q== 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=3J53VNWVJBsGu++2k8+xv87EgCNc+PbFLaNFsCRi7RQ=; b=I8SB+QzQvyAllJfOu/CtAjccbzcvY11eJsg+522ZLIHDBa/PuF+3XzwON5Tx18u5y4 3PV2lDzXUT7uBXBla/rlRSpuyi8AioQIO4WxRtvR4dkhExGhoRokAM1AVoKCwdcgWEnM 3FLnWuR7A7knYrEs6UGd2xRpJQ8A+vYLPokvYvWL0DGhZ7Ks+ONszEjwa5t9cgvJRHJR BAlKIQ6Q3rVOIICyUDglr7gOKyOXaPMt06uNYKRloTtsf/4FhnT/jpM7AdA0AtnrzS9v BbbGy7bTlK045dFUArLQ4vcj7EhJcQvPrm/a1+qY3PFjW2Pe2GsibA0u2LUkp4rE7fBg nn0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y1iVdTDc; 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 m23sor4486855pjv.21.2019.07.31.20.44.46 for (Google Transport Security); Wed, 31 Jul 2019 20:44:46 -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=y1iVdTDc; 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=3J53VNWVJBsGu++2k8+xv87EgCNc+PbFLaNFsCRi7RQ=; b=y1iVdTDcBUa0wFaA/SURtNmg482d/Gqz0ErVvPR52MUAP3TmRHvMrYgPon2HSmbIXR ldTM9+Jj23uaZCMo7XuO7iZ5nSzgKpD2vyT3tIHCwGiV8LWJgjhxxE8kyMsN82n9npD+ Gbhu79TbuSbbVM2RHq/yt6PJQVhFDvtTdcmsw1WzGyqV9g+wMDfFXDZmBCcqr2CQ6i6Z vVdQWYGbCqQDN4gV9vPXAGXnfvwFWPP9Wc9TiD/kl3vtlUFNn53yKRBB/pGn3E268/Y+ ZP0bvLWWNu6eiIBlu9c//MM/69xgvI30ytxI9nPTx3sLTM/Lbh01qvq3uPrIPKsi3tgb uscw== 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=3J53VNWVJBsGu++2k8+xv87EgCNc+PbFLaNFsCRi7RQ=; b=SbmOvJbamdKam+yQKoW+xYcXAQzxJLx6nGyMtUvnZF0MUZcf8fJ9RilLdJdqK74nBR GPywK4W1wnpSFFabjRYvOB8S/vduV2icBI3O5/BqQ9zYaqMnV0LfAg5SCVHsFeggIrYM vtJoC2QY5l3R7z1wQ6B+gMa0UoANIW5ej3+Pfw4WsyWkDQ2XDJY/Y1v+EIRLjanjR8It E7LabpWsMwwT3rI0zSvb9Mfi1b7pHhvcr5x6nTaFLWdHu9zXU6FIWT+LIsflo8w/JTMB UWatt0VSvJoO6V6MR5grZxWxlTKw+Bjck6Ct7KP6JCLNCWP/nrGx9hUin0JkTQPlf3Cu VXzg== X-Gm-Message-State: APjAAAXrE7GyyNziMvkUC3q9yFlqwskhFarfE2NLIXZDdGbkcY6nFTu3 Jby9/0Udqb7dFz5dMVSsDhBMrSCz X-Google-Smtp-Source: APXvYqyjuNTweoqvOn8fmgje5hXZaV37WmEMLBmbgR+UP13FrngVGkWMmaQRJ58Ci0K3hy8O+LDFFg== X-Received: by 2002:a17:90a:b394:: with SMTP id e20mr6225886pjr.76.1564631085830; Wed, 31 Jul 2019 20:44:45 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.44.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:44:45 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v3 00/26] drm: Kirin driver cleanups to prep for Kirin960 support Date: Thu, 1 Aug 2019 03:44:13 +0000 Message-Id: <20190801034439.98227-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 I was reminded I had sent this out a few months ago, but forgot all about it! Apologies! Anyway, I wanted to resubmit this patch set so I didn't have to continue carrying it forever to keep the HiKey960 board running. 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: Rongrong Zou 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 (4): drm: kirin: Get rid of drmP.h includes 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 +- .../gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 + .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 360 +++++++----------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 257 +++++++++---- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 ++- 6 files changed, 379 insertions(+), 301 deletions(-) -- 2.17.1