From patchwork Wed Aug 14 18:46:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171329 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1202849ily; Wed, 14 Aug 2019 11:47:07 -0700 (PDT) X-Received: by 2002:a62:be04:: with SMTP id l4mr1336202pff.77.1565808427751; Wed, 14 Aug 2019 11:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565808427; cv=none; d=google.com; s=arc-20160816; b=cFtMgqtstFlMET7OVN/re+DWslCgHuEdrStETfsET+3WWtrJG0yTljBbKCWmE5R7TA snvTMZHHHSkDJ1Zih2tV/ib+Uh7Wej4+XYH/ps+JUYg+fl+ZLIFOmJ/30Z6UIWqQiidj PtuSh1xtlw+m5Sii5RFIOSAvACcq/BjPKunikrCk/dJiBl0ISEROt/l9dbveVcLfKEoM jrHo4k75HtuVJXlwIE+hxYM1CwmEaaf5XSWVEjxaxMohIgvkvFSopPRNaLQ+IIBYwFSG 74CTqsea6aKQvef4n/xusBq8M/ZvqLvLtHPNoyN8gT64uJ0zvhYmvVc3jigOWQ/vdFZs MI0A== 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=e2lnOM0nFup0+pDAGMOKduOv8qYBIIuH1dlGE1F9sPs=; b=onQbCMwGWXt/GalBA45Omh814wrklrZojeasPO7IVPf3FwIHTdzfPFU7MVCHQJKvgl wnSnZhXyDTenzAPutJWrlmfproyo87R8gzY12Kl0z8ZHKLRZsYK7yBNxlTd1Hk/MHluN HqOGUu5P6BB6BMN7katLpn6JWrJRYmiY5hUHFoLsGNjgcHSx/mI3EekAqusrqkzOnz7q Rk1gKbPHX/j4YToaXBsSWHg3KBmUzUOJmR2zzMyWIREhwLoTKgLEt8J8f23FSFmLwl8M CyoPlPaAnt6fKDeEFgWrf5XTlPFw/yicMvK5Lg1Nv3ggKWwQ8O2z05aTGNZGUDEDWLNr 4rrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ieBmvOQN; 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 a31sor421463pga.15.2019.08.14.11.47.07 for (Google Transport Security); Wed, 14 Aug 2019 11:47:07 -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=ieBmvOQN; 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=e2lnOM0nFup0+pDAGMOKduOv8qYBIIuH1dlGE1F9sPs=; b=ieBmvOQNdM7BQd6Gca54c7f9RiF5MCWMIzSkw+wXsP2vjco7xd/LwS6OHt7Vh+UZ7e 7X24Y6DGIMQVMarWETzWtvF3pDWJWSw1YKDBP8rmmDG7pP/GyO6pbbioIou35P4bC9bF /ELRg6ljWXtk4eXrayC3/WrpoC6NwCzClrkkIsqBD2sBlXMDpG0z63orWyQLi/7zZU2v 6maY394hvg3TvFaqJlUdFc9s5xmIuQKjdjGQmWLr1VUlH1QFPoSa8q35I3WJoYfFuEXn 8C2x/ZkXdmNPUKXBQznie/ercfyaygJhrUTnTAcWqdVCkqZVKPV62Jby73cv1LF5wEYw +PNA== 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=e2lnOM0nFup0+pDAGMOKduOv8qYBIIuH1dlGE1F9sPs=; b=WCn5u5c2twY60NzoJ09DpDfe26OiLELrk71uALzCjd0dRiRhHrUUeNtjoDhH4kDQh4 y3Q1xNgyI1462TjIUUlG1U4GAVYvkIoOFpem574+hc9kwG/jutjuqNKm8ZJtAN3LDJPE XCwUhDjvOSI07MC8kZji864RG6hwW8UPTmaNSNlU9Y+TOqt6hnYhxzfEfE9aHWWHRSnR Yiu9CA2Fhg8AzqN+BygF0VlwA+1Uu/V9Up6v8CsMw2SxgQzpE6LXEHF7NIkDLe5+yHdh jaY3gO2mq0hoPv0h4BSaDr+jUHjp+JfkGJgPcFxfzfo3yLFKQpG3cs/XPvYBJxuJ9rYl frqQ== X-Gm-Message-State: APjAAAW0satjqPzyl9LPi5ylJcADOtL8G1V+IrfbRzuYA5trvitd9ySj x9EM6o/5Jx0+UUwTkKfvYBdYF4ck4RDDdQ== X-Google-Smtp-Source: APXvYqzCysw5Y/5dmalFUJZRxuOj2cWrLosCwl46s9aspUhN6WQQhOJ4b4h1iOtEIPC6cZFBiEMV7Q== X-Received: by 2002:a63:3fc9:: with SMTP id m192mr471718pga.429.1565808426805; Wed, 14 Aug 2019 11:47:06 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id y16sm610855pfc.36.2019.08.14.11.47.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 14 Aug 2019 11:47:06 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [RESEND][PATCH v3 00/26] drm: Kirin driver cleanups to prep for Kirin960 support Date: Wed, 14 Aug 2019 18:46:36 +0000 Message-Id: <20190814184702.54275-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 Just wanted to resend 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, 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 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 (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 Acked-by: Xinliang Liu