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.0 required=3.0 tests=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 73D5FC43381 for ; Fri, 1 Mar 2019 13:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A4D72084F for ; Fri, 1 Mar 2019 13:03:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387439AbfCANDR (ORCPT ); Fri, 1 Mar 2019 08:03:17 -0500 Received: from mblankhorst.nl ([141.105.120.124]:42966 "EHLO mblankhorst.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732687AbfCANDR (ORCPT ); Fri, 1 Mar 2019 08:03:17 -0500 From: Maarten Lankhorst To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Maarten Lankhorst , Laurent Pinchart , Kieran Bingham , linux-renesas-soc@vger.kernel.org Subject: [PATCH 12/17] drm/rcar-du: Convert to using __drm_atomic_helper_crtc_reset() for reset. Date: Fri, 1 Mar 2019 13:56:22 +0100 Message-Id: <20190301125627.7285-13-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190301125627.7285-1-maarten.lankhorst@linux.intel.com> References: <20190301125627.7285-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Convert rcar-du to using __drm_atomic_helper_crtc_reset(), instead of writing its own version. Instead of open coding destroy_state(), call it directly for freeing the old state. Signed-off-by: Maarten Lankhorst Cc: Laurent Pinchart Cc: Kieran Bingham Cc: linux-renesas-soc@vger.kernel.org --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 4cdea14d552f..7766551e67fc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -891,22 +891,17 @@ static void rcar_du_crtc_cleanup(struct drm_crtc *crtc) static void rcar_du_crtc_reset(struct drm_crtc *crtc) { - struct rcar_du_crtc_state *state; + struct rcar_du_crtc_state *state = kzalloc(sizeof(*state), GFP_KERNEL); - if (crtc->state) { + if (crtc->state) rcar_du_crtc_atomic_destroy_state(crtc, crtc->state); - crtc->state = NULL; - } - state = kzalloc(sizeof(*state), GFP_KERNEL); + __drm_atomic_helper_crtc_reset(crtc, &state->state); if (state == NULL) return; state->crc.source = VSP1_DU_CRC_NONE; state->crc.index = 0; - - crtc->state = &state->state; - crtc->state->crtc = crtc; } static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 12/17] drm/rcar-du: Convert to using __drm_atomic_helper_crtc_reset() for reset. Date: Fri, 1 Mar 2019 13:56:22 +0100 Message-ID: <20190301125627.7285-13-maarten.lankhorst@linux.intel.com> References: <20190301125627.7285-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190301125627.7285-1-maarten.lankhorst@linux.intel.com> 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: linux-renesas-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, Kieran Bingham , Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org Q29udmVydCByY2FyLWR1IHRvIHVzaW5nIF9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCgp LCBpbnN0ZWFkIG9mCndyaXRpbmcgaXRzIG93biB2ZXJzaW9uLiBJbnN0ZWFkIG9mIG9wZW4gY29k aW5nIGRlc3Ryb3lfc3RhdGUoKSwgY2FsbAppdCBkaXJlY3RseSBmb3IgZnJlZWluZyB0aGUgb2xk IHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hh cnRAaWRlYXNvbmJvYXJkLmNvbT4KQ2M6IEtpZXJhbiBCaW5naGFtIDxraWVyYW4uYmluZ2hhbSty ZW5lc2FzQGlkZWFzb25ib2FyZC5jb20+CkNjOiBsaW51eC1yZW5lc2FzLXNvY0B2Z2VyLmtlcm5l bC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYyB8IDExICsr Ky0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jIGIv ZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMKaW5kZXggNGNkZWExNGQ1NTJm Li43NzY2NTUxZTY3ZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJf ZHVfY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jCkBA IC04OTEsMjIgKzg5MSwxNyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfY2xlYW51cChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAKIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19yZXNldChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IHJjYXJfZHVfY3J0Y19zdGF0ZSAqc3RhdGU7 CisJc3RydWN0IHJjYXJfZHVfY3J0Y19zdGF0ZSAqc3RhdGUgPSBremFsbG9jKHNpemVvZigqc3Rh dGUpLCBHRlBfS0VSTkVMKTsKIAotCWlmIChjcnRjLT5zdGF0ZSkgeworCWlmIChjcnRjLT5zdGF0 ZSkKIAkJcmNhcl9kdV9jcnRjX2F0b21pY19kZXN0cm95X3N0YXRlKGNydGMsIGNydGMtPnN0YXRl KTsKLQkJY3J0Yy0+c3RhdGUgPSBOVUxMOwotCX0KIAotCXN0YXRlID0ga3phbGxvYyhzaXplb2Yo KnN0YXRlKSwgR0ZQX0tFUk5FTCk7CisJX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX3Jlc2V0KGNy dGMsICZzdGF0ZS0+c3RhdGUpOwogCWlmIChzdGF0ZSA9PSBOVUxMKQogCQlyZXR1cm47CiAKIAlz dGF0ZS0+Y3JjLnNvdXJjZSA9IFZTUDFfRFVfQ1JDX05PTkU7CiAJc3RhdGUtPmNyYy5pbmRleCA9 IDA7Ci0KLQljcnRjLT5zdGF0ZSA9ICZzdGF0ZS0+c3RhdGU7Ci0JY3J0Yy0+c3RhdGUtPmNydGMg PSBjcnRjOwogfQogCiBzdGF0aWMgaW50IHJjYXJfZHVfY3J0Y19lbmFibGVfdmJsYW5rKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVs