From nobody Wed May 15 09:34:43 2024 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 375F4C38A2D for ; Wed, 26 Oct 2022 15:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234586AbiJZPev (ORCPT ); Wed, 26 Oct 2022 11:34:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234579AbiJZPeq (ORCPT ); Wed, 26 Oct 2022 11:34:46 -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 ESMTPS id 63E5F2628 for ; Wed, 26 Oct 2022 08:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666798484; 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=fLaZVg/Gn3THIn1ghLrf5MedEqRFiq/AUqXfvtIcrvk=; b=A8FJ42TFOP+y1eWeENKbPz5IMfTdr15MYay4H06kIQRerm4e55hy6wtAtGbUsvmofKJjkl eSP+axnOo7ye8u6GmKb0GGzFBqFXM/zq5rY6jDhz9soJSWNqoxsPGvN4xT7GONiuR08c3U 6MmgXUTpyA1/LSqP0YnzDXeWBusl/eo= 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-658-IY0JA37cPIylFt2f-8E5dg-1; Wed, 26 Oct 2022 11:34:43 -0400 X-MC-Unique: IY0JA37cPIylFt2f-8E5dg-1 Received: by mail-ej1-f69.google.com with SMTP id nc4-20020a1709071c0400b0078a5ceb571bso4734916ejc.4 for ; Wed, 26 Oct 2022 08:34:43 -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:message-id:reply-to; bh=fLaZVg/Gn3THIn1ghLrf5MedEqRFiq/AUqXfvtIcrvk=; b=x8THGMax7naQROJiiaUM6W8ahVbn+kjc9wCnaAMtAY2YNBNElVKvkj59ZnL3RblroF Lal8cj5RSznWL5/2iDVaYfdzfHCmt58D/MlpW9qZqyiLz8DcLfrteNF4fHP/Mud+Pqdr 2/ygy6au4TTSygcyOY9/S7qmVBKfZ8LYD9+5VhsKxhuN75WxdU8klsC6EYQ2AJg0LMd6 EKy2yQ7l0p8ojj7LD59LXyZDGpYxRzOJGUEF51jVRIkS8no7q7kprnnPq4c3JT26h5ro +hwTR4SZN1ebrsfsLD7U2RyuTMwHdA7VrNAcxjXNh3nL2T/EMEsKgfjfLNVNHd/MO8cS zOCA== X-Gm-Message-State: ACrzQf1Y8SEaxUR8aVsovqIoyHqD559MPkRMIs4kJ8Sf+UmsJjvnTl9X txI0kwOJ0ph9jbE4JzVMVhz7UjpcDb50vyxUP8Md1ASUZVL4e4mRL0qmd4xAh17JaC/TAIP501n oL9KXdyzApZJf5ET/XgE7R1dV X-Received: by 2002:a05:6402:27c6:b0:461:e426:dc8b with SMTP id c6-20020a05640227c600b00461e426dc8bmr12855799ede.403.1666798482012; Wed, 26 Oct 2022 08:34:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7dYi2tzVQq42OFzB50D9ddEtWodBh0BQMxyElzqyZXWM3GFmgLvhs6sr8aj83t2ilqgGbccA== X-Received: by 2002:a05:6402:27c6:b0:461:e426:dc8b with SMTP id c6-20020a05640227c600b00461e426dc8bmr12855779ede.403.1666798481834; Wed, 26 Oct 2022 08:34:41 -0700 (PDT) Received: from pollux.. ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id z17-20020a170906271100b0078a543e9301sm3048896ejc.200.2022.10.26.08.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 08:34:41 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, liviu.dudau@arm.com, brian.starkey@arm.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v4 1/4] drm/arm/hdlcd: use drmm_* to allocate driver structures Date: Wed, 26 Oct 2022 17:34:28 +0200 Message-Id: <20221026153431.72033-2-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026153431.72033-1-dakr@redhat.com> References: <20221026153431.72033-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 resources to allocate driver structures and get rid of the deprecated drm_dev_alloc() call and replace it with devm_drm_dev_alloc(). This also serves as preparation to get rid of drm_device->dev_private and to fix use-after-free issues on driver unload. Signed-off-by: Danilo Krummrich Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_drv.c | 12 ++++-------- drivers/gpu/drm/arm/hdlcd_drv.h | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_dr= v.c index a032003c340c..463381d11cff 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -247,13 +247,11 @@ static int hdlcd_drm_bind(struct device *dev) struct hdlcd_drm_private *hdlcd; int ret; =20 - hdlcd =3D devm_kzalloc(dev, sizeof(*hdlcd), GFP_KERNEL); - if (!hdlcd) - return -ENOMEM; + hdlcd =3D devm_drm_dev_alloc(dev, &hdlcd_driver, typeof(*hdlcd), base); + if (IS_ERR(hdlcd)) + return PTR_ERR(hdlcd); =20 - drm =3D drm_dev_alloc(&hdlcd_driver, dev); - if (IS_ERR(drm)) - return PTR_ERR(drm); + drm =3D &hdlcd->base; =20 drm->dev_private =3D hdlcd; dev_set_drvdata(dev, drm); @@ -319,7 +317,6 @@ static int hdlcd_drm_bind(struct device *dev) err_free: drm_mode_config_cleanup(drm); dev_set_drvdata(dev, NULL); - drm_dev_put(drm); =20 return ret; } @@ -344,7 +341,6 @@ static void hdlcd_drm_unbind(struct device *dev) drm_mode_config_cleanup(drm); drm->dev_private =3D NULL; dev_set_drvdata(dev, NULL); - drm_dev_put(drm); } =20 static const struct component_master_ops hdlcd_master_ops =3D { diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_dr= v.h index 909c39c28487..3892b36767ac 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.h +++ b/drivers/gpu/drm/arm/hdlcd_drv.h @@ -7,6 +7,7 @@ #define __HDLCD_DRV_H__ =20 struct hdlcd_drm_private { + struct drm_device base; void __iomem *mmio; struct clk *clk; struct drm_crtc crtc; --=20 2.37.3 From nobody Wed May 15 09:34:43 2024 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 C4FD3C38A2D for ; Wed, 26 Oct 2022 15:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234607AbiJZPe6 (ORCPT ); Wed, 26 Oct 2022 11:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234581AbiJZPet (ORCPT ); Wed, 26 Oct 2022 11:34:49 -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 ESMTPS id A3D7926D0 for ; Wed, 26 Oct 2022 08:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666798487; 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=wv7XhFHELyxghr92um+sD68M2S8O9jxLDlBijfPgaUI=; b=e99EHaJuAInK0tRiigI3E5OI0kPoqBn6+YBngJ2I4oy++apMF/0HOVIIu6s+sdZ7UyFTGF Yp4U/gbJRfHkjVjmAyQm1DipdjOE0BaZqYEKGq/gwoLnBR4aiHBjdAfLNehXuIUAHe+bKT /jiOvYTvDwQN1Gc/fCjuXmt6DpGZ3ms= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-400-_29Ajp7dNbeH3u7JtMZeQQ-1; Wed, 26 Oct 2022 11:34:46 -0400 X-MC-Unique: _29Ajp7dNbeH3u7JtMZeQQ-1 Received: by mail-ed1-f72.google.com with SMTP id e15-20020a056402190f00b00461b0576620so8101595edz.2 for ; Wed, 26 Oct 2022 08:34:46 -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:message-id:reply-to; bh=wv7XhFHELyxghr92um+sD68M2S8O9jxLDlBijfPgaUI=; b=iI6yXbnSRPGv0fI5I4V4pqUagYdeg8W+fhApS+uKOwwaD5qhEGHIOYPNLMlj9rt5Ec fWVLoTLESVW6HNoCxGYbz/3PDIt6ehV7HHdBW9o183WP/0BVe1PcoIDJ00jMf5PUul6I YgeQT5pbQK+NvZbJCfuD44iIDJryFMjm6AZL0gBsS0qGlSW6fgEHq2axDXp8uwiAxH+G P56urJffo43/o9dmJtGBRgVdeKp5+J6gsXCuxS1XOirRYwTm0VmC8vwI8uI0odFwqoJ+ Qcm88zito1OeI1XW2/ExQtU+C4jvabeYWKBThRa7Tthu6SBH16kO+4pGXBAuVgEkSgJP Rq7g== X-Gm-Message-State: ACrzQf1vmVAyX6Y8OUtK1YoTf5xc4GtmTv3D5kU7ed8M6SPUVBAQKn5B RGXdPqWzeB4DSInGazy+t2+Rsv1XtoOqloYcP+Tr90tA0g1v1Q3LZHVl3Mqnd+QtZDZ7z3DU/xx ht4Y88vMwzwpfYjl4JovD7bIa X-Received: by 2002:aa7:cd92:0:b0:456:cbb5:2027 with SMTP id x18-20020aa7cd92000000b00456cbb52027mr41214705edv.384.1666798485501; Wed, 26 Oct 2022 08:34:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4hSmFGZW5A+vOVIQIYLIAaA5j5SuIKXayCNg+a/tMrty6G3mAQlX05AW6FSdwf0iYaX8xCKg== X-Received: by 2002:aa7:cd92:0:b0:456:cbb5:2027 with SMTP id x18-20020aa7cd92000000b00456cbb52027mr41214687edv.384.1666798485360; Wed, 26 Oct 2022 08:34:45 -0700 (PDT) Received: from pollux.. ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id s14-20020a170906960e00b00780ab5a9116sm3164438ejx.211.2022.10.26.08.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 08:34:45 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, liviu.dudau@arm.com, brian.starkey@arm.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v4 2/4] drm/arm/hdlcd: replace drm->dev_private with drm_to_hdlcd_priv() Date: Wed, 26 Oct 2022 17:34:29 +0200 Message-Id: <20221026153431.72033-3-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026153431.72033-1-dakr@redhat.com> References: <20221026153431.72033-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" Using drm_device->dev_private is deprecated. Since we've switched to devm_drm_dev_alloc(), struct drm_device is now embedded in struct hdlcd_drm_private, hence we can use container_of() to get the struct drm_device instance instead. Signed-off-by: Danilo Krummrich Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_crtc.c | 6 +++--- drivers/gpu/drm/arm/hdlcd_drv.c | 10 ++++------ drivers/gpu/drm/arm/hdlcd_drv.h | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_c= rtc.c index 7030339fa232..2055b1abcec3 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -275,7 +275,7 @@ static void hdlcd_plane_atomic_update(struct drm_plane = *plane, dest_h =3D drm_rect_height(&new_plane_state->dst); scanout_start =3D drm_fb_dma_get_gem_addr(fb, new_plane_state, 0); =20 - hdlcd =3D plane->dev->dev_private; + hdlcd =3D drm_to_hdlcd_priv(plane->dev); hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]); hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_PITCH, fb->pitches[0]); hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_COUNT, dest_h - 1); @@ -298,7 +298,7 @@ static const struct drm_plane_funcs hdlcd_plane_funcs = =3D { =20 static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) { - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); struct drm_plane *plane =3D NULL; u32 formats[ARRAY_SIZE(supported_formats)], i; int ret; @@ -325,7 +325,7 @@ static struct drm_plane *hdlcd_plane_init(struct drm_de= vice *drm) =20 int hdlcd_setup_crtc(struct drm_device *drm) { - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); struct drm_plane *primary; int ret; =20 diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_dr= v.c index 463381d11cff..120c87934a91 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -98,7 +98,7 @@ static void hdlcd_irq_uninstall(struct hdlcd_drm_private = *hdlcd) =20 static int hdlcd_load(struct drm_device *drm, unsigned long flags) { - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); struct platform_device *pdev =3D to_platform_device(drm->dev); struct resource *res; u32 version; @@ -190,7 +190,7 @@ static int hdlcd_show_underrun_count(struct seq_file *m= , void *arg) { struct drm_info_node *node =3D (struct drm_info_node *)m->private; struct drm_device *drm =3D node->minor->dev; - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); =20 seq_printf(m, "underrun : %d\n", atomic_read(&hdlcd->buffer_underrun_coun= t)); seq_printf(m, "dma_end : %d\n", atomic_read(&hdlcd->dma_end_count)); @@ -203,7 +203,7 @@ static int hdlcd_show_pxlclock(struct seq_file *m, void= *arg) { struct drm_info_node *node =3D (struct drm_info_node *)m->private; struct drm_device *drm =3D node->minor->dev; - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); unsigned long clkrate =3D clk_get_rate(hdlcd->clk); unsigned long mode_clock =3D hdlcd->crtc.mode.crtc_clock * 1000; =20 @@ -253,7 +253,6 @@ static int hdlcd_drm_bind(struct device *dev) =20 drm =3D &hdlcd->base; =20 - drm->dev_private =3D hdlcd; dev_set_drvdata(dev, drm); =20 hdlcd_setup_mode_config(drm); @@ -324,7 +323,7 @@ static int hdlcd_drm_bind(struct device *dev) static void hdlcd_drm_unbind(struct device *dev) { struct drm_device *drm =3D dev_get_drvdata(dev); - struct hdlcd_drm_private *hdlcd =3D drm->dev_private; + struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); =20 drm_dev_unregister(drm); drm_kms_helper_poll_fini(drm); @@ -339,7 +338,6 @@ static void hdlcd_drm_unbind(struct device *dev) pm_runtime_disable(dev); of_reserved_mem_device_release(dev); drm_mode_config_cleanup(drm); - drm->dev_private =3D NULL; dev_set_drvdata(dev, NULL); } =20 diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_dr= v.h index 3892b36767ac..f1c1da2ac2db 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.h +++ b/drivers/gpu/drm/arm/hdlcd_drv.h @@ -21,6 +21,7 @@ struct hdlcd_drm_private { #endif }; =20 +#define drm_to_hdlcd_priv(x) container_of(x, struct hdlcd_drm_private, bas= e) #define crtc_to_hdlcd_priv(x) container_of(x, struct hdlcd_drm_private, cr= tc) =20 static inline void hdlcd_write(struct hdlcd_drm_private *hdlcd, --=20 2.37.3 From nobody Wed May 15 09:34:43 2024 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 7FBD8C433FE for ; Wed, 26 Oct 2022 15:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233976AbiJZPfE (ORCPT ); Wed, 26 Oct 2022 11:35:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234604AbiJZPez (ORCPT ); Wed, 26 Oct 2022 11:34:55 -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 ACE5B6362 for ; Wed, 26 Oct 2022 08:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666798491; 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=3W/r9ElK7sh/SFf0M/t1SVrs5dFd+1CxEY7lkRSmLhk=; b=Z05caYannmq9/rH3/6PuYTSk6eJLrFWp31M2FhEFz0qz72N8/a0ZMF+ElBxtKWDrBNyZhX NZ0ZNv0C/n6rWlt1PPdRq4pd2QGwAxlaCjQ5qQ6Js/NILzCNji8H5LwgMixuTK2SOo6rDz HeTe3S0z/Mptn+0zC5P3QGqfUFmCE9w= 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-515-9cYeD-raMfe-RLU8VtjsCg-1; Wed, 26 Oct 2022 11:34:50 -0400 X-MC-Unique: 9cYeD-raMfe-RLU8VtjsCg-1 Received: by mail-ej1-f69.google.com with SMTP id sa6-20020a1709076d0600b0078d84ed54b9so4715991ejc.18 for ; Wed, 26 Oct 2022 08:34:50 -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:message-id:reply-to; bh=3W/r9ElK7sh/SFf0M/t1SVrs5dFd+1CxEY7lkRSmLhk=; b=u3xvuum/BWaxi2rI0LZnpMyaTBBWNj4s0nkYl1rS9K1spoyEOS+1l2zeXMPzp3dPD4 yFGEI8vu/KfBo0+kAKvRsjjV+isxEOvIwZk5nBYjy6z1oTux0UYEt5THgrefepbnmJFt 6iry9oLGRiRXFC88Yv5CAQ2gM8/2rwAsN2JeYFb3fIEq1uVgiE83HmMNE9Pbf8McdwDk vIxItJORhfbUsEs3T0UHW3HvcxPP70ICW8ERnhs0nrSyIJMEVge2SelDZoqRVvrLQqYx 7yMgZfb/h2raJvN1JHlEMuskN1abF2b4R5g06MZETeGWBEBqDixEcfxredoW8ElqL/0Z c9Hg== X-Gm-Message-State: ACrzQf0iv4HkSK5S/HB3Lu7IG+cCkA+PRit5DlzQDvoWRHyHgdL4qK+w +TJz2zscYQMJhZSWZYZakHmS27RN22VJqG21eD/3Rc7LhO8rEpjBzXmTqI9yGaKsYqxq8v3KVQq a61eUtr8hSwv27ZdDWNUi7m5A X-Received: by 2002:a17:906:8a65:b0:7ad:88f8:7ecc with SMTP id hy5-20020a1709068a6500b007ad88f87eccmr205488ejc.535.1666798489134; Wed, 26 Oct 2022 08:34:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7hZV+nzwBhtCJNCfdWd9aTbL+g+XhULTYvMLCYKRB9T7riygaPgFJlt+DyvtV2u2xPOacYiQ== X-Received: by 2002:a17:906:8a65:b0:7ad:88f8:7ecc with SMTP id hy5-20020a1709068a6500b007ad88f87eccmr205472ejc.535.1666798489007; Wed, 26 Oct 2022 08:34:49 -0700 (PDT) Received: from pollux.. ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id m24-20020a056402051800b00459e3a3f3ddsm3684370edv.79.2022.10.26.08.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 08:34:48 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, liviu.dudau@arm.com, brian.starkey@arm.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v4 3/4] drm/arm/hdlcd: plane: use drm managed resources Date: Wed, 26 Oct 2022 17:34:30 +0200 Message-Id: <20221026153431.72033-4-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026153431.72033-1-dakr@redhat.com> References: <20221026153431.72033-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 Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_crtc.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_c= rtc.c index 2055b1abcec3..1de0f7b23766 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -290,7 +290,6 @@ static const struct drm_plane_helper_funcs hdlcd_plane_= helper_funcs =3D { static const struct drm_plane_funcs hdlcd_plane_funcs =3D { .update_plane =3D drm_atomic_helper_update_plane, .disable_plane =3D drm_atomic_helper_disable_plane, - .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, @@ -301,21 +300,16 @@ static struct drm_plane *hdlcd_plane_init(struct drm_= device *drm) struct hdlcd_drm_private *hdlcd =3D drm_to_hdlcd_priv(drm); struct drm_plane *plane =3D NULL; u32 formats[ARRAY_SIZE(supported_formats)], i; - int ret; - - plane =3D devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL); - if (!plane) - return ERR_PTR(-ENOMEM); =20 for (i =3D 0; i < ARRAY_SIZE(supported_formats); i++) formats[i] =3D supported_formats[i].fourcc; =20 - ret =3D drm_universal_plane_init(drm, plane, 0xff, &hdlcd_plane_funcs, - formats, ARRAY_SIZE(formats), - NULL, - DRM_PLANE_TYPE_PRIMARY, NULL); - if (ret) - return ERR_PTR(ret); + plane =3D drmm_universal_plane_alloc(drm, struct drm_plane, dev, 0xff, + &hdlcd_plane_funcs, + formats, ARRAY_SIZE(formats), + NULL, DRM_PLANE_TYPE_PRIMARY, NULL); + if (IS_ERR(plane)) + return plane; =20 drm_plane_helper_add(plane, &hdlcd_plane_helper_funcs); hdlcd->plane =3D plane; --=20 2.37.3 From nobody Wed May 15 09:34:43 2024 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 E95D3C38A2D for ; Wed, 26 Oct 2022 15:35:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233395AbiJZPfL (ORCPT ); Wed, 26 Oct 2022 11:35:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234609AbiJZPe6 (ORCPT ); Wed, 26 Oct 2022 11:34:58 -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 DB1DF5FCB for ; Wed, 26 Oct 2022 08:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666798495; 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=ejOPhJEJNpELka6gD2XD7ypHfsFu2fomcMBYmFfmxuI=; b=Gtumf4iXtC4PIGmYTt/hbBvZVllSpKZZx+AQdjTqdO7ySNz2GtFkqbnQAvfoOwYv9D5xWn ytYTQB66M+PKJ/lEqQ0vKDRdUxe2WDUy2nVJ6RohUc5pZqDvucKnhYHFUF7Oplrh4nyVZd CXt96jbV2Z5nf7gl7PSsrDCotWpUaZw= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-561-s_vnf-pPNICNtQpcXHpzYg-1; Wed, 26 Oct 2022 11:34:53 -0400 X-MC-Unique: s_vnf-pPNICNtQpcXHpzYg-1 Received: by mail-ed1-f72.google.com with SMTP id v18-20020a056402349200b004622e273bbbso3091253edc.14 for ; Wed, 26 Oct 2022 08:34:53 -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:message-id:reply-to; bh=ejOPhJEJNpELka6gD2XD7ypHfsFu2fomcMBYmFfmxuI=; b=TyvaWycLQ5CmCR9td99sfm/bAOHfecYiMHZV/KZnG1XT6xkcLsJ4AzxaUGP01zBdy7 E42+/TLORrlEAuRgVQDHxklWGh2wxLqz9hIrCqTsjaLrXOaZgiGbJrc/B0bEwZLnYRGi w+ZDr8zD+LkIEDNaD9GnyON8NvWpm/9j+7jI1SIVCzxg+GmK0/Ldj41lP5Rte0NASA5U SeuHsv2oopMj6W+kEc6XksnrBOFciWKskQgNvfxz6+cKh50i5tmcbLPk4FnS5fl+AAP4 r9fHofcqzFN0mepfbTFoGbdPA3nQsbBrB63ONe3AVX1+bKBIzYZnBuqP3KH1sq4ZAxai 8AYw== X-Gm-Message-State: ACrzQf3OGN7CGvphnr04aQw1Jlahf3Rkdksa3aMR6k9Hbwoeaq6KEgFp LiGTa2K4oHyYWxjJHn/oSLXAwSV7u0OpUgTiUw7lh4TB/INqrYOj8pkC4F60opM2adn/BqQE5gF 3dI4+bZIw3j+ho+CfYFprD+L1 X-Received: by 2002:a17:906:2f87:b0:78a:c0d5:d019 with SMTP id w7-20020a1709062f8700b0078ac0d5d019mr37917828eji.158.1666798492571; Wed, 26 Oct 2022 08:34:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5EBkDZr7mSHI/IJXrOR7VYqX6OqCiEF3KuvriT6LLy2miYkg3LlwMcfHJamXcTxJp1LQpWvw== X-Received: by 2002:a17:906:2f87:b0:78a:c0d5:d019 with SMTP id w7-20020a1709062f8700b0078ac0d5d019mr37917812eji.158.1666798492434; Wed, 26 Oct 2022 08:34:52 -0700 (PDT) Received: from pollux.. ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id b12-20020a1709063f8c00b0078d4e39d87esm3114855ejj.225.2022.10.26.08.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 08:34:52 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, liviu.dudau@arm.com, brian.starkey@arm.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v4 4/4] drm/arm/hdlcd: remove calls to drm_mode_config_cleanup() Date: Wed, 26 Oct 2022 17:34:31 +0200 Message-Id: <20221026153431.72033-5-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026153431.72033-1-dakr@redhat.com> References: <20221026153431.72033-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" drm_mode_config_init() simply calls drmm_mode_config_init(), hence cleanup is automatically handled through registering drm_mode_config_cleanup() with drmm_add_action_or_reset(). While at it, get rid of the deprecated drm_mode_config_init() and replace it with drmm_mode_config_init() directly. Signed-off-by: Danilo Krummrich Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_drv.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_dr= v.c index 120c87934a91..49c977cdae40 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -175,14 +175,21 @@ static const struct drm_mode_config_funcs hdlcd_mode_= config_funcs =3D { .atomic_commit =3D drm_atomic_helper_commit, }; =20 -static void hdlcd_setup_mode_config(struct drm_device *drm) +static int hdlcd_setup_mode_config(struct drm_device *drm) { - drm_mode_config_init(drm); + int ret; + + ret =3D drmm_mode_config_init(drm); + if (ret) + return ret; + drm->mode_config.min_width =3D 0; drm->mode_config.min_height =3D 0; drm->mode_config.max_width =3D HDLCD_MAX_XRES; drm->mode_config.max_height =3D HDLCD_MAX_YRES; drm->mode_config.funcs =3D &hdlcd_mode_config_funcs; + + return 0; } =20 #ifdef CONFIG_DEBUG_FS @@ -255,7 +262,10 @@ static int hdlcd_drm_bind(struct device *dev) =20 dev_set_drvdata(dev, drm); =20 - hdlcd_setup_mode_config(drm); + ret =3D hdlcd_setup_mode_config(drm); + if (ret) + goto err_free; + ret =3D hdlcd_load(drm, 0); if (ret) goto err_free; @@ -314,9 +324,7 @@ static int hdlcd_drm_bind(struct device *dev) hdlcd_irq_uninstall(hdlcd); of_reserved_mem_device_release(drm->dev); err_free: - drm_mode_config_cleanup(drm); dev_set_drvdata(dev, NULL); - return ret; } =20 @@ -337,7 +345,6 @@ static void hdlcd_drm_unbind(struct device *dev) if (pm_runtime_enabled(dev)) pm_runtime_disable(dev); of_reserved_mem_device_release(dev); - drm_mode_config_cleanup(drm); dev_set_drvdata(dev, NULL); } =20 --=20 2.37.3