From patchwork Wed Feb 19 10:21:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11391051 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 8CF161580 for ; Wed, 19 Feb 2020 10:23: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 6BC6D24658 for ; Wed, 19 Feb 2020 10:23: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="II97WZQE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BC6D24658 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 6DD766EB90; Wed, 19 Feb 2020 10:22:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id EDA1C6EB5B for ; Wed, 19 Feb 2020 10:22:08 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id w15so27528444wru.4 for ; Wed, 19 Feb 2020 02:22:08 -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=j6THFp6AG4GHfhNGPDUxvX1xl7YrFlEjP83iYxHAXrg=; b=II97WZQEemEOCvxmtZjCFmXnOaYUxIaZiCNRWZYfcxh76VhNC/REdqUKnwG4hasj53 Suzfin86drwenEG5S2qpXsvZloDpklyajmeTRJv5hoSORfJ369gyw2Fsgjn3lrLV0HAB 6H+oEJipl3XVZMDePBoj9a+Al/z7AZGhQ/rHk= 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=j6THFp6AG4GHfhNGPDUxvX1xl7YrFlEjP83iYxHAXrg=; b=nFSSAAM4Hi7OKUVekJrVUfkD0cHMyniJDhlQBqX0nA1udo8qNaZ/aO/isVkP0ZLBsA alqWCaoaaSK8UxKUBNspVbyTPbJUa0Przi7npIaFSQYM8kFOOyJ2zBD1/BPvvbGDCJXL EjEZdJzR7WfAY7RtUHS6iXnVX9wYdGMEFTRPxcT8or7Imk0Kanj2wTsqlIjlGe8dJy0l BDiTKs1hk0hGOiuOMK1l4JTmNdhFWoFzkSzRUV+Otc+s+RdzXMfFUnKxhh01r5y0WZFz 0l9EdHmDSZyY6GXfx4WflkCY9m7dNoOYYAdiFXwT3A1F/vQaiHJ6lHDOSBep+OlFNySO nKqQ== X-Gm-Message-State: APjAAAXQNUAqFdyfWHZELmbknLeiN+OsUrYlORNBbSbf3gDBCuHzBeW0 KK/80nnBRUo1WRO7QfbgWqehK+FtN7Q= X-Google-Smtp-Source: APXvYqySG1/Os6NThGfBV6gSL6bmM+gb0fX74bVHA0PhviFzs2Z30QO+x1XnwFR00QIFFJ3wtBI6ig== X-Received: by 2002:adf:f406:: with SMTP id g6mr35537076wro.189.1582107727387; Wed, 19 Feb 2020 02:22:07 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s23sm2370339wra.15.2020.02.19.02.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:22:06 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 30/52] drm/cirrus: Drop explicit drm_mode_config_cleanup call Date: Wed, 19 Feb 2020 11:21:00 +0100 Message-Id: <20200219102122.1607365-31-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> References: <20200219102122.1607365-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, Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We can even delete the drm_driver.release hook now! 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..6ac0286810ec 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 = drm_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);