From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 11/25] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h Date: Tue, 23 Apr 2019 16:20:42 -0700 Message-ID: <1556061656-1733-12-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3170B89740 for ; Tue, 23 Apr 2019 23:21:17 +0000 (UTC) Received: by mail-pl1-x644.google.com with SMTP id w24so8264721plp.2 for ; Tue, 23 Apr 2019 16:21:17 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Xu YiPing , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgc29tZSBzaGFyZWQKc3RydWN0dXJlcyBh bmQgaGVscGVycyB0byB0aGUgY29tbW9uIGtpcmluX2RybV9kcnYuaAoKVGhlc2Ugc3RydWN0dXJl cyB3aWxsIGxhdGVyIHVzZWQgYnkgYm90aCBraXJpbjYyMCBhbmQKZnV0dXJlIGtpcmluOTYwIGRy aXZlcgoKQ2M6IFhpbmxpYW5nIExpdSA8ei5saXV4aW5saWFuZ0BoaXNpbGljb24uY29tPgpDYzog Um9uZ3JvbmcgWm91IDx6b3Vyb25ncm9uZ0BnbWFpbC5jb20+CkNjOiBYaW53ZWkgS29uZyA8a29u Zy5rb25neGlud2VpQGhpc2lsaWNvbi5jb20+CkNjOiBDaGVuIEZlbmcgPHB1Y2suY2hlbkBoaXNp bGljb24uY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpDYzogRGFuaWVs IFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogZHJpLWRldmVsIDxkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnPgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBpbmcgPHh1eWlwaW5nQGhpc2ls aWNvbi5jb20+Cltqc3R1bHR6OiByZXdvcmRlZCBjb21taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1i eTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgfCAyNyArKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYu aCB8IDI0ICsrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0 aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hp c2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29u L2tpcmluL2tpcmluX2RybV9hZGUuYwppbmRleCBmNTRjZjk5Li42OTYwNGFkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwpAQCAtMzgsMTIg KzM4LDYgQEAKICNkZWZpbmUgT1VUX09WTFkJQURFX09WTFkyIC8qIG91dHB1dCBvdmVybGF5IGNv bXBvc2l0b3IgKi8KICNkZWZpbmUgQURFX0RFQlVHCTEKIAotI2RlZmluZSB0b19raXJpbl9jcnRj KGNydGMpIFwKLQljb250YWluZXJfb2YoY3J0Yywgc3RydWN0IGtpcmluX2NydGMsIGJhc2UpCi0K LSNkZWZpbmUgdG9fa2lyaW5fcGxhbmUocGxhbmUpIFwKLQljb250YWluZXJfb2YocGxhbmUsIHN0 cnVjdCBraXJpbl9wbGFuZSwgYmFzZSkKLQogCiBzdHJ1Y3QgYWRlX2h3X2N0eCB7CiAJdm9pZCBf X2lvbWVtICAqYmFzZTsKQEAgLTU5LDE4ICs1Myw2IEBAIHN0cnVjdCBhZGVfaHdfY3R4IHsKIAlz dHJ1Y3QgZHJtX2NydGMgKmNydGM7CiB9OwogCi1zdHJ1Y3Qga2lyaW5fY3J0YyB7Ci0Jc3RydWN0 IGRybV9jcnRjIGJhc2U7Ci0Jdm9pZCAqaHdfY3R4OwotCWJvb2wgZW5hYmxlOwotfTsKLQotc3Ry dWN0IGtpcmluX3BsYW5lIHsKLQlzdHJ1Y3QgZHJtX3BsYW5lIGJhc2U7Ci0Jdm9pZCAqaHdfY3R4 OwotCXUzMiBjaDsKLX07Ci0KIHN0cnVjdCBhZGVfZGF0YSB7CiAJc3RydWN0IGtpcmluX2NydGMg Y3J0YzsKIAlzdHJ1Y3Qga2lyaW5fcGxhbmUgcGxhbmVzW0FERV9DSF9OVU1dOwpAQCAtNzgsMTIg KzYwLDcgQEAgc3RydWN0IGFkZV9kYXRhIHsKIH07CiAKIC8qIGFkZS1mb3JtYXQgaW5mbzogKi8K LXN0cnVjdCBhZGVfZm9ybWF0IHsKLQl1MzIgcGl4ZWxfZm9ybWF0OwotCWVudW0gYWRlX2ZiX2Zv cm1hdCBhZGVfZm9ybWF0OwotfTsKLQotc3RhdGljIGNvbnN0IHN0cnVjdCBhZGVfZm9ybWF0IGFk ZV9mb3JtYXRzW10gPSB7CitzdGF0aWMgY29uc3Qgc3RydWN0IGtpcmluX2Zvcm1hdCBhZGVfZm9y bWF0c1tdID0gewogCS8qIDE2YnBwIFJHQjogKi8KIAl7IERSTV9GT1JNQVRfUkdCNTY1LCBBREVf UkdCXzU2NSB9LAogCXsgRFJNX0ZPUk1BVF9CR1I1NjUsIEFERV9CR1JfNTY1IH0sCkBAIC0xMjcs NyArMTA0LDcgQEAgc3RhdGljIHUzMiBhZGVfZ2V0X2Zvcm1hdCh1MzIgcGl4ZWxfZm9ybWF0KQog CiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoYWRlX2Zvcm1hdHMpOyBpKyspCiAJCWlmIChh ZGVfZm9ybWF0c1tpXS5waXhlbF9mb3JtYXQgPT0gcGl4ZWxfZm9ybWF0KQotCQkJcmV0dXJuIGFk ZV9mb3JtYXRzW2ldLmFkZV9mb3JtYXQ7CisJCQlyZXR1cm4gYWRlX2Zvcm1hdHNbaV0uaHdfZm9y bWF0OwogCiAJLyogbm90IGZvdW5kICovCiAJRFJNX0VSUk9SKCJOb3QgZm91bmQgcGl4ZWwgZm9y bWF0ISFmb3VyY2NfZm9ybWF0PSAlZFxuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9o aXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNv bi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKaW5kZXggYWQwMjdkMS4uYjY2MjZmNSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKQEAgLTEzLDYg KzEzLDMwIEBACiAKICNkZWZpbmUgTUFYX0NSVEMJMgogCisjZGVmaW5lIHRvX2tpcmluX2NydGMo Y3J0YykgXAorCWNvbnRhaW5lcl9vZihjcnRjLCBzdHJ1Y3Qga2lyaW5fY3J0YywgYmFzZSkKKwor I2RlZmluZSB0b19raXJpbl9wbGFuZShwbGFuZSkgXAorCWNvbnRhaW5lcl9vZihwbGFuZSwgc3Ry dWN0IGtpcmluX3BsYW5lLCBiYXNlKQorCisvKiBraXJpbi1mb3JtYXQgdHJhbnNsYXRlIHRhYmxl ICovCitzdHJ1Y3Qga2lyaW5fZm9ybWF0IHsKKwl1MzIgcGl4ZWxfZm9ybWF0OworCXUzMiBod19m b3JtYXQ7Cit9OworCitzdHJ1Y3Qga2lyaW5fY3J0YyB7CisJc3RydWN0IGRybV9jcnRjIGJhc2U7 CisJdm9pZCAqaHdfY3R4OworCWJvb2wgZW5hYmxlOworfTsKKworc3RydWN0IGtpcmluX3BsYW5l IHsKKwlzdHJ1Y3QgZHJtX3BsYW5lIGJhc2U7CisJdm9pZCAqaHdfY3R4OworCXUzMiBjaDsKK307 CisKIC8qIGRpc3BsYXkgY29udHJvbGxlciBpbml0L2NsZWFudXAgb3BzICovCiBzdHJ1Y3Qga2ly aW5fZGNfb3BzIHsKIAlpbnQgKCppbml0KShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KTsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 5E908C10F03 for ; Tue, 23 Apr 2019 23:22:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20F00218EA for ; Tue, 23 Apr 2019 23:22:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cjViXEEt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729234AbfDWXWh (ORCPT ); Tue, 23 Apr 2019 19:22:37 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:38177 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728834AbfDWXVR (ORCPT ); Tue, 23 Apr 2019 19:21:17 -0400 Received: by mail-pl1-f194.google.com with SMTP id f36so8248238plb.5 for ; Tue, 23 Apr 2019 16:21:17 -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:in-reply-to:references; bh=QV6q4rIQIKonURhV5YI0Y2da8qAlozUPAhHD+uzvbZs=; b=cjViXEEth7iNuFYI0MTKtfltpV1DEW3RM2sP6kFUQRF1yZR+gHY7wnkxF3NQprorMh QZzV6oCUnje+bIBXL2+EU2opo6GijlLcAJlFZsX/91h9PBwEgQ6rR+QJVP/O0TDvse8n pQ/VJ6Qz9VTNyjO7XHtJiG+mFyQZKYwb70p6MYw1n0iIyJuoBhyyOBdNueeuYFDrrUm/ oJvlcKblSvExCfIpIG6Ngvo1v3zwOfBaUogRlbYNEeLPs7baorv9X9m/lbXA1tqQE4vi grJpEZNhCwaSYGU/9srOxbi2No7gzI0KKYLH8uJHtHf4fjcB3woDCkn/k2jsCI6VTlhB wScw== 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:in-reply-to :references; bh=QV6q4rIQIKonURhV5YI0Y2da8qAlozUPAhHD+uzvbZs=; b=lEZvpy/bpWbFV6BwxL8NVdSH9gIXu/TMBoiZPxTeq+Yc+JzPvgcyjqsycdWKl49Dhr 3ZewycuOEhoro1lP16e8yGHJvn5HKN7Riif4BiWDsDaCbFDrPTgm7Om0/D7H6Tzyempf jz9z9dCByVtW1D/wRyzUXO7UlNEft2n5kd5BJRDeXOc62/GE56bSyJnjYraHSSVazlLB aBnE3Y0++iJ2Y3j+JqUNMsC/eUKuZM7BLxoookkGKo3WBf9Svwl6DHoBLxo1DCQRlMhH ATRCNRPhVMjH4pPYZGo6RGqclA8v9ZFlGB4nzVedWAfP4Tq+asH5rkKSmPunmrUpBTNI c7zg== X-Gm-Message-State: APjAAAXLQdLZOdnr0RH7NNWryuElvlm2iOL5ITPE4gtWEjmS9/lDsP+x TAvmFHQC2Y8gGXZfToDq02F83L9JaDs= X-Google-Smtp-Source: APXvYqxcrohcoxF7N0y3iDmLR1PiNAeIDv8NwK0xG5vjhqwI1ajGwj0jXu3C4/WphYQxCdjQhubPBA== X-Received: by 2002:a17:902:a7:: with SMTP id a36mr28776329pla.111.1556061676303; Tue, 23 Apr 2019 16:21:16 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:15 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 11/25] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h Date: Tue, 23 Apr 2019 16:20:42 -0700 Message-Id: <1556061656-1733-12-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch moves some shared structures and helpers to the common kirin_drm_drv.h These structures will later used by both kirin620 and future kirin960 driver Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 27 ++----------------------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index f54cf99..69604ad 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -38,12 +38,6 @@ #define OUT_OVLY ADE_OVLY2 /* output overlay compositor */ #define ADE_DEBUG 1 -#define to_kirin_crtc(crtc) \ - container_of(crtc, struct kirin_crtc, base) - -#define to_kirin_plane(plane) \ - container_of(plane, struct kirin_plane, base) - struct ade_hw_ctx { void __iomem *base; @@ -59,18 +53,6 @@ struct ade_hw_ctx { struct drm_crtc *crtc; }; -struct kirin_crtc { - struct drm_crtc base; - void *hw_ctx; - bool enable; -}; - -struct kirin_plane { - struct drm_plane base; - void *hw_ctx; - u32 ch; -}; - struct ade_data { struct kirin_crtc crtc; struct kirin_plane planes[ADE_CH_NUM]; @@ -78,12 +60,7 @@ struct ade_data { }; /* ade-format info: */ -struct ade_format { - u32 pixel_format; - enum ade_fb_format ade_format; -}; - -static const struct ade_format ade_formats[] = { +static const struct kirin_format ade_formats[] = { /* 16bpp RGB: */ { DRM_FORMAT_RGB565, ADE_RGB_565 }, { DRM_FORMAT_BGR565, ADE_BGR_565 }, @@ -127,7 +104,7 @@ static u32 ade_get_format(u32 pixel_format) for (i = 0; i < ARRAY_SIZE(ade_formats); i++) if (ade_formats[i].pixel_format == pixel_format) - return ade_formats[i].ade_format; + return ade_formats[i].hw_format; /* not found */ DRM_ERROR("Not found pixel format!!fourcc_format= %d\n", diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index ad027d1..b6626f5 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -13,6 +13,30 @@ #define MAX_CRTC 2 +#define to_kirin_crtc(crtc) \ + container_of(crtc, struct kirin_crtc, base) + +#define to_kirin_plane(plane) \ + container_of(plane, struct kirin_plane, base) + +/* kirin-format translate table */ +struct kirin_format { + u32 pixel_format; + u32 hw_format; +}; + +struct kirin_crtc { + struct drm_crtc base; + void *hw_ctx; + bool enable; +}; + +struct kirin_plane { + struct drm_plane base; + void *hw_ctx; + u32 ch; +}; + /* display controller init/cleanup ops */ struct kirin_dc_ops { int (*init)(struct platform_device *pdev); -- 2.7.4