From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() Date: Tue, 12 Dec 2017 16:04:16 +0200 Message-ID: <1513087456.3809.17.camel@linux.intel.com> References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Sinan Kaya , linux-pci@vger.kernel.org, timur@codeaurora.org Cc: David Airlie , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, open list , "open list:DRM DRIVERS" , Rodrigo Vivi , linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org SGksCgpJIHNlbnQgdGhpcyBpbmRpdmlkdWFsIGk5MTUgcGF0Y2ggdG8gb3VyIENJLCBhbmQgaXQg aXMgcGFzc2luZyBvbiBhbGwgcGxhdGZvcm1zOgoKaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0 b3Aub3JnL3Nlcmllcy8zNDgyMi8KCklzIGl0IG9rIGlmIEkgbWVyZ2UgdGhpcyB0byBkcm0tdGlw IGFscmVhZHk/CgpSZWdhcmRzLCBKb29uYXMKCk9uIE1vbiwgMjAxNy0xMS0yNyBhdCAxMzo1MCAt MDUwMCwgU2luYW4gS2F5YSB3cm90ZToKPiArZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y Zwo+IAo+IE9uIDExLzI3LzIwMTcgMTE6NTcgQU0sIFNpbmFuIEtheWEgd3JvdGU6Cj4gPiBwY2lf Z2V0X2J1c19hbmRfc2xvdCgpIGlzIHJlc3RyaWN0aXZlIHN1Y2ggdGhhdCBpdCBhc3N1bWVzIGRv bWFpbj0wIGFzCj4gPiB3aGVyZSBhIFBDSSBkZXZpY2UgaXMgcHJlc2VudC4gVGhpcyByZXN0cmlj dHMgdGhlIGRldmljZSBkcml2ZXJzIHRvIGJlCj4gPiByZXVzZWQgZm9yIG90aGVyIGRvbWFpbiBu dW1iZXJzLgo+ID4gCj4gPiBHZXR0aW5nIHJlYWR5IHRvIHJlbW92ZSBwY2lfZ2V0X2J1c19hbmRf c2xvdCgpIGZ1bmN0aW9uIGluIGZhdm9yIG9mCj4gPiBwY2lfZ2V0X2RvbWFpbl9idXNfYW5kX3Ns b3QoKS4KPiA+IAo+ID4gRXh0cmFjdCB0aGUgZG9tYWluIG51bWJlciBmcm9tIGRybV9kZXZpY2Ug YW5kIHBhc3MgaXQgaW50bwo+ID4gcGNpX2dldF9kb21haW5fYnVzX2FuZF9zbG90KCkgZnVuY3Rp b24uCj4gPiAKPiA+IFNpZ25lZC1vZmYtYnk6IFNpbmFuIEtheWEgPG9rYXlhQGNvZGVhdXJvcmEu b3JnPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDUgKysr Ky0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4g PiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ID4gaW5kZXggOWY0NWNmZS4uNWE4Y2I3OSAx MDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiA+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiA+IEBAIC00MTksNyArNDE5LDEwIEBA IHN0YXRpYyBpbnQgaTkxNV9nZXRwYXJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAo+ID4gIAo+ID4gIHN0YXRpYyBpbnQgaTkxNV9nZXRfYnJpZGdlX2RldihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiAgewo+ID4gLQlkZXZfcHJpdi0+YnJpZGdlX2Rl diA9IHBjaV9nZXRfYnVzX2FuZF9zbG90KDAsIFBDSV9ERVZGTigwLCAwKSk7Cj4gPiArCWludCBk b21haW4gPSBwY2lfZG9tYWluX25yKGRldl9wcml2LT5kcm0ucGRldi0+YnVzKTsKPiA+ICsKPiA+ ICsJZGV2X3ByaXYtPmJyaWRnZV9kZXYgPQo+ID4gKwkJcGNpX2dldF9kb21haW5fYnVzX2FuZF9z bG90KGRvbWFpbiwgMCwgUENJX0RFVkZOKDAsIDApKTsKPiA+ICAJaWYgKCFkZXZfcHJpdi0+YnJp ZGdlX2Rldikgewo+ID4gIAkJRFJNX0VSUk9SKCJicmlkZ2UgZGV2aWNlIG5vdCBmb3VuZFxuIik7 Cj4gPiAgCQlyZXR1cm4gLTE7Cj4gPiAKPiAKPiAKLS0gCkpvb25hcyBMYWh0aW5lbgpPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgpJbnRlbCBDb3Jwb3JhdGlvbgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Message-ID: <1513087456.3809.17.camel@linux.intel.com> Subject: Re: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() From: Joonas Lahtinen To: Sinan Kaya , linux-pci@vger.kernel.org, timur@codeaurora.org Date: Tue, 12 Dec 2017 16:04:16 +0200 In-Reply-To: References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> Mime-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, open list , Jani Nikula , "open list:DRM DRIVERS" , Rodrigo Vivi , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+bjorn=helgaas.com@lists.infradead.org List-ID: Hi, I sent this individual i915 patch to our CI, and it is passing on all platforms: https://patchwork.freedesktop.org/series/34822/ Is it ok if I merge this to drm-tip already? Regards, Joonas On Mon, 2017-11-27 at 13:50 -0500, Sinan Kaya wrote: > +dri-devel@lists.freedesktop.org > > On 11/27/2017 11:57 AM, 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 > > --- > > 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; > > > > -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: joonas.lahtinen@linux.intel.com (Joonas Lahtinen) Date: Tue, 12 Dec 2017 16:04:16 +0200 Subject: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() In-Reply-To: References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> Message-ID: <1513087456.3809.17.camel@linux.intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, I sent this individual i915 patch to our CI, and it is passing on all platforms: https://patchwork.freedesktop.org/series/34822/ Is it ok if I merge this to drm-tip already? Regards, Joonas On Mon, 2017-11-27 at 13:50 -0500, Sinan Kaya wrote: > +dri-devel at lists.freedesktop.org > > On 11/27/2017 11:57 AM, 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 > > --- > > 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; > > > > -- Joonas Lahtinen Open Source Technology Center Intel Corporation From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753605AbdLLOE0 (ORCPT ); Tue, 12 Dec 2017 09:04:26 -0500 Received: from mga03.intel.com ([134.134.136.65]:21045 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbdLLOEW (ORCPT ); Tue, 12 Dec 2017 09:04:22 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,395,1508828400"; d="scan'208";a="15347069" Message-ID: <1513087456.3809.17.camel@linux.intel.com> Subject: Re: [PATCH V3 09/29] drm/i915: deprecate pci_get_bus_and_slot() From: Joonas Lahtinen To: Sinan Kaya , 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, Jani Nikula , Rodrigo Vivi , David Airlie , "open list:DRM DRIVERS" , open list Date: Tue, 12 Dec 2017 16:04:16 +0200 In-Reply-To: References: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> <1511801886-6753-10-git-send-email-okaya@codeaurora.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.2 (3.26.2-1.fc27) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, I sent this individual i915 patch to our CI, and it is passing on all platforms: https://patchwork.freedesktop.org/series/34822/ Is it ok if I merge this to drm-tip already? Regards, Joonas On Mon, 2017-11-27 at 13:50 -0500, Sinan Kaya wrote: > +dri-devel@lists.freedesktop.org > > On 11/27/2017 11:57 AM, 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 > > --- > > 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; > > > > -- Joonas Lahtinen Open Source Technology Center Intel Corporation