Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1554191pxb; Thu, 4 Feb 2021 16:37:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwy0+YIToeAIp0Vducw196qQz1Gl/jXFMX5L1Qzgy78wct+aNr+4+IEjRY/GpBEW1Q4MDEY X-Received: by 2002:a05:6402:27d1:: with SMTP id c17mr1105153ede.109.1612485464204; Thu, 04 Feb 2021 16:37:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612485464; cv=none; d=google.com; s=arc-20160816; b=KfqZQp8WnS6F0c7culrSUhve2IAPCfqYC7m8vab5khz+UHPGDPlNJPWBYfVKom8lQP 7YfvzaJGM0PIn22aWj7iXj339yjOIZEvoVJl6oG6EaaAWHJOSvBksux0bZMii707uJ5d 2EaX3ktY4/uQdnmirb4V+bvhvzobDcFfqIVHweXHzytkVgk0wylEtT9Zp2VXTUC+N6M0 4xtCXvNzCLwpZDxdt+Y/48ujrYg/OW886A+PK2DdarGjUrXptOOmzFliR1AQK6TzuI5g LNEH/r0R0lJkBYq6lncDIDww7dd0STm6Wk8GaB0DT97V6rZc9SxzM8qgRt+7YHjXbrCD 0vgQ== 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=GdOsrHPBHpzCoKPhsGidEPHdkXQSBSq9IJGbWdAMQ5c=; b=Y4Rpkns+tHN9MwQ7krRLTaNcgpgSD85NBZPg1OSmfkkt+mPiDqIi4Pv1+o+NJrohqN 8/AoVFC2D0XxEMjr6KVmDQyhRO3Mx+1VmX/QgsjjQG33XbChNxaeX5uEnhvp88aktd33 20fZK9F6uXcrAnwH4u5aCSWutc656kNX97m+7UJuVxibKEd/+xgQSOSuIFy6R+joUX4N deKkA6jR/YcOtzb8iezS/TjaNLZq0Hsx9mAwN3W4lRvxbLIn3JkXYr+us0MvC9qxFeOD r5fT2kUCCEVryL6yo1v4aGqwMQJnPjF7JkQdZxsHLZlfIPo+Zlt+zIZCa73R26QBWYiT Ms1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OMqJEsAS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id m19si4714984edd.458.2021.02.04.16.37.19; Thu, 04 Feb 2021 16:37:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OMqJEsAS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S236626AbhBDPBh (ORCPT + 99 others); Thu, 4 Feb 2021 10:01:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39207 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237074AbhBDO6t (ORCPT ); Thu, 4 Feb 2021 09:58:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612450643; 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=GdOsrHPBHpzCoKPhsGidEPHdkXQSBSq9IJGbWdAMQ5c=; b=OMqJEsASaN0XxMYJ2DULMpZxv4Im10vD2RWdsoWq7OM/v6UQf7Ng6HldGMASorbT4cCjR0 h7dwdO1PU/p7phw8WGIZZAsYN+QYfAWBBj2Ue2hOxxdNvLZH9ZH8G9r7ETR9vW60TpXY7h FJGNkSRKth79rxe97On986n+j0TF6Po= 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-176-VcPF9jfTPi2m7pUl7zkNMw-1; Thu, 04 Feb 2021 09:57:19 -0500 X-MC-Unique: VcPF9jfTPi2m7pUl7zkNMw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2CF091271; Thu, 4 Feb 2021 14:57:17 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-108.ams2.redhat.com [10.36.113.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 183B4722CF; Thu, 4 Feb 2021 14:57:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4474F180101E; Thu, 4 Feb 2021 15:57:12 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , Tong Zhang , Dave Airlie , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 02/10] Revert "drm/qxl: do not run release if qxl failed to init" Date: Thu, 4 Feb 2021 15:57:03 +0100 Message-Id: <20210204145712.1531203-3-kraxel@redhat.com> In-Reply-To: <20210204145712.1531203-1-kraxel@redhat.com> References: <20210204145712.1531203-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit b91907a6241193465ca92e357adf16822242296d. Patch is broken, it effectively makes qxl_drm_release() a nop because on normal driver shutdown qxl_drm_release() is called *after* drm_dev_unregister(). Cc: Tong Zhang Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/qxl/qxl_drv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 34c8b25b5780..fb5f6a5e81d7 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -144,8 +144,6 @@ static void qxl_drm_release(struct drm_device *dev) * reodering qxl_modeset_fini() + qxl_device_fini() calls is * non-trivial though. */ - if (!dev->registered) - return; qxl_modeset_fini(qdev); qxl_device_fini(qdev); } -- 2.29.2