Message ID | 1511328675-21981-10-git-send-email-okaya@codeaurora.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> 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 2B9C36038F for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 05:45:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 249BE29B48 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 05:45:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18E9129B50; Wed, 22 Nov 2017 05:45:24 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B90D729B48 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 05:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bjKCTf7LWrO2E45e19Iup8H1ArsZ9/LtJi42BeBg2fY=; b=Q8KFuSL8jhBqLT78m37bS2iFBS wfpOVIMGwz8yrtmxY8rW7GZ4pyKNJXGLAaUIXxgcuP8d19Ml69EuUfyHzGmcHZSnyEaROOc2tSXO4 EPbyXz00/MPBxx2NcBIIvjVVPalj874Sof7/HnyYLpA99FHIXUwuD9wK7KbNXrMon5wxjIwpIHtD3 +xZ1bQOeQSyn2+PwRw+mgiAZOunWT9gAIQcZUV8Wa16WZibDPjFaj0PLTBdgAu9bGTxDaCsRJhe79 fruXVFlA44fd+lkD+Aojy4cNk2u/ZFj6pqks3dmiAODPTfG+f98VcPjNiy6Od9Y5Z3GyfZD7TY1W1 AZBNpbmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eHNqW-00006n-7r; Wed, 22 Nov 2017 05:45:16 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNdm-0005az-QG for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:09 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 81E9D6084E; Wed, 22 Nov 2017 05:31:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328709; bh=nCLLV7W04HsnR9ustUzDJQsepMqhO6O9Y4IQcFKbtos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d4cWINc4/xNJ2m00kgdIyfwQfAFRKOtjkJKOP9ahogk+dpTQYMoML4fZKcaGlVIm7 mwJiwNMKTOiHy59JSjmcd+3Iy5F9B6nth9JDWwRiizxrHWCejAWGW9EyMysJA7gaOS rIITwVz/py17uMGOrY2yGLPvyxe3w5VtA/L6qOD8= 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 93386606F8; Wed, 22 Nov 2017 05:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328707; bh=nCLLV7W04HsnR9ustUzDJQsepMqhO6O9Y4IQcFKbtos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BVhs5Z88ygVNTD4fZV0f6NS4nXUWFs7iKaMojxT1avIWC94m/b7gXtnV+Kp6HLang HqmyDF8/yYBy7UoMi36duTZc/1vgPW8iFmAljRbQhx3NlIMSC595d6RjfzlCbVRpbV JjfwiDTft/HuMDwDTrhs9UUH4bsNDSfKYKoFC/LA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 93386606F8 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 <okaya@codeaurora.org> To: linux-pci@vger.kernel.org, timur@codeaurora.org Subject: [PATCH 09/30] drm/i915: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:30:54 -0500 Message-Id: <1511328675-21981-10-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> References: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171121_213207_242576_4105C03B X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, open list <linux-kernel@vger.kernel.org>, Jani Nikula <jani.nikula@linux.intel.com>, Sinan Kaya <okaya@codeaurora.org>, "open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>, Rodrigo Vivi <rodrigo.vivi@intel.com>, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9f45cfe..2ca7603 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -419,7 +419,9 @@ 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)); + uint16_t devfn = PCI_DEVFN(0, 0) + + dev_priv->bridge_dev = pci_get_domain_bus_and_slot(0, 0, devfn); if (!dev_priv->bridge_dev) { DRM_ERROR("bridge device not found\n"); return -1;
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. Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't extract the domain number. Other places, use the actual domain number from the device. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/gpu/drm/i915/i915_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)