From patchwork Mon Nov 27 16:57:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841784 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="SE5AgiPK"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="ewZaOjTn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yltWK18P3z9s72 for ; Tue, 28 Nov 2017 04:06:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753432AbdK0Q6t (ORCPT ); Mon, 27 Nov 2017 11:58:49 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56354 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753758AbdK0Q6r (ORCPT ); Mon, 27 Nov 2017 11:58:47 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 161846A4B3; Mon, 27 Nov 2017 16:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511801927; bh=GjugeQGY9+S4Wx5r812VRSY0x2VUbtf99qqV4brBFFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SE5AgiPKYaAGSMnBEuZCeqdn+QmkfhMXuNN8/JK5qLuY2Z0j8POCQtxruHgtkrPL/ 5u53dALNnlDCYf2Y4DoTBN0sWfrF+zU4eP8zYTMLgJ7GPwi+zNTwDKZSMmtRwx5udU lUPhEoZOfFtwX5y6b7ErbiGLtwFEEPlp0WNHRWZI= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 224206A49E; Mon, 27 Nov 2017 16:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511801926; bh=GjugeQGY9+S4Wx5r812VRSY0x2VUbtf99qqV4brBFFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ewZaOjTnm1Fi/KvRf5IDgkvHOLut2bnGk977DTHnoWYAeVwGnFK0V/CUtupa07vBr SNHVWaSJgGF7YapFhD6JqUVchliUo0AjVeJGWV76AIyv8g04kCBu2BR4XS0TESJt62 Dn8+SAaPItBzdHM64vnRzvlQrRVSAMNFKRZso93M= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 224206A49E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, intel-gfx@lists.freedesktop.org, Sinan Kaya , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() Date: Mon, 27 Nov 2017 11:57:46 -0500 Message-Id: <1511801886-6753-10-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). Extract the domain number from drm_device and pass it into pci_get_domain_bus_and_slot() function. Signed-off-by: Sinan Kaya --- drivers/gpu/drm/i915/i915_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9f45cfe..5a8cb79 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -419,7 +419,10 @@ static int i915_getparam(struct drm_device *dev, void *data, static int i915_get_bridge_dev(struct drm_i915_private *dev_priv) { - dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); + int domain = pci_domain_nr(dev_priv->drm.pdev->bus); + + dev_priv->bridge_dev = + pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 0)); if (!dev_priv->bridge_dev) { DRM_ERROR("bridge device not found\n"); return -1;