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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 8508CC3A5A0 for ; Mon, 19 Aug 2019 23:04:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52B1420644 for ; Mon, 19 Aug 2019 23:04:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hSGKNYO2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729037AbfHSXEr (ORCPT ); Mon, 19 Aug 2019 19:04:47 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36013 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728820AbfHSXDn (ORCPT ); Mon, 19 Aug 2019 19:03:43 -0400 Received: by mail-pg1-f193.google.com with SMTP id l21so2039671pgm.3 for ; Mon, 19 Aug 2019 16:03:43 -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=vrHDYLfRzW5R44jwvLTf4dm77QaWrtDgYKn2YYHQH74=; b=hSGKNYO20P3K6l7pCXNj+pRg4nPwis1eXt5blYJpY4Pd13rBJxlfZTBY5XeZNveOE+ UcI48q7qMofFEOXAAOZoMTBUVL1fA+w7wfU1eqWtUKUJZBNCrcd7Zv3xO7a0fjAeQM8o lWnLzpArAfeKekGoWf6srmyDA6wJ6rA05TyFCfTHQuJIrMrmDyQNkni6WiDiwle2rpgy sulinAi95dgsly+ty24sKVkF/i+cg35Eg3UDSxUZJ/C7DidqUt45YE07fFPYvTAq3WGM B5TS8kZZ/VIHarvElRbNRm2cCB5zoDGm64umt2zRUhhveN+LWBnJbfrbBNYl5vBj3Ccr NbEQ== 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=vrHDYLfRzW5R44jwvLTf4dm77QaWrtDgYKn2YYHQH74=; b=AQibftJj3FJXyvvhi9LjAD5OMZkdrQ7bqyD3oFcDr3CkNNpFVGYPgXYuCuHtR5U4MS v0L4GUyk7WxGdVMhEgSFkzoXTw2fAuv0LrIYGJjd8xdz9GXaKOeCuDltbJ4cUZujdVNT qTd+ZOjdsZth3+lJ3f/xrDQhhVAAQD2nu0sWg6w5Gx+69VTENOeuwHT/nNDPw9xTa+PF K80ZwumkkaEaCZhMsjP4tlJknnBuvX9eVH7x7DU7Q28RykS+G+47wmo7WET7Nivgc7Cd in785MQW5u2HK+Q5LHuy7GIN1coE1oPovch41TSxX6D7MVK4GGBL8Kz4OexapkqJDyJq pfUw== X-Gm-Message-State: APjAAAXOLKAkRA4S/Mz29+fYB16wlqEWkhPscCGV05o0Zp26AD7F91nA lUTIk1sWFPQsouu28I30cyc2a059KZM= X-Google-Smtp-Source: APXvYqxzysdkjNcO7urFjZ0W6hmbyN9GcPsmBs4XhQGHnyTxroGdpknUNGowoOf2aKbvYT+2chRN4Q== X-Received: by 2002:a17:90a:d58c:: with SMTP id v12mr22893267pju.7.1566255822491; Mon, 19 Aug 2019 16:03:42 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03:41 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v4 11/25] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h Date: Mon, 19 Aug 2019 23:03:07 +0000 Message-Id: <20190819230321.56480-12-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-1-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: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Acked-by: Xinliang Liu Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 27 ++----------------- .../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 191ee59f68b6..d3088d374f8b 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 22d1291668cd..d47cbb427979 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -9,6 +9,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.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH v4 11/25] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h Date: Mon, 19 Aug 2019 23:03:07 +0000 Message-ID: <20190819230321.56480-12-john.stultz@linaro.org> References: <20190819230321.56480-1-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A4BE6E467 for ; Mon, 19 Aug 2019 23:03:44 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id o13so2026667pgp.12 for ; Mon, 19 Aug 2019 16:03:44 -0700 (PDT) In-Reply-To: <20190819230321.56480-1-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 , dri-devel , Xinliang Liu , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgc29tZSBzaGFyZWQKc3RydWN0dXJlcyBh bmQgaGVscGVycyB0byB0aGUgY29tbW9uIGtpcmluX2RybV9kcnYuaAoKVGhlc2Ugc3RydWN0dXJl cyB3aWxsIGxhdGVyIHVzZWQgYnkgYm90aCBraXJpbjYyMCBhbmQKZnV0dXJlIGtpcmluOTYwIGRy aXZlcgoKQ2M6IFJvbmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogWGlubGlh bmcgTGl1IDx6LmxpdXhpbmxpYW5nQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFp cmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBk cmktZGV2ZWwgPGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+CkNjOiBTYW0gUmF2bmJv cmcgPHNhbUByYXZuYm9yZy5vcmc+CkFja2VkLWJ5OiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlh bmdAaGlzaWxpY29uLmNvbT4KUmV2aWV3ZWQtYnk6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3Jn Lm9yZz4KU2lnbmVkLW9mZi1ieTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgpb anN0dWx0ejogcmV3b3JkZWQgY29tbWl0IG1lc3NhZ2VdClNpZ25lZC1vZmYtYnk6IEpvaG4gU3R1 bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgotLS0KIC4uLi9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fYWRlLmMgICB8IDI3ICsrLS0tLS0tLS0tLS0tLS0tLS0KIC4uLi9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmggICB8IDI0ICsrKysrKysrKysrKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Fk ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5k ZXggMTkxZWU1OWY2OGI2Li5kMzA4OGQzNzRmOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9o aXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCkBAIC0zOCwxMiArMzgsNiBAQAogI2RlZmlu ZSBPVVRfT1ZMWQlBREVfT1ZMWTIgLyogb3V0cHV0IG92ZXJsYXkgY29tcG9zaXRvciAqLwogI2Rl ZmluZSBBREVfREVCVUcJMQogCi0jZGVmaW5lIHRvX2tpcmluX2NydGMoY3J0YykgXAotCWNvbnRh aW5lcl9vZihjcnRjLCBzdHJ1Y3Qga2lyaW5fY3J0YywgYmFzZSkKLQotI2RlZmluZSB0b19raXJp bl9wbGFuZShwbGFuZSkgXAotCWNvbnRhaW5lcl9vZihwbGFuZSwgc3RydWN0IGtpcmluX3BsYW5l LCBiYXNlKQotCiAKIHN0cnVjdCBhZGVfaHdfY3R4IHsKIAl2b2lkIF9faW9tZW0gICpiYXNlOwpA QCAtNTksMTggKzUzLDYgQEAgc3RydWN0IGFkZV9od19jdHggewogCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKIH07CiAKLXN0cnVjdCBraXJpbl9jcnRjIHsKLQlzdHJ1Y3QgZHJtX2NydGMgYmFzZTsK LQl2b2lkICpod19jdHg7Ci0JYm9vbCBlbmFibGU7Ci19OwotCi1zdHJ1Y3Qga2lyaW5fcGxhbmUg ewotCXN0cnVjdCBkcm1fcGxhbmUgYmFzZTsKLQl2b2lkICpod19jdHg7Ci0JdTMyIGNoOwotfTsK LQogc3RydWN0IGFkZV9kYXRhIHsKIAlzdHJ1Y3Qga2lyaW5fY3J0YyBjcnRjOwogCXN0cnVjdCBr aXJpbl9wbGFuZSBwbGFuZXNbQURFX0NIX05VTV07CkBAIC03OCwxMiArNjAsNyBAQCBzdHJ1Y3Qg YWRlX2RhdGEgewogfTsKIAogLyogYWRlLWZvcm1hdCBpbmZvOiAqLwotc3RydWN0IGFkZV9mb3Jt YXQgewotCXUzMiBwaXhlbF9mb3JtYXQ7Ci0JZW51bSBhZGVfZmJfZm9ybWF0IGFkZV9mb3JtYXQ7 Ci19OwotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGFkZV9mb3JtYXQgYWRlX2Zvcm1hdHNbXSA9IHsK K3N0YXRpYyBjb25zdCBzdHJ1Y3Qga2lyaW5fZm9ybWF0IGFkZV9mb3JtYXRzW10gPSB7CiAJLyog MTZicHAgUkdCOiAqLwogCXsgRFJNX0ZPUk1BVF9SR0I1NjUsIEFERV9SR0JfNTY1IH0sCiAJeyBE Uk1fRk9STUFUX0JHUjU2NSwgQURFX0JHUl81NjUgfSwKQEAgLTEyNyw3ICsxMDQsNyBAQCBzdGF0 aWMgdTMyIGFkZV9nZXRfZm9ybWF0KHUzMiBwaXhlbF9mb3JtYXQpCiAKIAlmb3IgKGkgPSAwOyBp IDwgQVJSQVlfU0laRShhZGVfZm9ybWF0cyk7IGkrKykKIAkJaWYgKGFkZV9mb3JtYXRzW2ldLnBp eGVsX2Zvcm1hdCA9PSBwaXhlbF9mb3JtYXQpCi0JCQlyZXR1cm4gYWRlX2Zvcm1hdHNbaV0uYWRl X2Zvcm1hdDsKKwkJCXJldHVybiBhZGVfZm9ybWF0c1tpXS5od19mb3JtYXQ7CiAKIAkvKiBub3Qg Zm91bmQgKi8KIAlEUk1fRVJST1IoIk5vdCBmb3VuZCBwaXhlbCBmb3JtYXQhIWZvdXJjY19mb3Jt YXQ9ICVkXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9r aXJpbl9kcm1fZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2Ry bV9kcnYuaAppbmRleCAyMmQxMjkxNjY4Y2QuLmQ0N2NiYjQyNzk3OSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKQEAgLTksNiArOSwzMCBA QAogCiAjZGVmaW5lIE1BWF9DUlRDCTIKIAorI2RlZmluZSB0b19raXJpbl9jcnRjKGNydGMpIFwK Kwljb250YWluZXJfb2YoY3J0Yywgc3RydWN0IGtpcmluX2NydGMsIGJhc2UpCisKKyNkZWZpbmUg dG9fa2lyaW5fcGxhbmUocGxhbmUpIFwKKwljb250YWluZXJfb2YocGxhbmUsIHN0cnVjdCBraXJp bl9wbGFuZSwgYmFzZSkKKworLyoga2lyaW4tZm9ybWF0IHRyYW5zbGF0ZSB0YWJsZSAqLworc3Ry dWN0IGtpcmluX2Zvcm1hdCB7CisJdTMyIHBpeGVsX2Zvcm1hdDsKKwl1MzIgaHdfZm9ybWF0Owor fTsKKworc3RydWN0IGtpcmluX2NydGMgeworCXN0cnVjdCBkcm1fY3J0YyBiYXNlOworCXZvaWQg Kmh3X2N0eDsKKwlib29sIGVuYWJsZTsKK307CisKK3N0cnVjdCBraXJpbl9wbGFuZSB7CisJc3Ry dWN0IGRybV9wbGFuZSBiYXNlOworCXZvaWQgKmh3X2N0eDsKKwl1MzIgY2g7Cit9OworCiAvKiBk aXNwbGF5IGNvbnRyb2xsZXIgaW5pdC9jbGVhbnVwIG9wcyAqLwogc3RydWN0IGtpcmluX2RjX29w cyB7CiAJaW50ICgqaW5pdCkoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldik7Ci0tIAoyLjE3 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==