From nobody Sat Apr 18 10:53:35 2026 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 6D852C433EF for ; Thu, 14 Jul 2022 13:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239683AbiGNNAk (ORCPT ); Thu, 14 Jul 2022 09:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239680AbiGNNAh (ORCPT ); Thu, 14 Jul 2022 09:00:37 -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 ESMTP id E97DA45078 for ; Thu, 14 Jul 2022 06:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657803636; 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=f5+OHAHK2VLcrnL1KSJdq9/Govt0hy/raOewuyTrtrI=; b=FZFyV6SbiBFhBfHlTf2uboJeNzTgDzNIDcuLz9ChinjXYu5jlXxUWF5sjQrYWvv0x1p8f9 FaQ9NG7c+lGtnB3lA90sIOckWLJopLiyJtWEkPnw+Y3tUVKocoI1Ef3w+LMPgp0hDc7Tj/ 1MH7zGg3dhWuNBd5i3usPqxUfdELan4= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-443-ZljoYkOwNeiPRmzga4LjMQ-1; Thu, 14 Jul 2022 09:00:34 -0400 X-MC-Unique: ZljoYkOwNeiPRmzga4LjMQ-1 Received: by mail-ej1-f71.google.com with SMTP id nb10-20020a1709071c8a00b006e8f89863ceso741369ejc.18 for ; Thu, 14 Jul 2022 06:00:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f5+OHAHK2VLcrnL1KSJdq9/Govt0hy/raOewuyTrtrI=; b=6ZD5QFrFRzqnKId400I6hed5F3FFXuizYAFOVDiMj02DofbGcgFxvmuKldhlG5UqtH 74KuOKdUMEL6N5J+vczZVj2S+WC8bk8CFNj9rXHckInGray0ubdAibOLY1TlTdNY8e7C j+/4kjxNgLSg8TNpq9qMHFyPZxExbvatYJz0z1kjXp+nBIPJ/W+yKzWENTWYHKdK1T3c NhglRhNrYvryDLEGcd3xVdGTSQdRfQ+r+K/RG+Ng8GkvNSKpFpHqQWoqppb67YfGk81a hRhrrrBu+kzZgu1OT2o9R3/AfLSaIcAwzCJuIrP1mxuCrF3a8T8Em7mSfBFkCP+linmo kuJA== X-Gm-Message-State: AJIora945xgk5sUFYap1oFwnKW3l/tR1LulCGtF6EDXW9ZtUsTACekpE XHP4dMZwP18yvYozOS5swz21GVtNGyWhB7X/RJx41+0INYsEIkyXYZ3lRMU3zb3BhNMMAn1d4KO 9kZsZtSwstanjxc0FEXL56aRV X-Received: by 2002:a17:907:1b25:b0:6da:8206:fc56 with SMTP id mp37-20020a1709071b2500b006da8206fc56mr8627155ejc.81.1657803633107; Thu, 14 Jul 2022 06:00:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vkP+Ryg2/TaLqA61ZrbhfntjLs/5u4V31Ija64DGclgSFfjLRVcA3qAMSo+XslbGnUdCIcjA== X-Received: by 2002:a17:907:1b25:b0:6da:8206:fc56 with SMTP id mp37-20020a1709071b2500b006da8206fc56mr8627134ejc.81.1657803632961; Thu, 14 Jul 2022 06:00:32 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id zk9-20020a17090733c900b0072ecef772acsm694237ejb.2.2022.07.14.06.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 06:00:31 -0700 (PDT) From: Danilo Krummrich To: airlied@linux.ie, daniel@ffwll.ch, kraxel@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH 1/2] drm/virtio: plane: use drm managed resources Date: Thu, 14 Jul 2022 15:00:27 +0200 Message-Id: <20220714130028.2127858-2-dakr@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220714130028.2127858-1-dakr@redhat.com> References: <20220714130028.2127858-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 cleanup/simplify drm plane .destroy callback. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/virtio/virtgpu_plane.c | 30 +++++++------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virti= o/virtgpu_plane.c index 6d3cc9e238a4..3008551d6a05 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -67,16 +67,10 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourc= c) return format; } =20 -static void virtio_gpu_plane_destroy(struct drm_plane *plane) -{ - drm_plane_cleanup(plane); - kfree(plane); -} - static const struct drm_plane_funcs virtio_gpu_plane_funcs =3D { .update_plane =3D drm_atomic_helper_update_plane, .disable_plane =3D drm_atomic_helper_disable_plane, - .destroy =3D virtio_gpu_plane_destroy, + .destroy =3D drm_plane_cleanup, .reset =3D drm_atomic_helper_plane_reset, .atomic_duplicate_state =3D drm_atomic_helper_plane_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_plane_destroy_state, @@ -379,11 +373,7 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_= gpu_device *vgdev, const struct drm_plane_helper_funcs *funcs; struct drm_plane *plane; const uint32_t *formats; - int ret, nformats; - - plane =3D kzalloc(sizeof(*plane), GFP_KERNEL); - if (!plane) - return ERR_PTR(-ENOMEM); + int nformats; =20 if (type =3D=3D DRM_PLANE_TYPE_CURSOR) { formats =3D virtio_gpu_cursor_formats; @@ -394,17 +384,13 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio= _gpu_device *vgdev, nformats =3D ARRAY_SIZE(virtio_gpu_formats); funcs =3D &virtio_gpu_primary_helper_funcs; } - ret =3D drm_universal_plane_init(dev, plane, 1 << index, - &virtio_gpu_plane_funcs, - formats, nformats, - NULL, type, NULL); - if (ret) - goto err_plane_init; + + plane =3D drmm_universal_plane_alloc(dev, struct drm_plane, dev, + 1 << index, &virtio_gpu_plane_funcs, + formats, nformats, NULL, type, NULL); + if (IS_ERR(plane)) + return plane; =20 drm_plane_helper_add(plane, funcs); return plane; - -err_plane_init: - kfree(plane); - return ERR_PTR(ret); } --=20 2.36.1 From nobody Sat Apr 18 10:53:35 2026 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 751B1C43334 for ; Thu, 14 Jul 2022 13:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239303AbiGNNAq (ORCPT ); Thu, 14 Jul 2022 09:00:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239702AbiGNNAj (ORCPT ); Thu, 14 Jul 2022 09:00:39 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4750A53D25 for ; Thu, 14 Jul 2022 06:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657803638; 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=X16iBV7KhZ9Ln6lEGuQir3iZX0VSxdQjWbZR3Ippd7s=; b=XHtT40T40AMPpc6Zv4uwcdO1xKOV3McKGnSLJ1HbigEN23PDWzrrmlLIjg7Z0R1No3HY/V WuBiUGMVAL5KjosQpnQ0XsvXJmdP/siBRC4kLI/o1mwNKkoMfawsQxR+y+8jXqIOkoQjjm ++P8aUTQ79T8uKOCVYejTuRzrFkc6jM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-490-NAUAsaEUNMyovaBSsEIKZQ-1; Thu, 14 Jul 2022 09:00:36 -0400 X-MC-Unique: NAUAsaEUNMyovaBSsEIKZQ-1 Received: by mail-ej1-f70.google.com with SMTP id hq20-20020a1709073f1400b0072b9824f0a2so748351ejc.23 for ; Thu, 14 Jul 2022 06:00:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X16iBV7KhZ9Ln6lEGuQir3iZX0VSxdQjWbZR3Ippd7s=; b=ifQKleDOpGsOGcoRBXorMSMINouNJuE8Rrvm0BgofBXhTwUh8vqSAaR8x+sokuX7zc c2rLkZ5k4nU+gmRen6uYmvcco8SqgIy3XS57S2nsEmUKNpEQE163FUMPRi2N3tI8m5Xy +L6CEtPM5Z4p3fV846EZAqby8/6Y395r8L9vDfqMMFUMNoUq/G1MoV068/QDyYUogU6g 0/2aDftGWkGvS+nu300G3ATQLLxeKV2fP/5HbgG+yU9rIoEZMx5DvK3uNvf8SJQ2afj9 tyG7J5bFtyhRVeCMwDVnGBsSBnR6UfxVCU8M2kU3vlYY2t+zp2LG73AHWmXzplXjA7bH DoIw== X-Gm-Message-State: AJIora/UB09Jhoo6Y3zi/r/2tIu1FipO3M1JiuEwBMRJrzjfpw2WkoZm Ije3D/Sn8Mj/YElHzVxJG9zWyypZ63nsr+xlX0eYRr6daYbWqJOoIEj54Sy79rY7P6yOipUZ6fJ Zg98sF85qzgNVx/pR+qMpISh3 X-Received: by 2002:a17:906:6a26:b0:72e:cee5:d1b0 with SMTP id qw38-20020a1709066a2600b0072ecee5d1b0mr5451187ejc.404.1657803635400; Thu, 14 Jul 2022 06:00:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v85WghBi+OK8f1leK61CfSKKhJ1e/q/FFkhJ0V6008dxPsF5cUEPomwzP1oAuhcv+e0UGMJg== X-Received: by 2002:a17:906:6a26:b0:72e:cee5:d1b0 with SMTP id qw38-20020a1709066a2600b0072ecee5d1b0mr5451176ejc.404.1657803635237; Thu, 14 Jul 2022 06:00:35 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id zk9-20020a17090733c900b0072ecef772acsm694237ejb.2.2022.07.14.06.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 06:00:34 -0700 (PDT) From: Danilo Krummrich To: airlied@linux.ie, daniel@ffwll.ch, kraxel@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH 2/2] drm/virtio: kms: use drm managed resources Date: Thu, 14 Jul 2022 15:00:28 +0200 Message-Id: <20220714130028.2127858-3-dakr@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220714130028.2127858-1-dakr@redhat.com> References: <20220714130028.2127858-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" Allocate driver structures with drm managed resource allocators in order to cleanup/simplify the drm driver .release callback. Signed-off-by: Danilo Krummrich Reviewed-by: Daniel Vetter --- drivers/gpu/drm/virtio/virtgpu_kms.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/= virtgpu_kms.c index 3313b92db531..63ebe63ef409 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -28,6 +28,7 @@ #include =20 #include +#include =20 #include "virtgpu_drv.h" =20 @@ -66,10 +67,11 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_de= vice *vgdev, { int i, ret; bool invalid_capset_id =3D false; + struct drm_device *drm =3D vgdev->ddev; =20 - vgdev->capsets =3D kcalloc(num_capsets, - sizeof(struct virtio_gpu_drv_capset), - GFP_KERNEL); + vgdev->capsets =3D drmm_kcalloc(drm, num_capsets, + sizeof(struct virtio_gpu_drv_capset), + GFP_KERNEL); if (!vgdev->capsets) { DRM_ERROR("failed to allocate cap sets\n"); return; @@ -94,7 +96,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_devi= ce *vgdev, =20 if (ret =3D=3D 0 || invalid_capset_id) { spin_lock(&vgdev->display_info_lock); - kfree(vgdev->capsets); + drmm_kfree(drm, vgdev->capsets); vgdev->capsets =3D NULL; spin_unlock(&vgdev->display_info_lock); return; @@ -126,7 +128,7 @@ int virtio_gpu_init(struct drm_device *dev) if (!virtio_has_feature(dev_to_virtio(dev->dev), VIRTIO_F_VERSION_1)) return -ENODEV; =20 - vgdev =3D kzalloc(sizeof(struct virtio_gpu_device), GFP_KERNEL); + vgdev =3D drmm_kzalloc(dev, sizeof(struct virtio_gpu_device), GFP_KERNEL); if (!vgdev) return -ENOMEM; =20 @@ -257,7 +259,6 @@ int virtio_gpu_init(struct drm_device *dev) vgdev->vdev->config->del_vqs(vgdev->vdev); err_vqs: dev->dev_private =3D NULL; - kfree(vgdev); return ret; } =20 @@ -296,9 +297,6 @@ void virtio_gpu_release(struct drm_device *dev) =20 if (vgdev->has_host_visible) drm_mm_takedown(&vgdev->host_visible_mm); - - kfree(vgdev->capsets); - kfree(vgdev); } =20 int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file) --=20 2.36.1