From nobody Thu Dec 18 08:09:31 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 722D1C433FE for ; Sat, 1 Oct 2022 14:58:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229722AbiJAO6r (ORCPT ); Sat, 1 Oct 2022 10:58:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbiJAO62 (ORCPT ); Sat, 1 Oct 2022 10:58:28 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C46FD9C216 for ; Sat, 1 Oct 2022 07:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664636305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OuGypoVnJNhzQ829OSUgv+IQ/uot1AKSMTgWYQGrHy8=; b=OSUjilZe4+amow3pM51i/xyAvYws5izoC2t4GsHMjnVOeu996QzTnGqzFVZDYY/sbFccfv SDjib9PNML39rbnpxC15baBSlIt/aW2joZsHgJE8d2LkbKT5yYCvtjE9h1K7LdJRzpgjCP Qwloc6C+QsZWN5lZgBo9CFhM0Q3PY9Y= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-235-ytc08axIMHW4n763tzxVLQ-1; Sat, 01 Oct 2022 10:58:23 -0400 X-MC-Unique: ytc08axIMHW4n763tzxVLQ-1 Received: by mail-ed1-f69.google.com with SMTP id h11-20020a05640250cb00b004580ee86ca8so5522312edb.6 for ; Sat, 01 Oct 2022 07:58:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=OuGypoVnJNhzQ829OSUgv+IQ/uot1AKSMTgWYQGrHy8=; b=Wd1yUDHWc5SOdeMwxwaOgvtKU0eW5LIIlzPONJyDBThBtz4h2LwzNKTI4DOI5WDghn eiSnRAeYbMo7sgqrghfg2za3GN6FuMAmCj+b4oFcJaVMoAuDZp16bubjnxRn7B2ghaRv Mb1sO/fDmdDJhCOr8Umx2DhfYnWkaMBv7Evo9kgZzInUX6sD7iA3BlCdGxw1Yu04KLxS KxEmCI6GRXZKX6eVuAsV4fqX6gnR3UuTjsmHeHScKddowR0gqpRwAAt4teM1rT79L73N 7HdLj0wHQJTflAtfQvfD1Jti/xr4MckSU7ssmEyLR6hKWl1Dbg6+7AbygF4ZPAkqEtzA RIQg== X-Gm-Message-State: ACrzQf3Pix0tr7GxokvDT+09fyfpe2gTus/tNLVK/qrbT9wtOzSuiHH5 rMR6ZiDAeOx2lP58IUi8M7ilENJdf/7Y7iQHfC5P9WHruoPHAKDBaEeUWjnOkjllB1MJEZPT201 ifrHa08E8NB/Kc21D9rWBM3Fl X-Received: by 2002:a17:907:75c6:b0:788:e57b:e809 with SMTP id jl6-20020a17090775c600b00788e57be809mr3735267ejc.381.1664636302382; Sat, 01 Oct 2022 07:58:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6tYvJN/BoUijgGJpiQA9gruyLcr6e+s4NgjahO10nZI7Z+Sz0VARMJ4HyrIlczlfiZU4mzZw== X-Received: by 2002:a17:907:75c6:b0:788:e57b:e809 with SMTP id jl6-20020a17090775c600b00788e57be809mr3735257ejc.381.1664636302172; Sat, 01 Oct 2022 07:58:22 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id y8-20020a056402358800b0044dbecdcd29sm3761029edc.12.2022.10.01.07.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 07:58:21 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, stefan@agner.ch, alison.wang@nxp.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v2 4/9] drm/fsl-dcu: plane: use drm managed resources Date: Sat, 1 Oct 2022 16:57:57 +0200 Message-Id: <20221001145802.515916-5-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221001145802.515916-1-dakr@redhat.com> References: <20221001145802.515916-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use drm managed resource allocation (drmm_universal_plane_alloc()) in order to get rid of the explicit destroy hook in struct drm_plane_funcs. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 4 ++-- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 25 ++++++++------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/f= sl-dcu/fsl_dcu_drm_crtc.c index 0b70624260fc..1dad90f701c8 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c @@ -176,8 +176,8 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *= fsl_dev) fsl_dcu_drm_init_planes(drm); =20 primary =3D fsl_dcu_drm_primary_create_plane(drm); - if (!primary) - return -ENOMEM; + if (IS_ERR(primary)) + return PTR_ERR(primary); =20 ret =3D drmm_crtc_init_with_planes(drm, crtc, primary, NULL, &fsl_dcu_drm_crtc_funcs, NULL); diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/= fsl-dcu/fsl_dcu_drm_plane.c index 91865956da02..23ff285da477 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c @@ -174,7 +174,6 @@ static const struct drm_plane_helper_funcs fsl_dcu_drm_= plane_helper_funcs =3D { static const struct drm_plane_funcs fsl_dcu_drm_plane_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_plane_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_plane_destroy_state, - .destroy =3D drm_plane_helper_destroy, .disable_plane =3D drm_atomic_helper_disable_plane, .reset =3D drm_atomic_helper_plane_reset, .update_plane =3D drm_atomic_helper_update_plane, @@ -206,24 +205,18 @@ void fsl_dcu_drm_init_planes(struct drm_device *dev) struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev) { struct drm_plane *primary; - int ret; - - primary =3D kzalloc(sizeof(*primary), GFP_KERNEL); - if (!primary) { - DRM_DEBUG_KMS("Failed to allocate primary plane\n"); - return NULL; - } =20 /* possible_crtc's will be filled in later by crtc_init */ - ret =3D drm_universal_plane_init(dev, primary, 0, - &fsl_dcu_drm_plane_funcs, - fsl_dcu_drm_plane_formats, - ARRAY_SIZE(fsl_dcu_drm_plane_formats), - NULL, DRM_PLANE_TYPE_PRIMARY, NULL); - if (ret) { - kfree(primary); - primary =3D NULL; + primary =3D drmm_universal_plane_alloc(dev, struct drm_plane, dev, 0, + &fsl_dcu_drm_plane_funcs, + fsl_dcu_drm_plane_formats, + ARRAY_SIZE(fsl_dcu_drm_plane_formats), + NULL, DRM_PLANE_TYPE_PRIMARY, NULL); + if (IS_ERR(primary)) { + DRM_DEBUG_KMS("Failed to create primary plane\n"); + return primary; } + drm_plane_helper_add(primary, &fsl_dcu_drm_plane_helper_funcs); =20 return primary; --=20 2.37.3