From patchwork Wed Nov 22 22:49:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10071761 X-Patchwork-Delegate: bhelgaas@google.com 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 C23D760353 for ; Wed, 22 Nov 2017 22:56:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5F2829C16 for ; Wed, 22 Nov 2017 22:56:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB06929D82; Wed, 22 Nov 2017 22:56:37 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65DD229C24 for ; Wed, 22 Nov 2017 22:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752394AbdKVW4d (ORCPT ); Wed, 22 Nov 2017 17:56:33 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:42618 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbdKVWuA (ORCPT ); Wed, 22 Nov 2017 17:50:00 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6D57D607E2; Wed, 22 Nov 2017 22:49:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511390999; bh=KS/+RAXixC/MtGfwFQhxqLqczoUqGDhHtzzHj0uyuAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VXUhMwGl0l+0Idt0QpNqeWOMZe8dBiO9JpjUOKfqUIFKXMmAnta6DvcdJI7nkNLcM JSPglztU6VYjeofPgd/jBJQQlrwmAca3OMLUIVA1kVmQ4rRMx2Pi27XfdmG3Ph4RRK ks9YuqJ1L57lGeDKlYMOybAt6f7CLeiaAsQLEhdY= 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 840F46081B; Wed, 22 Nov 2017 22:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511390996; bh=KS/+RAXixC/MtGfwFQhxqLqczoUqGDhHtzzHj0uyuAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKLsz4dSDOeyQ5xV1vOlh0gAliTVd506AOJZ/PHLnWegtq3gvBvQ2RkQ+VrVbp0YI NMks5QsPldd1gajFGc1WWoO57ESferICgPBz5VRaDoSMMHWV70lag+PgRpOVXJYGGR dGxU7dFlx3c0seTjiFiGSQ/pFuO4d8Pzx9EXy9Rw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 840F46081B 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, 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 V2 09/29] drm/i915: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 17:49:04 -0500 Message-Id: <1511390964-9979-10-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511390964-9979-1-git-send-email-okaya@codeaurora.org> References: <1511390964-9979-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 X-Virus-Scanned: ClamAV using ClamSMTP 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..fea2b5e 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)); + u32 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;