From patchwork Mon Mar 2 22:26:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11416619 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26726109A for ; Mon, 2 Mar 2020 22:28:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04B7420866 for ; Mon, 2 Mar 2020 22:28:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="IXA238jy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04B7420866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06E2A6E8B2; Mon, 2 Mar 2020 22:27:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 766686E899 for ; Mon, 2 Mar 2020 22:27:18 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id z11so1829129wro.9 for ; Mon, 02 Mar 2020 14:27:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E9zTLGBNNN54YIhc3c9OPHxiamIGydzptvOB63+Mt8Y=; b=IXA238jyUCndn1By49pG/o/5yxGPpqWGW4w3UlkkmdCpder19tHdTWTMWSgB9ZOtmb mJuvlzyqEIrHYAGl+SYVtcxaPompCBlppDHpu8CIdOUCWanPAxZdslCtn5e3r1yFqL+F 9HJykUybQIQL6OEcWQdm7pA3eVKzGG5XIA39o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E9zTLGBNNN54YIhc3c9OPHxiamIGydzptvOB63+Mt8Y=; b=cB9zWJWzHklIG/WMxhgGKZy0Pa74ZfrFmoNpXYG9tdLH29XCBSeMef6hT/AjWSjoHr uZEk4Ozh/cEtGAAAtY9aDow1MH9OwE/Dy44MjdYFB9K1D10NCmfSc60zwAJ66ntvACZZ X4J4zY3+Mu4vRo/aJkOa9zzmIoIU7TPNTzn3sYDkyrs92CtZ9kGIdqvyhoWg9/DeG1X1 C/HnfBwE9c9r82vLkgXkyQgiQm6CVS5J3OEFf8obKR8iCXN+cIHmWzzJZWiSqjZyvqix K0qv7/xkbakgwsKAXu+u4Xdtm+nd4ArxWqxbh60P0mL7cBJ1QeYzyNXQxKP/ETnZdN7f 81Fw== X-Gm-Message-State: ANhLgQ17dsnCWM28pbtXcmZcpa67Ob/WzAbirf03yCj/375oXw0MVG7Z crg8jwbfBp6elTa7bvhT+jpZxws+jkM= X-Google-Smtp-Source: ADFU+vu17V2+hhwNxMgF00S+RXI5Bc+ahqEInf2w5oY4TH3dFIUL5akpZZyS/YXB0wB1Gb4Img+3bg== X-Received: by 2002:adf:f60b:: with SMTP id t11mr1605591wrp.344.1583188036929; Mon, 02 Mar 2020 14:27:16 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o18sm26114589wrv.60.2020.03.02.14.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:16 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 29/51] drm/cirrus: Drop explicit drm_mode_config_cleanup call Date: Mon, 2 Mar 2020 23:26:09 +0100 Message-Id: <20200302222631.3861340-30-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> References: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , virtualization@lists.linux-foundation.org, Laurent Pinchart , Thomas Zimmermann , Dave Airlie , Daniel Vetter , Sam Ravnborg , Gerd Hoffmann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We can even delete the drm_driver.release hook now! This is made possible by a preceeding patch which added a drmm_ cleanup action to drm_mode_config_init(), hence all we need to do to ensure that drm_mode_config_cleanup() is run on final drm_device cleanup is check the new error code for _init(). v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Cc: Sam Ravnborg Acked-by: Sam Ravnborg Cc: Thomas Zimmermann Cc: Laurent Pinchart Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Gerd Hoffmann Cc: Daniel Vetter Cc: "Noralf Trønnes" Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: virtualization@lists.linux-foundation.org Acked-by: Gerd Hoffmann --- drivers/gpu/drm/cirrus/cirrus.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index a9d789a56536..bd8784ea9d64 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -510,11 +510,15 @@ static const struct drm_mode_config_funcs cirrus_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -static void cirrus_mode_config_init(struct cirrus_device *cirrus) +static int cirrus_mode_config_init(struct cirrus_device *cirrus) { struct drm_device *dev = &cirrus->dev; + int ret; + + ret = drmm_mode_config_init(dev); + if (ret) + return ret; - drm_mode_config_init(dev); dev->mode_config.min_width = 0; dev->mode_config.min_height = 0; dev->mode_config.max_width = CIRRUS_MAX_PITCH / 2; @@ -522,15 +526,12 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) dev->mode_config.preferred_depth = 16; dev->mode_config.prefer_shadow = 0; dev->mode_config.funcs = &cirrus_mode_config_funcs; + + return 0; } /* ------------------------------------------------------------------ */ -static void cirrus_release(struct drm_device *dev) -{ - drm_mode_config_cleanup(dev); -} - DEFINE_DRM_GEM_FOPS(cirrus_fops); static struct drm_driver cirrus_driver = { @@ -544,7 +545,6 @@ static struct drm_driver cirrus_driver = { .fops = &cirrus_fops, DRM_GEM_SHMEM_DRIVER_OPS, - .release = cirrus_release, }; static int cirrus_pci_probe(struct pci_dev *pdev, @@ -591,7 +591,9 @@ static int cirrus_pci_probe(struct pci_dev *pdev, if (cirrus->mmio == NULL) goto err_unmap_vram; - cirrus_mode_config_init(cirrus); + ret = cirrus_mode_config_init(cirrus); + if (ret) + goto err_cleanup; ret = cirrus_conn_init(cirrus); if (ret < 0) @@ -613,7 +615,6 @@ static int cirrus_pci_probe(struct pci_dev *pdev, return 0; err_cleanup: - drm_mode_config_cleanup(dev); iounmap(cirrus->mmio); err_unmap_vram: iounmap(cirrus->vram);