From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() Date: Mon, 19 Feb 2018 11:34:34 +0200 Message-ID: <87bmglb9w5.fsf@intel.com> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Bjorn Helgaas , Sinan Kaya Cc: David Airlie , linux-pci@vger.kernel.org, timur@codeaurora.org, open list , "open list:DRM DRIVERS" , Rodrigo Vivi , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org T24gRnJpLCAxNiBGZWIgMjAxOCwgQmpvcm4gSGVsZ2FhcyA8aGVsZ2Fhc0BrZXJuZWwub3JnPiB3 cm90ZToKPiBPbiBNb24sIE5vdiAyNywgMjAxNyBhdCAxMTo1Nzo0NkFNIC0wNTAwLCBTaW5hbiBL YXlhIHdyb3RlOgo+PiBwY2lfZ2V0X2J1c19hbmRfc2xvdCgpIGlzIHJlc3RyaWN0aXZlIHN1Y2gg dGhhdCBpdCBhc3N1bWVzIGRvbWFpbj0wIGFzCj4+IHdoZXJlIGEgUENJIGRldmljZSBpcyBwcmVz ZW50LiBUaGlzIHJlc3RyaWN0cyB0aGUgZGV2aWNlIGRyaXZlcnMgdG8gYmUKPj4gcmV1c2VkIGZv ciBvdGhlciBkb21haW4gbnVtYmVycy4KPj4gCj4+IEdldHRpbmcgcmVhZHkgdG8gcmVtb3ZlIHBj aV9nZXRfYnVzX2FuZF9zbG90KCkgZnVuY3Rpb24gaW4gZmF2b3Igb2YKPj4gcGNpX2dldF9kb21h aW5fYnVzX2FuZF9zbG90KCkuCj4+IAo+PiBFeHRyYWN0IHRoZSBkb21haW4gbnVtYmVyIGZyb20g ZHJtX2RldmljZSBhbmQgcGFzcyBpdCBpbnRvCj4+IHBjaV9nZXRfZG9tYWluX2J1c19hbmRfc2xv dCgpIGZ1bmN0aW9uLgo+PiAKPj4gU2lnbmVkLW9mZi1ieTogU2luYW4gS2F5YSA8b2theWFAY29k ZWF1cm9yYS5vcmc+Cj4KPiBJIGRvbid0IGtub3cgd2hhdCBoYXBwZW5lZCB0byB0aGlzLCBhbmQg aXQgZGlkbid0IG1ha2UgaXQgaW50bwo+IHY0LjE2LXJjMS4gIEkgYXBwbGllZCBpdCB0byBwY2kv ZGVwcmVjYXRlLWdldC1idXMtYW5kLXNsb3QgZm9yIHY0LjE3Cj4gYWxvbmcgd2l0aCB0aGUgcGF0 Y2ggdGhhdCBhY3R1YWxseSByZW1vdmVzIHBjaV9nZXRfYnVzX2FuZF9zbG90KCkuCgpJdCBmZWxs IGJldHdlZW4gdGhlIGNyYWNrcyBhcyB3ZSBjb3VsZG4ndCBhcHBseSBpdCBiZWZvcmUgZ2V0dGlu ZyBhCmJhY2ttZXJnZSBvbiB0aGUgZGVwZW5kZW5jeS4gU29ycnkgYWJvdXQgdGhhdC4KCkFjayBm b3IgbWVyZ2luZyB0aHJvdWdoIHlvdXIgdHJlZS4KClRoYW5rcywKSmFuaS4KCgo+Cj4+IC0tLQo+ PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDUgKysrKy0KPj4gIDEgZmlsZSBj aGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPj4gCj4+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwo+PiBpbmRleCA5ZjQ1Y2ZlLi41YThjYjc5IDEwMDY0NAo+PiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPj4gQEAgLTQxOSw3ICs0MTksMTAgQEAgc3RhdGljIGludCBpOTE1X2dldHBh cmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4+ICAKPj4gIHN0YXRpYyBp bnQgaTkxNV9nZXRfYnJpZGdlX2RldihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Cj4+ICB7Cj4+IC0JZGV2X3ByaXYtPmJyaWRnZV9kZXYgPSBwY2lfZ2V0X2J1c19hbmRfc2xvdCgw LCBQQ0lfREVWRk4oMCwgMCkpOwo+PiArCWludCBkb21haW4gPSBwY2lfZG9tYWluX25yKGRldl9w cml2LT5kcm0ucGRldi0+YnVzKTsKPj4gKwo+PiArCWRldl9wcml2LT5icmlkZ2VfZGV2ID0KPj4g KwkJcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KGRvbWFpbiwgMCwgUENJX0RFVkZOKDAsIDAp KTsKPj4gIAlpZiAoIWRldl9wcml2LT5icmlkZ2VfZGV2KSB7Cj4+ICAJCURSTV9FUlJPUigiYnJp ZGdlIGRldmljZSBub3QgZm91bmRcbiIpOwo+PiAgCQlyZXR1cm4gLTE7Cj4+IC0tIAo+PiAxLjku MQo+PiAKPj4gCj4+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCj4+IGxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cj4+IGxpbnV4LWFybS1rZXJuZWxA bGlzdHMuaW5mcmFkZWFkLm9yZwo+PiBodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBT b3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: From: Jani Nikula To: Bjorn Helgaas , Sinan Kaya Cc: linux-pci@vger.kernel.org, timur@codeaurora.org, David Airlie , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, Joonas Lahtinen , open list , "open list\:DRM DRIVERS" , Rodrigo Vivi , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() In-Reply-To: <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> Date: Mon, 19 Feb 2018 11:34:34 +0200 Message-ID: <87bmglb9w5.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain List-ID: On Fri, 16 Feb 2018, Bjorn Helgaas wrote: > On Mon, Nov 27, 2017 at 11:57:46AM -0500, Sinan Kaya wrote: >> 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 > > I don't know what happened to this, and it didn't make it into > v4.16-rc1. I applied it to pci/deprecate-get-bus-and-slot for v4.17 > along with the patch that actually removes pci_get_bus_and_slot(). It fell between the cracks as we couldn't apply it before getting a backmerge on the dependency. Sorry about that. Ack for merging through your tree. Thanks, Jani. > >> --- >> 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; >> -- >> 1.9.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: jani.nikula@linux.intel.com (Jani Nikula) Date: Mon, 19 Feb 2018 11:34:34 +0200 Subject: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() In-Reply-To: <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> <20180216145444.GA11014@bhelgaas-glaptop.roam.corp.google.com> Message-ID: <87bmglb9w5.fsf@intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 16 Feb 2018, Bjorn Helgaas wrote: > On Mon, Nov 27, 2017 at 11:57:46AM -0500, Sinan Kaya wrote: >> 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 > > I don't know what happened to this, and it didn't make it into > v4.16-rc1. I applied it to pci/deprecate-get-bus-and-slot for v4.17 > along with the patch that actually removes pci_get_bus_and_slot(). It fell between the cracks as we couldn't apply it before getting a backmerge on the dependency. Sorry about that. Ack for merging through your tree. Thanks, Jani. > >> --- >> 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; >> -- >> 1.9.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Jani Nikula, Intel Open Source Technology Center