Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp86797ybl; Tue, 20 Aug 2019 16:07:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGfIUVApI7/IJGkIvfWOFYUpw/Wj12uPq8WrxNxx0sBHfKmBL/2R205oPP7iEC4SMDJ6Od X-Received: by 2002:a17:90b:f03:: with SMTP id br3mr2353430pjb.67.1566342464259; Tue, 20 Aug 2019 16:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342464; cv=none; d=google.com; s=arc-20160816; b=zbw8b/adATpFT/FWjf8HvKeOlGUEMvC5cfBy2ECXMNpt5yOhoUcTr5H1jItXdYSix1 TaTROa2WvBh3MlV9dNX0w1v3tyZtL5/DWIdcC6Hd5KU3ZnU3rxplLF/+qHPmidDd/8k2 3uVGcW/UJd+HSZUJmxseHVgejnIJsjNXMLhAdYHQQOmzLGu6g3LN4maKOaCgbHckWQAs 0BhtrjZ7ku+D+vd2GZvv08WZAq2hbXJCbA7Wz/gYAeUUp2oGEvgv59IxdI77LZUl+hHP h4ngM08AzvGd71bd+pAco8KiD0xow0yWhKTM+YQf8yE68CB5R/FyQNgCNPw+LJgpB7At 0TnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=ryVGrG9e9TLG77G8C99Y8FHgpTFEkxY3w2ym7UqLajQ=; b=BtlYiAYfafqnBuj+jlOTIHlE8PX7uya7dOVAnEe6nEV+czPnoL0Vj+7lfp2lR/mtat fuHfo475kkUc/5CA1IsP+0DO19oLrXlwCQ42xukbZV48Moi69izqz+ExaG3qrDScqMI7 W9D7J1GzDAs8bioJJ3qqR9kWOdK4D6b9icb5NR9mwGHd7dWWilov/FVQvx9jtTEQ1MXM KlFP9Y5fsncikSslXJzM8HyDp1ohzPvreHaBs8cw22zZt6/uhED8mxmQL7iSA4fltMFs NHt4yB0fREY/+JoOs80q6bc0fpeFahD/AWTqJ9A37LR/Y14pIEshQwTr2hCpLEIfTlUa 6uVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvLo7b5o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y34si13645772plb.423.2019.08.20.16.07.27; Tue, 20 Aug 2019 16:07:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SvLo7b5o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726215AbfHTXGb (ORCPT + 99 others); Tue, 20 Aug 2019 19:06:31 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42923 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbfHTXGb (ORCPT ); Tue, 20 Aug 2019 19:06:31 -0400 Received: by mail-pg1-f195.google.com with SMTP id p3so145804pgb.9 for ; Tue, 20 Aug 2019 16:06:31 -0700 (PDT) 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=HuP+2blT26FrzwAYBK8/vNUgJib0rFr3b6btt81KwXhftBFZwX9QyGusU5ia6Zj2dy wHNyPvoskFxsj4ZcQEc1A4rb4Gg7dY00Y96fSVbUQdFTbhG8qtqnsS6zc716wWW8Sdk8 37oKjTSj0JZHuScO2EbCLVXyAuBX/YSY0cKaT9zGc9GYIYn9p8hLgbKTIoxBBHCzOQcS /CeS6SgDVhLpHbSVUza8T2rVLqc0fGJHUkgX5tK+0mT6onMFsUUD9MpjswZPLMmTPnk3 ZQJou8BRAj5CcVznhp/PPyiF8/heiMnrjIBDOpDUC9KqTiN4dQbJgdagiDi6HIPKLnH1 NJ0A== X-Gm-Message-State: APjAAAX3/c6XfjQvS6nBFinpfIWzDtXz2/BeOAOHkBwlrzwtH+EZGK31 xjKjnqXeXmHSYnOycCQxtQlO4umJxlc= X-Received: by 2002:aa7:8106:: with SMTP id b6mr32592440pfi.5.1566342390162; Tue, 20 Aug 2019 16:06:30 -0700 (PDT) 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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