From patchwork Wed Oct 26 15:34:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 11312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp345532wru; Wed, 26 Oct 2022 08:49:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bjr10XDS+LdzwNSc5tAkxGTHhiY3FiCKEsRI6W4lR3odbXuYNiRIqIoWwsEAN+8uSwfBw X-Received: by 2002:a17:907:60d4:b0:79e:8082:132d with SMTP id hv20-20020a17090760d400b0079e8082132dmr23136677ejc.9.1666799398666; Wed, 26 Oct 2022 08:49:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666799398; cv=none; d=google.com; s=arc-20160816; b=JvF4/pdy2XMuDnqRIabwOP8cCHZHpgstwa+eP+Wfx2GGn4ZacbMGUsPdbt0ZZMqgFZ /8UyH/cQupbScM8KQgBgiacxdokmJwsVJGsJoK7hLN02AU0+EZlASE4tkx++AP1AXKMB 7MgLgFHhGC4jRRx32J0nrcCJkqXM7f3v9GBF+nOlTGCHhHWEvLmIgngJ4e+nFr+/g5XW tbM6DURXDp4IS70YVKgjWzQyUMB6bsI1IwtIu3gxD6FuIl/DOcDO4Tc/jIbcHfMCPrlS Bo8+jW05TqA2kkQz08o326NN0hm8r8gOPkjLoNhCIEWwY2trDM2NPI66Bfz16Y8ukNsc SWyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fLaZVg/Gn3THIn1ghLrf5MedEqRFiq/AUqXfvtIcrvk=; b=rTE0P+Q1HiZf+cF5TcDh0zm6kaEUIqGXNu34XgxN50bqWVfagyg/KFiVS0KpuBhX/i M30zOT5w6n5eYpq5KM5W+jpZphm4YZVcQDR45ilHWQgPXmGfJV1d/HObLbtLh0NpvzjX VwHAfS731wTKo1mrA66ndCxrBxWOGbEGd+V2xewge49RWpVdaRORdF3aiUQ+SiwvFMJU VTVJoSL90M+x5kvjgHdii3dAtq9RpdqAMjW6YOe7gLv6CxFLlimOy/4O/fh+VZ5KRCPP fFkLsq42V/jncZLPyPdxjMwZoEuSCczxUrBtmx7Akb0NYD2UNCBjmUTLX6k2uWWGuaJZ 8isg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A8FJ42TF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m25-20020a1709066d1900b007919388d2c6si4771271ejr.357.2022.10.26.08.49.31; Wed, 26 Oct 2022 08:49:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A8FJ42TF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234582AbiJZPeu (ORCPT + 99 others); Wed, 26 Oct 2022 11:34:50 -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-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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747765846461793135?= X-GMAIL-MSGID: =?utf-8?q?1747765846461793135?= 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 --- 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_drv.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; - hdlcd = devm_kzalloc(dev, sizeof(*hdlcd), GFP_KERNEL); - if (!hdlcd) - return -ENOMEM; + hdlcd = devm_drm_dev_alloc(dev, &hdlcd_driver, typeof(*hdlcd), base); + if (IS_ERR(hdlcd)) + return PTR_ERR(hdlcd); - drm = drm_dev_alloc(&hdlcd_driver, dev); - if (IS_ERR(drm)) - return PTR_ERR(drm); + drm = &hdlcd->base; drm->dev_private = 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); return ret; } @@ -344,7 +341,6 @@ static void hdlcd_drm_unbind(struct device *dev) drm_mode_config_cleanup(drm); drm->dev_private = NULL; dev_set_drvdata(dev, NULL); - drm_dev_put(drm); } static const struct component_master_ops hdlcd_master_ops = { diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.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__ struct hdlcd_drm_private { + struct drm_device base; void __iomem *mmio; struct clk *clk; struct drm_crtc crtc; From patchwork Wed Oct 26 15:34:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 11315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp345650wru; Wed, 26 Oct 2022 08:50:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM68ttHxSU3O4mequbxZT4Ql9TLIV7iJWzBTcodVrn90G8zFIfIv3OFiX+hwWnM6l2Zj7jTl X-Received: by 2002:a17:906:8a4b:b0:7a7:3e17:7f91 with SMTP id gx11-20020a1709068a4b00b007a73e177f91mr16032212ejc.331.1666799414368; Wed, 26 Oct 2022 08:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666799414; cv=none; d=google.com; s=arc-20160816; b=vlRKpMUWd9pg6DA+cDv6Cbbia8+Fc79xXMT3yaKXbfg1WEnU9LRIXmTzurCt8Zj6QQ 3ywW1REMefv6IsLFI34Ol8NFYacUlJiO3NigUTFoxP2+hyzV1MYW4IIBaSiaiaw4GQwJ QMAXM6FUEECoveWDfe6/V2vSjDmKSaLKh0JN6ItaW4v4CghLeNc2XfEIcCSffR62lsum kobcCpdIxJHhP5Gk6R6CKAWvKskAsNV/0jjON1jMteheL4Rgbw6EcspRUSz05m0KbOxe wXh6cx4x3E4U5xZo36jtk4tM3RIGc4/cg67ejjprQJOt6y9ggfk8sumP5PQ/vjDigtTi N/7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wv7XhFHELyxghr92um+sD68M2S8O9jxLDlBijfPgaUI=; b=Qxu7GRPj4FIX2u4lmiF521u08a5rxYwY1HFE+IEIlxFmLzXhFxskCvrRfeEn/UwbrS V1bxcezM3P76iDKBshlWPPyRYY4x6hh8W0E9A/OzG6871MmEDvN4OmOaJENURbgJF5SA WpHeuTWCadWMccztWuMJSv+/BJAOhFreq6P1LCW/BecTpHFw6h7FgsCA+PohQHcKJpbj 3mNR6ceezP1eU8aKkuPzeP0HtUQTtZGnHPAKcyD/K6f4zh3X+o7SFIM2EYGbQqEajFQk RH10vNzdl4u2yLacHnp4POff5rod9+Y32SIZXLibzaoQRGWl/gFxRDiVOMCWZhwBvn0d u7kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e99EHaJu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id du13-20020a17090772cd00b007ad79c4f58fsi2610582ejc.120.2022.10.26.08.49.51; Wed, 26 Oct 2022 08:50:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e99EHaJu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234591AbiJZPe4 (ORCPT + 99 others); Wed, 26 Oct 2022 11:34:56 -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-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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747765863100497802?= X-GMAIL-MSGID: =?utf-8?q?1747765863100497802?= 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 --- 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_crtc.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 = drm_rect_height(&new_plane_state->dst); scanout_start = drm_fb_dma_get_gem_addr(fb, new_plane_state, 0); - hdlcd = plane->dev->dev_private; + hdlcd = 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 = { static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) { - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); struct drm_plane *plane = NULL; u32 formats[ARRAY_SIZE(supported_formats)], i; int ret; @@ -325,7 +325,7 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) int hdlcd_setup_crtc(struct drm_device *drm) { - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); struct drm_plane *primary; int ret; diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.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) static int hdlcd_load(struct drm_device *drm, unsigned long flags) { - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); struct platform_device *pdev = 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 = (struct drm_info_node *)m->private; struct drm_device *drm = node->minor->dev; - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); seq_printf(m, "underrun : %d\n", atomic_read(&hdlcd->buffer_underrun_count)); 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 = (struct drm_info_node *)m->private; struct drm_device *drm = node->minor->dev; - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); unsigned long clkrate = clk_get_rate(hdlcd->clk); unsigned long mode_clock = hdlcd->crtc.mode.crtc_clock * 1000; @@ -253,7 +253,6 @@ static int hdlcd_drm_bind(struct device *dev) drm = &hdlcd->base; - drm->dev_private = hdlcd; dev_set_drvdata(dev, drm); 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 = dev_get_drvdata(dev); - struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm); 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 = NULL; dev_set_drvdata(dev, NULL); } diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.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 }; +#define drm_to_hdlcd_priv(x) container_of(x, struct hdlcd_drm_private, base) #define crtc_to_hdlcd_priv(x) container_of(x, struct hdlcd_drm_private, crtc) static inline void hdlcd_write(struct hdlcd_drm_private *hdlcd, From patchwork Wed Oct 26 15:34:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 11313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp345628wru; Wed, 26 Oct 2022 08:50:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vqLG3DMoLObqrK0nYnS5hjUy+MmlgdvP8UzHVk/NEjkX98h4bHfx/lzUrcK27xvYvzTg1 X-Received: by 2002:a17:907:6e87:b0:78f:a596:5cf6 with SMTP id sh7-20020a1709076e8700b0078fa5965cf6mr37711163ejc.398.1666799411312; Wed, 26 Oct 2022 08:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666799411; cv=none; d=google.com; s=arc-20160816; b=f2cei1BKN/P9hYxTyAQxJzvd35n8dmh9R8WQO6sivrSZ8Nrdmquz06xr0HE/eRnyMW 4OscPU87v69tDYYkMDzKpxzG2NhQgCP2k5PyvPFz81Srp8OJGljeCRGnR8G6lLBoOfoP WpIfb1HOrREP7eGqdt10mNMv+xBVHxI/polwXQ/yeRGlMrQ64WVZryx5ZP6t4sWimnuF VZHAliWiCe6GW2a+uM7kuVMEA0i5mAaPe3U9nAPQ98BdU+ikebb6WfbxXROw1+CBTMCT XtGQSyMtKUMVGXaY7fVcGnhy3LzL/M1Kkie2AZiCpgmtuB51PmO0dfhBvthH6aIw2rlW L4SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3W/r9ElK7sh/SFf0M/t1SVrs5dFd+1CxEY7lkRSmLhk=; b=iNRDxynrrTT3UeKoobLcxJveR+iwzG5ch75mzolQW8MdUwlQKOuD7jk642dnXA43uS aNyzz2Arb3bwBTQqcu0oqT/zvfSoFUwtwPdZUf1let8AziRMfZO33U9dBSdpZo7/aF14 hurBwJHbLFnzTvo3ZtTFMiJDxtx0ox5CtOgqF1vs9FNp+17Jtb0QFdhGPiBGALZTErJF iG3EfjYdH+GyxYxgEgCrn0W8hyy1cx59HGHAFmtDOy+/AApQY8Fj+SczwqcYmi9FrfKw 4vhBWOYQ6gm5LJvpOvcXl3AWz2PjwSMnYzM+mqjIRhQuWzsUmyWxfssRIXk44/7tpk48 ZuyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z05caYan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e11-20020a50a68b000000b0045d5cf18d4bsi6048204edc.583.2022.10.26.08.49.47; Wed, 26 Oct 2022 08:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z05caYan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234590AbiJZPfC (ORCPT + 99 others); Wed, 26 Oct 2022 11:35:02 -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-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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747765859511337368?= X-GMAIL-MSGID: =?utf-8?q?1747765859511337368?= 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/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_crtc.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 = { static const struct drm_plane_funcs hdlcd_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = drm_plane_cleanup, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_destroy_state = 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 = drm_to_hdlcd_priv(drm); struct drm_plane *plane = NULL; u32 formats[ARRAY_SIZE(supported_formats)], i; - int ret; - - plane = devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL); - if (!plane) - return ERR_PTR(-ENOMEM); for (i = 0; i < ARRAY_SIZE(supported_formats); i++) formats[i] = supported_formats[i].fourcc; - ret = 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 = 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; drm_plane_helper_add(plane, &hdlcd_plane_helper_funcs); hdlcd->plane = plane; From patchwork Wed Oct 26 15:34:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 11314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp345646wru; Wed, 26 Oct 2022 08:50:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5D3EkjWhcqPXxL7bHW8j1OkKyP0aavo6RZ0+sqjYC+uTcGIqL8qWlQ/5yNP4ebV+RPpbEA X-Received: by 2002:a17:906:ef90:b0:7ab:1b2c:b654 with SMTP id ze16-20020a170906ef9000b007ab1b2cb654mr10617645ejb.627.1666799413976; Wed, 26 Oct 2022 08:50:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666799413; cv=none; d=google.com; s=arc-20160816; b=pXI8IYQiILoxwVdHsZsm0INVKaMhRembJd6cHEgxR7XKuWJK0iS5bqFlHuV/PMz5i3 /a54DbDPer/WOdDNTpe7fCf/fRZN6YZZlzLXWMVumAH45kTjG6QbGLtaXxVBoHqFcNYb tHD4xVQ2v62rRVzJF+/8ArSmzTgIryv8EYOfJgOiPABfFpVOhirIBCdQ+ZaYfqctFMfy l3sUlqiqBkRzm75ecpC0/8HboPZjaKXLgMbFi0nkE/BWqBAvnKqMqU1K6zQwz2DNcr9r MOfAaSHjt70b1oTeDJW3z8gkrgZx9N6tg3c26IIrOp0o0FVmz7rbsNc+P64BUp6FzmFP p1fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ejOPhJEJNpELka6gD2XD7ypHfsFu2fomcMBYmFfmxuI=; b=s5hd4Ct/98Bc0B2+Ex9joqT8MOnBeBA7X6MYP/XKGR0ctb7AqMBLiJicVx0+u7VVOn Ub9Ki8voGr3CCwAX4oAccW0QWx3yOpt3iYiOMHLTCDUoeWpJz+usYDZ+ZXnxH1t5KHGd xqmK1B03cQGE34jzSZFA8Wqcu5PDdPR6GlH6EHkjbDWIHsWC8Q0J1vZc9Mztk7stxZfi 4p2p5U+UFWSAQUELK7mq+VhuvTBcIw7XlhYh+hMpcJSLRiY/FOWQHsXl/PHqHWOxFxaa TJB+tRBKdvOHKnKAXpDmQYqlzLgW6XsSJH5AfvUgynGCqZXPSBMwYBkH3V/PEq3P3/Bu LFvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Gtumf4iX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e10-20020a170906844a00b00781df60a2c8si4076139ejy.342.2022.10.26.08.49.49; Wed, 26 Oct 2022 08:50:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Gtumf4iX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234630AbiJZPfK (ORCPT + 99 others); Wed, 26 Oct 2022 11:35:10 -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-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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747765862120705153?= X-GMAIL-MSGID: =?utf-8?q?1747765862120705153?= 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 --- 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_drv.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 = { .atomic_commit = drm_atomic_helper_commit, }; -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 = drmm_mode_config_init(drm); + if (ret) + return ret; + drm->mode_config.min_width = 0; drm->mode_config.min_height = 0; drm->mode_config.max_width = HDLCD_MAX_XRES; drm->mode_config.max_height = HDLCD_MAX_YRES; drm->mode_config.funcs = &hdlcd_mode_config_funcs; + + return 0; } #ifdef CONFIG_DEBUG_FS @@ -255,7 +262,10 @@ static int hdlcd_drm_bind(struct device *dev) dev_set_drvdata(dev, drm); - hdlcd_setup_mode_config(drm); + ret = hdlcd_setup_mode_config(drm); + if (ret) + goto err_free; + ret = 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; } @@ -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); }