Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp571233ybv; Fri, 7 Feb 2020 04:45:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxljf4ySushmJfnsA8azmNE2sTetVjW2QAMB0fMieqaFyzh2ZJSAI+RRiEgCyLHbkOi0sr5 X-Received: by 2002:a9d:664a:: with SMTP id q10mr2440473otm.298.1581079509355; Fri, 07 Feb 2020 04:45:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581079509; cv=none; d=google.com; s=arc-20160816; b=T+6LesgD8HjMQzzQHHqkc6UNQjQVOgZfe4yKzZQPeAarkq62hlqgUayEh48r53P3CP r8pWXFvbOtQolkuFQ3Qt23moqyaj8ZNnj1Iw+3sub4ZtuTPWBQeIK+345r+FKJJZnQnV EqGZS4KdHRKVmRZGO7AGTb/Xb2VfEr/zg/f8XvbOBePqiH3ZCfqB8KPRyNZfiORTQT9y tpHE3YAAJ+NZW8nW1+gBrTZjFDJiXbJunhDnB8KNf9GE+mOgbnsV92XqfOBNq3GV6OaC njDugc4Ju+DMF1/HNYNl3QswwyBFvREemoT/+NW16W2bH2xEr0IoV2bseIPZiPVLmUgT q3DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=/runWZY2kWww40/PYPKpoZtN7XMh1Bf5TMeaBp+f1iE=; b=i1Xh0OCIseXA7kV/HPeCSW3jFTNuxYNBBnaU3gDKCG5cIyHIWVs+/Kx1w06lUntZPi vJCwdCfH/Qs1u9aX23wI3/SdB6gIBQYsVcBdxrjU+StZvYRyOlYtz/X1YpgxswHkQZh/ t+oYR17gST4ZLb2nkEzc/cdBF5rvxg3G6AO+3QiUpcCfU0MsLRs8WmFvbTPVRj6npxtR P+ntCSL/tNzMIJ1HJ8/mzGz9JUS7r3T2lvmLsclkW13942HWj3G+i8i4F8tWohutfbBP 8EmcOfw2K9I5/7Zmf0U+WUP1Eoc1UdaGKsILBFXwzXgarMnfHxBG9k5q/XgPA8WevBGi RMCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A3A8eJfs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x2si3813210oie.56.2020.02.07.04.44.56; Fri, 07 Feb 2020 04:45:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A3A8eJfs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726951AbgBGMn6 (ORCPT + 99 others); Fri, 7 Feb 2020 07:43:58 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:48273 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbgBGMn6 (ORCPT ); Fri, 7 Feb 2020 07:43:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581079437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=/runWZY2kWww40/PYPKpoZtN7XMh1Bf5TMeaBp+f1iE=; b=A3A8eJfskMtLTFC73YOacXFsHnXHoR8RGzm/dvmNr09b3k5+EayPxsfa/+z3xNl8q1Fka1 Snc1JoC27SshwKvx+OMKqQZV5TrKZUsBgu8O7qCZNllLSORyPxQncFrLwCzSmzrPay2ius jBLW5cGYwA9KDdx4+PIZi4mwH310fkI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-a3Y7QnfzMUSfPwuriaC8SQ-1; Fri, 07 Feb 2020 07:43:53 -0500 X-MC-Unique: a3Y7QnfzMUSfPwuriaC8SQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFC9D800E21; Fri, 7 Feb 2020 12:43:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-112.ams2.redhat.com [10.36.116.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0957360BEC; Fri, 7 Feb 2020 12:43:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 33E42A1E0; Fri, 7 Feb 2020 13:43:48 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR BOCHS VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/bochs: deinit bugfix Date: Fri, 7 Feb 2020 13:43:48 +0100 Message-Id: <20200207124348.21641-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check whenever mode_config was actually properly initialized before trying to clean it up. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/bochs/bochs_kms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index cc93ff74fbd8..3a755c911342 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -164,6 +164,9 @@ int bochs_kms_init(struct bochs_device *bochs) void bochs_kms_fini(struct bochs_device *bochs) { + if (!bochs->dev->mode_config.num_connector) + return; + drm_atomic_helper_shutdown(bochs->dev); drm_mode_config_cleanup(bochs->dev); } -- 2.18.1