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 1C0E4C282DD for ; Tue, 23 Apr 2019 23:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC202218EA for ; Tue, 23 Apr 2019 23:22:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="OtmWoZBI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728792AbfDWXVL (ORCPT ); Tue, 23 Apr 2019 19:21:11 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34162 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728703AbfDWXVJ (ORCPT ); Tue, 23 Apr 2019 19:21:09 -0400 Received: by mail-pf1-f194.google.com with SMTP id b3so8267531pfd.1 for ; Tue, 23 Apr 2019 16:21:08 -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=/bl8KjJZ8VdKQUaQRpB+hHEQjF/aOlCQlEyUX72UB6E=; b=OtmWoZBIcZcpMPhq5QJY7URkVpfaVsaraS6hIv67HgjGOoxqt57yVNkoo6100XtjNx kBnwpBmgfo5Ta4Cq1nVSgLojL8KlHU/Z3ytxnOQISl+0ockKjuwM9vsPDkKXhFHIjVhm obMXeYCsaNw6s033mdWlROD0fpuMO1WntVXFqmdt4dF1yifXbIAcvvs6l/e2qp7GUKpj exbe91fcZi/UYhi8rWQdXk7fBLbLhBq2ifYh0ZUpYwhliv/JigIRtClhoVm9eIVAApud 468K0QK2vuGUEpUFcS1okbeGuAWNqzFvLfdt3OCSGv0Rg+HHkbry27Q4ppANyq73P5ud 1+EA== 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=/bl8KjJZ8VdKQUaQRpB+hHEQjF/aOlCQlEyUX72UB6E=; b=GlNBu3mX3ONhnfBbGydZJsk9j7NbBvZKK5JNSgniL0kJcmTKG1G3/tbR2s6cFJq05A C9XzjIM9w0uCSrnvcbMT2x0t40v8BTzCk3n3FHDAuiaNt6G3NHd9LO9MiGW9YjiS8IrP spePYn8R1+uW2CKxHFENwArsHyrJAJUwJVwRDXUI6mVxyaHtSZBLdAetLdgUog//SFx/ aZzeRLQjAcaMC9M0YqOgkeCRY7Mx8sQvD4uusXqUYLUhyZifjdd55qAV7q5/Os/aT626 XUN5TE6gl8jVJS+owe+ex9qAvDfCVxkd34Ws5r0KNAx9DX41KcNCKZw36ej3A6SBn0YE fmeQ== X-Gm-Message-State: APjAAAXdwWoBMTsh2vAZP9sfYBsktNKSpNAm80wL8Q4XHC9IkSzKJTbb T2JOwVMqUuuglWAwx0AKacXJiE9Yohs= X-Google-Smtp-Source: APXvYqybCUl1ESlOHxixy4zHex8X6auuxEd3pYgD+rEA0e1A5nQ0uG8/073n5wgpDK5+PbJOxhszuQ== X-Received: by 2002:a62:1d94:: with SMTP id d142mr29806248pfd.83.1556061667802; Tue, 23 Apr 2019 16:21:07 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:07 -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 05/25] drm: kirin: Remove out_format from ade_crtc Date: Tue, 23 Apr 2019 16:20:36 -0700 Message-Id: <1556061656-1733-6-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 removes the out_format field in the struct ade_crtc, which was only ever set to LDI_OUT_RGB_888. Thus this patch removes the field and instead directly uses LDI_OUT_RGB_888. 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 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 56a55d9..27a5441 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -60,7 +60,6 @@ struct ade_crtc { struct ade_hw_ctx *ctx; struct work_struct drm_device_wq; bool enable; - u32 out_format; }; struct ade_plane { @@ -383,11 +382,10 @@ static irqreturn_t ade_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static void ade_display_enable(struct ade_crtc *acrtc) +static void ade_display_enable(struct ade_hw_ctx *ctx) { - struct ade_hw_ctx *ctx = acrtc->ctx; void __iomem *base = ctx->base; - u32 out_fmt = acrtc->out_format; + u32 out_fmt = LDI_OUT_RGB_888; /* enable output overlay compositor */ writel(ADE_ENABLE, base + ADE_OVLYX_CTL(OUT_OVLY)); @@ -514,7 +512,7 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc, } ade_set_medianoc_qos(ctx); - ade_display_enable(acrtc); + ade_display_enable(ctx); ade_dump_regs(ctx->base); drm_crtc_vblank_on(crtc); acrtc->enable = true; @@ -1024,7 +1022,6 @@ static int ade_drm_init(struct platform_device *pdev) ctx = &ade->ctx; acrtc = &ade->acrtc; acrtc->ctx = ctx; - acrtc->out_format = LDI_OUT_RGB_888; ret = ade_dts_parse(pdev, ctx); if (ret) -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 05/25] drm: kirin: Remove out_format from ade_crtc Date: Tue, 23 Apr 2019 16:20:36 -0700 Message-ID: <1556061656-1733-6-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-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6877D8972D for ; Tue, 23 Apr 2019 23:21:08 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id z16so3743619pgv.11 for ; Tue, 23 Apr 2019 16:21:08 -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 d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgb3V0X2Zvcm1hdApmaWVsZCBp biB0aGUgc3RydWN0IGFkZV9jcnRjLCB3aGljaCB3YXMgb25seSBldmVyIHNldCB0bwpMRElfT1VU X1JHQl84ODguCgpUaHVzIHRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgZmllbGQgYW5kIGluc3RlYWQg ZGlyZWN0bHkgdXNlcwpMRElfT1VUX1JHQl84ODguCgpDYzogWGlubGlhbmcgTGl1IDx6LmxpdXhp bmxpYW5nQGhpc2lsaWNvbi5jb20+CkNjOiBSb25ncm9uZyBab3UgPHpvdXJvbmdyb25nQGdtYWls LmNvbT4KQ2M6IFhpbndlaSBLb25nIDxrb25nLmtvbmd4aW53ZWlAaGlzaWxpY29uLmNvbT4KQ2M6 IENoZW4gRmVuZyA8cHVjay5jaGVuQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFp cmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBk cmktZGV2ZWwgPGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+ClNpZ25lZC1vZmYtYnk6 IFh1IFlpUGluZyA8eHV5aXBpbmdAaGlzaWxpY29uLmNvbT4KW2pzdHVsdHo6IHJld29yZGVkIGNv bW1pdCBtZXNzYWdlXQpTaWduZWQtb2ZmLWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGlu YXJvLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9h ZGUuYyB8IDkgKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4v a2lyaW5fZHJtX2FkZS5jIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9k cm1fYWRlLmMKaW5kZXggNTZhNTVkOS4uMjdhNTQ0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKQEAgLTYwLDcgKzYwLDYgQEAgc3RydWN0 IGFkZV9jcnRjIHsKIAlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4OwogCXN0cnVjdCB3b3JrX3N0cnVj dCBkcm1fZGV2aWNlX3dxOwogCWJvb2wgZW5hYmxlOwotCXUzMiBvdXRfZm9ybWF0OwogfTsKIAog c3RydWN0IGFkZV9wbGFuZSB7CkBAIC0zODMsMTEgKzM4MiwxMCBAQCBzdGF0aWMgaXJxcmV0dXJu X3QgYWRlX2lycV9oYW5kbGVyKGludCBpcnEsIHZvaWQgKmRhdGEpCiAJcmV0dXJuIElSUV9IQU5E TEVEOwogfQogCi1zdGF0aWMgdm9pZCBhZGVfZGlzcGxheV9lbmFibGUoc3RydWN0IGFkZV9jcnRj ICphY3J0YykKK3N0YXRpYyB2b2lkIGFkZV9kaXNwbGF5X2VuYWJsZShzdHJ1Y3QgYWRlX2h3X2N0 eCAqY3R4KQogewotCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBhY3J0Yy0+Y3R4OwogCXZvaWQg X19pb21lbSAqYmFzZSA9IGN0eC0+YmFzZTsKLQl1MzIgb3V0X2ZtdCA9IGFjcnRjLT5vdXRfZm9y bWF0OworCXUzMiBvdXRfZm10ID0gTERJX09VVF9SR0JfODg4OwogCiAJLyogZW5hYmxlIG91dHB1 dCBvdmVybGF5IGNvbXBvc2l0b3IgKi8KIAl3cml0ZWwoQURFX0VOQUJMRSwgYmFzZSArIEFERV9P VkxZWF9DVEwoT1VUX09WTFkpKTsKQEAgLTUxNCw3ICs1MTIsNyBAQCBzdGF0aWMgdm9pZCBhZGVf Y3J0Y19hdG9taWNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl9CiAKIAlhZGVfc2V0 X21lZGlhbm9jX3FvcyhjdHgpOwotCWFkZV9kaXNwbGF5X2VuYWJsZShhY3J0Yyk7CisJYWRlX2Rp c3BsYXlfZW5hYmxlKGN0eCk7CiAJYWRlX2R1bXBfcmVncyhjdHgtPmJhc2UpOwogCWRybV9jcnRj X3ZibGFua19vbihjcnRjKTsKIAlhY3J0Yy0+ZW5hYmxlID0gdHJ1ZTsKQEAgLTEwMjQsNyArMTAy Miw2IEBAIHN0YXRpYyBpbnQgYWRlX2RybV9pbml0KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYpCiAJY3R4ID0gJmFkZS0+Y3R4OwogCWFjcnRjID0gJmFkZS0+YWNydGM7CiAJYWNydGMtPmN0 eCA9IGN0eDsKLQlhY3J0Yy0+b3V0X2Zvcm1hdCA9IExESV9PVVRfUkdCXzg4ODsKIAogCXJldCA9 IGFkZV9kdHNfcGFyc2UocGRldiwgY3R4KTsKIAlpZiAocmV0KQotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==