From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: [PATCH v5 2/6] drm/hisilicon/kirin: prepare for drmP.h removal from drm_modeset_helper.h Date: Sat, 19 Jan 2019 09:40:10 +0100 Message-ID: <20190119084014.5355-3-sam@ravnborg.org> References: <20190119084014.5355-1-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A97856E2BA for ; Sat, 19 Jan 2019 08:40:42 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id k19-v6so13538230lji.11 for ; Sat, 19 Jan 2019 00:40:42 -0800 (PST) In-Reply-To: <20190119084014.5355-1-sam@ravnborg.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Sean Paul , Xinliang Liu , Maxime Ripard , David Airlie , Chen Feng , Alexey Brodkin , Philippe Cornu , linux-kernel@vger.kernel.org, Vincent Abriou , Xinwei Kong , Kieran Bingham , Laurent Pinchart , Rongrong Zou , Sam Ravnborg , Yannick Fertre List-Id: dri-devel@lists.freedesktop.org VGhlIHVzZSBvZiBkcm1QLmggaXMgZGlzY291cmFnZWQgYW5kIHJlbW92YWwgb2YgaXQgZnJvbQpk cm1fbW9kZXNldF9oZWxwZXIuaCBjYXVzZWQga2lyaW4gdG8gZmFpbCB0byBidWlsZC4KClRoaXMg cGF0Y2ggaW50cm9kdWNlIHRoZSBuZWNlc3NhcnkgZml4ZXMgdG8gcHJlcGFyZSBmb3IgdGhlCmRy bVAuaCByZW1vdmFsIGZyb20gZHJtX21vZGVzZXRfaGVscGVyLmguCkxpc3Qgb2YgaW5jbHVkZSBm aWxlcyBzb3J0ZWQgYWxwaGFiZXRpY2FsbHkuCgpCdWlsZCB0ZXN0ZWQgb24gYXJtIHg4NiBhbGxt b2Rjb25maWcgdXNpbmcgdGhlIGZvbGxvd2luZyBoYWNrCnRvIHRoZSBLY29uZmlnIGZpbGU6Cgp8 IC0gICAgICAgZGVwZW5kcyBvbiBEUk0gJiYgT0YgJiYgQVJNNjQKfCArICAgICAgIGRlcGVuZHMg b24gRFJNICYmIE9GICYmIChBUk02NCB8fCAoWDg2XzY0ICYmIENPTVBJTEVfVEVTVCkpCgpCdWls ZCBmYWlsZWQgb24gMzJiaXQgQVJNIC0gc28gdGhlIFg4Nl82NCBoYWNrIHdhcyByZXF1aXJlZC4K VGhlIENPTVBJTEVfVEVTVCBoYWNrIGlzIG5vdCBzdWJtaXR0ZWQgYXMgdGhlIHByZWZlcnJlZCBm aXgKaXMgc29tZXRoaW5nIHdoZXJlIHdlIGhhdmUgY292ZXJhZ2Ugb24gMzJiaXQgQVJNIHRvby4K CnYyOgotIFNvcnQgbGlzdCBvZiBpbmNsdWRlIGZpbGVzCgpTaWduZWQtb2ZmLWJ5OiBTYW0gUmF2 bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+CkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdA aGlzaWxpY29uLmNvbT4KQ2M6IFJvbmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpD YzogWGlud2VpIEtvbmcgPGtvbmcua29uZ3hpbndlaUBoaXNpbGljb24uY29tPgpDYzogQ2hlbiBG ZW5nIDxwdWNrLmNoZW5AaGlzaWxpY29uLmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBs aW51eC5pZT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2R3X2RybV9kc2kuYyB8IDExICsrKysrKysrLS0tCiAx IGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4vZHdfZHJtX2RzaS5jIGIvZHJpdmVy cy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9kd19kcm1fZHNpLmMKaW5kZXggYjRjN2FmM2FiNmFl Li4wMDljOGNiMzlhYzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4vZHdfZHJtX2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4vZHdf ZHJtX2RzaS5jCkBAIC0xNywxMiArMTcsMTcgQEAKIAogI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgog I2luY2x1ZGUgPGxpbnV4L2NvbXBvbmVudC5oPgorI2luY2x1ZGUgPGxpbnV4L2RlbGF5Lmg+Cisj aW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CisjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNl Lmg+CiAKLSNpbmNsdWRlIDxkcm0vZHJtX29mLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNf aGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9jcnRjX2hlbHBlci5oPgotI2luY2x1ZGUgPGRy bS9kcm1fbWlwaV9kc2kuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2RldmljZS5oPgogI2luY2x1ZGUg PGRybS9kcm1fZW5jb2Rlcl9zbGF2ZS5oPgotI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBl ci5oPgorI2luY2x1ZGUgPGRybS9kcm1fbWlwaV9kc2kuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX29m Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wcmludC5oPgogCiAjaW5jbHVkZSAiZHdfZHNpX3JlZy5o IgogCi0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FDA2C61CE4 for ; Sat, 19 Jan 2019 08:40:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CB202086A for ; Sat, 19 Jan 2019 08:40:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LZdMzlfI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727735AbfASIkn (ORCPT ); Sat, 19 Jan 2019 03:40:43 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41364 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727679AbfASIkm (ORCPT ); Sat, 19 Jan 2019 03:40:42 -0500 Received: by mail-lj1-f195.google.com with SMTP id k15-v6so13565548ljc.8 for ; Sat, 19 Jan 2019 00:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lVdSxad1eREzQaMM2zTwEdkEkNEXB56rMNuGRhxTrn0=; b=LZdMzlfIEi/DG7iM9ZN1I+nKBSwW6i7kRZzp9P814vCJ6mkhv3jZbPMech/VgEpugY AjU4KSmUbWzCex3zC6kqbhwpfuVC3xmzvTR76YFl83iX4LAFsuVG1KcsWEyULAtMRpKZ vZ96JEvXHwoCrOE8BWCitpuaBTSfqnstwfvz0Vmf0WBgD/YUXCmX1AG9L95u9v6YB1/n zHR6eMAsc9Rii13iK/HujVt6ala6NIgPQ+XC4hFWaSEWNKqdRAoJEaTtF+IV1y+Caqwd 6A0EP0FprNcDkTKTGfBIx+eTqUyoeX2gBTpDveftJEB/T/XXkjb2jUVf/YCJLZC9Z3Ky X7tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lVdSxad1eREzQaMM2zTwEdkEkNEXB56rMNuGRhxTrn0=; b=q2MDAkHIHHYLu+EH4UJ5lKFIDHx5Apb4JkeWYIAEWB1QqLF4Kj5FnMGHAso6ZGCUVx e9a1PEVS5ja41u84DjycH1dgpGEuJ3h7uvS5c7+gle0pT0Zjqp1dhCBwWC+U5T1c8lXT tMsLJnQvM0huIG0fUf7XdLu5e3V46pPqXZ/GUNnJ01V5IfKbYQGQ0vWstB8NIXnI6ZAW wnRLAtOEDsTGWQGDSZJ5FuJIZWzL/IeQMp0OPW/FA5u8PDnoxki+e/nIB32oipgxUREQ og7k33nRu3u5IA0GQksr3MkRhop1BbFz3/C7r0I6/j0gKdlOSO75FIrXQM6C4bjaBxgW +0Bw== X-Gm-Message-State: AJcUukdXnZGQJD9HjmrZBpvszhi37AcpaR6bfrMlvFikzKWbaCqXh7to KZ1AQNNnxIl/+tCujTVskqE= X-Google-Smtp-Source: ALg8bN7f0j7Ejm5Cfc/lh02A1elnOMgWOQcx3BjKzusLRe9AcW1iNJxEFwHngOk8Iv53Bai+0S1TMA== X-Received: by 2002:a2e:9983:: with SMTP id w3-v6mr14831924lji.133.1547887240879; Sat, 19 Jan 2019 00:40:40 -0800 (PST) Received: from jupiter.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id p23sm1187109lfh.47.2019.01.19.00.40.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 00:40:40 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Cc: Sam Ravnborg , Alexey Brodkin , Andrzej Hajda , Benjamin Gaignard , Chen Feng , Daniel Vetter , David Airlie , Kieran Bingham , Laurent Pinchart , Laurent Pinchart , Maarten Lankhorst , Maxime Ripard , Philippe Cornu , Rongrong Zou , Sean Paul , Vincent Abriou , Xinliang Liu , Xinwei Kong , Yannick Fertre , linux-kernel@vger.kernel.org Subject: [PATCH v5 2/6] drm/hisilicon/kirin: prepare for drmP.h removal from drm_modeset_helper.h Date: Sat, 19 Jan 2019 09:40:10 +0100 Message-Id: <20190119084014.5355-3-sam@ravnborg.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190119084014.5355-1-sam@ravnborg.org> References: <20190119084014.5355-1-sam@ravnborg.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The use of drmP.h is discouraged and removal of it from drm_modeset_helper.h caused kirin to fail to build. This patch introduce the necessary fixes to prepare for the drmP.h removal from drm_modeset_helper.h. List of include files sorted alphabetically. Build tested on arm x86 allmodconfig using the following hack to the Kconfig file: | - depends on DRM && OF && ARM64 | + depends on DRM && OF && (ARM64 || (X86_64 && COMPILE_TEST)) Build failed on 32bit ARM - so the X86_64 hack was required. The COMPILE_TEST hack is not submitted as the preferred fix is something where we have coverage on 32bit ARM too. v2: - Sort list of include files Signed-off-by: Sam Ravnborg Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index b4c7af3ab6ae..009c8cb39ac4 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -17,12 +17,17 @@ #include #include +#include +#include +#include -#include +#include #include -#include +#include #include -#include +#include +#include +#include #include "dw_dsi_reg.h" -- 2.12.0