From patchwork Wed Jun 21 13:04:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9801781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 753356038C for ; Wed, 21 Jun 2017 13:04:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6444825D9E for ; Wed, 21 Jun 2017 13:04:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57331285C5; Wed, 21 Jun 2017 13:04:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7173025D9E for ; Wed, 21 Jun 2017 13:04:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 70F526E056; Wed, 21 Jun 2017 13:04:46 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 102BF6E056 for ; Wed, 21 Jun 2017 13:04:45 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id x81so20986030lfb.3 for ; Wed, 21 Jun 2017 06:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=j3qAi/4d3o3ikn6bs2ADXUOo803a3HfY7wZeQWHpV8M=; b=E/0eMj1dI3mzXo2z/eC3rd3YAstzbwo9Cnk2+3Bn18txu8uKN+0x0dii4b2kfOG5ap AvX5PglBOg8uB9eXrVLixnZZXhpSFYIHE2EleyRk7QDy2869b/sTGjUkb6u4/sqkD+Yp blrFshB+pvnKRN5lf3uSAMCXNQXgMxoCW4xbE= 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; bh=j3qAi/4d3o3ikn6bs2ADXUOo803a3HfY7wZeQWHpV8M=; b=GgwdM6lkSfwlO47aJNAtyNrFgWlkRo3J1BkyBo9/IGY8/OSvrYf+uRa5fGoAjmh+9E xdKUYfUQkL5NzPveC+Ljiv05yjb2f8vW8iO5UQI4h01So1RqMAb5h3vSQgiA5V7s1DJA 4tv9FIDML3n7b1jCvHq+99DMJyq4BJyaiSnJjBFg5hcqNDVNh1dQ5QMoNMwbKP5mUSzg vqN2xYTVApZwPYuPvEbLDWtm3hX3VBWiWLc221iMh/dCISUCy28Rh6j5yTrxUyVaWVr5 fFJRUgq6WoeiSJVm5K75+26B2pgWF34rLR9R4yteOw4GJi0D420NZLsLGCqh+sMGxaOf lwzQ== X-Gm-Message-State: AKS2vOxxK2LDlkyQ+v1er//ySdctMT+A616/iVxeVItZaeYF/yGgHrM/ oS+OZ18M1XIWHo1GJ84= X-Received: by 10.80.209.215 with SMTP id i23mr24829929edg.165.1498050283154; Wed, 21 Jun 2017 06:04:43 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id 4sm8960407eds.48.2017.06.21.06.04.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 06:04:42 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 21 Jun 2017 15:04:29 +0200 Message-Id: <20170621130429.20537-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 Cc: Daniel Vetter , Daniel Vetter , Thierry Reding , DRI Development Subject: [Intel-gfx] [PATCH] drm: Check for drm_device->dev in drm_set_busid X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP I've failed to remember that we have virtual drivers like vgem which have no underlying struct device. Fix this asap. Reported-by: Chris Wilson Cc: Chris Wilson Reviewed-by: Chris Wilson Fixes: 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook") Cc: Thierry Reding Cc: Daniel Vetter Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index b25a00826f59..a1e421616b46 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -143,7 +143,7 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) if (master->unique != NULL) drm_unset_busid(dev, master); - if (dev_is_pci(dev->dev)) { + if (dev->dev && dev_is_pci(dev->dev)) { ret = drm_pci_set_busid(dev, master); if (ret) { drm_unset_busid(dev, master);