From nobody Fri Apr 17 23:53:46 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 8E4F0CCA480 for ; Wed, 20 Jul 2022 14:02:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232196AbiGTOC1 (ORCPT ); Wed, 20 Jul 2022 10:02:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232874AbiGTOCY (ORCPT ); Wed, 20 Jul 2022 10:02:24 -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 33EED31935 for ; Wed, 20 Jul 2022 07:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658325743; 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=ET0knCLbK+yffzio3n8pQscO9fJMGskue73iVOKPAKdk6+Iglc6wde8Hk0EKpCmwaeQJ89 SFHNDCLGWu7aSOIiBD/f2ektz39nosl9Z7vUjvuN5n5q5RU4jf3+NqBGmX9aloDMiT/M1F n4SWYgTvYdx4PTZHi8CNRh2EGzwckHE= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-rUYPWwNxPyy9rw-c7mujpQ-1; Wed, 20 Jul 2022 10:02:22 -0400 X-MC-Unique: rUYPWwNxPyy9rw-c7mujpQ-1 Received: by mail-ed1-f70.google.com with SMTP id m13-20020a056402430d00b0043ac2f27d83so12352064edc.20 for ; Wed, 20 Jul 2022 07:02:21 -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=P9hKpYKYCUMBHNDtZeHCPCeBXiV8YKkLVhpqv2SSQBihPfzd1IJaQZ4KjGM6xz4POI U/yNSN8KM8zqO9SaIHAJPBg1EkBEAX0QtJLLiJrRABznlPKIC7tKEjMz1CimNmYFo18o H4d8RX+6Uztvl14TFlJPDPCxSQHTZolC9RZNjR54YMxeA0cfBHWqeQ5gu/Q/n5pif+6c +CZ9FYsOB+MtMHST0493ooSniylaGTEOQ6t4d+bOpLVAm//ZN0W7Lk846i9zyvCkKHJx JaSnIOSfQ7x4mk8K2dL5RaXoHFxNNAsjTwURCXF9uO/bs2L7ikWy0ruzriOx3dP2+4l7 FbhQ== X-Gm-Message-State: AJIora9VcBJOvyP01s0JozwNQ0QySxQshM72HXlTVt3t/4BbdgkHFSKK cHxgkmU50fUP4cFj5hIgwKDimJOuKkaUhtOrDkw5qLKQEeLoikZD/Nr7GQbO8oeuOVYRUN4n1n5 BmaLHvYvJNFJiPK1zrLvkseRo X-Received: by 2002:a17:907:2e02:b0:72b:7f58:34a7 with SMTP id ig2-20020a1709072e0200b0072b7f5834a7mr35386128ejc.525.1658325740929; Wed, 20 Jul 2022 07:02:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vq2IV3yyjMp7raLEq7mPapfKG0of5mKXfvebNU8xf13qtjH+eOAFM2FVlEqO4W2e6ym12V8w== X-Received: by 2002:a17:907:2e02:b0:72b:7f58:34a7 with SMTP id ig2-20020a1709072e0200b0072b7f5834a7mr35386116ejc.525.1658325740745; Wed, 20 Jul 2022 07:02:20 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id f13-20020a170906560d00b006fee98045cdsm8053040ejq.10.2022.07.20.07.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 07:02:20 -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 RESEND 1/2] drm/virtio: plane: use drm managed resources Date: Wed, 20 Jul 2022 16:02:13 +0200 Message-Id: <20220720140214.199492-2-dakr@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220720140214.199492-1-dakr@redhat.com> References: <20220720140214.199492-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 Fri Apr 17 23:53:46 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 22BECC433EF for ; Wed, 20 Jul 2022 14:02:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240175AbiGTOCb (ORCPT ); Wed, 20 Jul 2022 10:02:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232874AbiGTOC1 (ORCPT ); Wed, 20 Jul 2022 10:02:27 -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 A09F031935 for ; Wed, 20 Jul 2022 07:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658325744; 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=aIpOOcIMT3Xjwi2wVApd+Nim4qZpwZYry/Ae3oWLSz/g+18cjUa6M3+h7tjFEkUKFr8exd Dy/xHve33FC0joUVBKVpF/BpYIRvj/5bespxwKP6OOSgr6xfAWgnSg6ORu6W7a+1CjTGm/ kgtbwpI6Srb0rZQCuuDFX+7mGwlHCCk= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-Zd3Kx4FOOxScBeHRvOdiHg-1; Wed, 20 Jul 2022 10:02:23 -0400 X-MC-Unique: Zd3Kx4FOOxScBeHRvOdiHg-1 Received: by mail-ej1-f69.google.com with SMTP id s4-20020a170906500400b006feaccb3a0eso4118943ejj.11 for ; Wed, 20 Jul 2022 07:02:23 -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=AHS9QK586eWYlJkahmbnXL9LeQzIHQxG6mroviAzByGhs9NOUaM4Q7o6LkBsDWLPfA uKM3f4T7zUS4ZaNaHsgyi15IHfugtkTniuJM47waRjSVDf6ydmxjyUVz7A1OTdptP/Gf Jb9RYLZAFel33MwM2bqWDQebmQ+fK1uIZk0qjFL5rUZT+dW3WbzmqtKatMVPD95avSzK zmhsm+Ds8xxWCSnWhYf53NUavjihkk8o05pKFs8XKcuBH6iJgFIc1PC1Z/fyCpedlNMm Bz4+TGBX8jk/sqGQiPIvxVI7AWZZ85ZKUqvYSB2D1SdGEHHci7gUv7Y8a9iw5GtJRH09 aKuA== X-Gm-Message-State: AJIora9c9BoFl514ZrggLr0vqF91QD4rniF2BBGqFDHQ3YBkiXiXLzxz 931lySpR4G7jeE8rJiPTu+zlb0FmQ4qimFJnI7NzrqSM2IJbh/KiWMF7lenWY8SYCzSZb+3CLxn mTrzUd0vN/0Lf2mAQfXM8V1iC X-Received: by 2002:a17:906:1315:b0:72c:5348:a153 with SMTP id w21-20020a170906131500b0072c5348a153mr34052687ejb.446.1658325742151; Wed, 20 Jul 2022 07:02:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sTF7B8ym8e4HRk24BL/G1Q9N7qi8twp5++akqwci39QfFH+fylqNPAfnonNrtNAQKhrRQdUQ== X-Received: by 2002:a17:906:1315:b0:72c:5348:a153 with SMTP id w21-20020a170906131500b0072c5348a153mr34052675ejb.446.1658325741955; Wed, 20 Jul 2022 07:02:21 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id f13-20020a170906560d00b006fee98045cdsm8053040ejq.10.2022.07.20.07.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 07:02:21 -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 RESEND 2/2] drm/virtio: kms: use drm managed resources Date: Wed, 20 Jul 2022 16:02:14 +0200 Message-Id: <20220720140214.199492-3-dakr@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220720140214.199492-1-dakr@redhat.com> References: <20220720140214.199492-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 --- 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