* [PATCH] Fix intel_detect_pch() to work in xen environment. @ 2012-12-18 16:49 G.R. 2012-12-18 16:53 ` Jesse Barnes 2012-12-18 17:21 ` Ben Widawsky 0 siblings, 2 replies; 16+ messages in thread From: G.R. @ 2012-12-18 16:49 UTC (permalink / raw) To: intel-gfx; +Cc: Stefano Stabellini, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao Hi guys, In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. This shadows the PCH ISA bridge on 1f.0 with the current intel_detect_pch() implementation. The issue can be easily solved by looping through all the ISA bridges until the first match is found, instead of just check against the first one. Here I attach the patch I used locally. It's created on Torvalds's git. Looking forward to your comments. Thanks, Timothy diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 530db83..3f7e5fb 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) * underneath. This is a requirement from virtualization team. */ pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); - if (pch) { + while (pch) { + struct pci_dev * curr = pch; if (pch->vendor == PCI_VENDOR_ID_INTEL) { unsigned short id; + unsigned found = 1; id = pch->device & INTEL_PCH_DEVICE_ID_MASK; dev_priv->pch_id = id; @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) dev_priv->num_pch_pll = 0; DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); WARN_ON(!IS_HASWELL(dev)); + } else { + found = 0; + } + if (found) { + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); + pci_dev_put(pch); + break; } - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); } - pci_dev_put(pch); + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); + pci_dev_put(curr); + } + if (!pch) { + DRM_DEBUG_KMS("No PCH found?\n"); } } ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 16:49 [PATCH] Fix intel_detect_pch() to work in xen environment G.R. @ 2012-12-18 16:53 ` Jesse Barnes 2012-12-18 17:43 ` G.R. 2012-12-18 17:21 ` Ben Widawsky 1 sibling, 1 reply; 16+ messages in thread From: Jesse Barnes @ 2012-12-18 16:53 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Wed, 19 Dec 2012 00:49:28 +0800 "G.R." <firemeteor@users.sourceforge.net> wrote: > Hi guys, > > In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. > This shadows the PCH ISA bridge on 1f.0 with the current > intel_detect_pch() implementation. > The issue can be easily solved by looping through all the ISA bridges > until the first match is found, instead of just check against the > first one. > > Here I attach the patch I used locally. It's created on Torvalds's git. > Looking forward to your comments. > > Thanks, > Timothy > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 530db83..3f7e5fb 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) > * underneath. This is a requirement from virtualization team. > */ > pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); > - if (pch) { > + while (pch) { > + struct pci_dev * curr = pch; > if (pch->vendor == PCI_VENDOR_ID_INTEL) { > unsigned short id; > + unsigned found = 1; > id = pch->device & INTEL_PCH_DEVICE_ID_MASK; > dev_priv->pch_id = id; > > @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) > dev_priv->num_pch_pll = 0; > DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > WARN_ON(!IS_HASWELL(dev)); > + } else { > + found = 0; > + } > + if (found) { > + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > + pci_dev_put(pch); > + break; > } > - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > } > - pci_dev_put(pch); > + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); > + pci_dev_put(curr); > + } > + if (!pch) { > + DRM_DEBUG_KMS("No PCH found?\n"); > } > } > I'd like to see a comment about this being for Xen in here, and I wonder if there are other places where we might have to worry about the Xen implementation. In that case, setting a flag in dev_priv when we don't find the PCH where we expect would be a good idea too. Ack on the general idea though; I'd like us to be able to run under Xen without modification. Jesse -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 16:53 ` Jesse Barnes @ 2012-12-18 17:43 ` G.R. 2012-12-18 18:20 ` Jesse Barnes 0 siblings, 1 reply; 16+ messages in thread From: G.R. @ 2012-12-18 17:43 UTC (permalink / raw) To: Jesse Barnes, Stefano Stabellini Cc: Dong, Eddie, intel-gfx, Xu, Dongxiao, Zhang, Xiantao On Wed, Dec 19, 2012 at 12:53 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > On Wed, 19 Dec 2012 00:49:28 +0800 > "G.R." <firemeteor@users.sourceforge.net> wrote: > >> Hi guys, >> >> In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. >> This shadows the PCH ISA bridge on 1f.0 with the current >> intel_detect_pch() implementation. >> The issue can be easily solved by looping through all the ISA bridges >> until the first match is found, instead of just check against the >> first one. >> >> Here I attach the patch I used locally. It's created on Torvalds's git. >> Looking forward to your comments. >> >> Thanks, >> Timothy >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c >> index 530db83..3f7e5fb 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.c >> +++ b/drivers/gpu/drm/i915/i915_drv.c >> @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) >> * underneath. This is a requirement from virtualization team. >> */ >> pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); >> - if (pch) { >> + while (pch) { >> + struct pci_dev * curr = pch; >> if (pch->vendor == PCI_VENDOR_ID_INTEL) { >> unsigned short id; >> + unsigned found = 1; >> id = pch->device & INTEL_PCH_DEVICE_ID_MASK; >> dev_priv->pch_id = id; >> >> @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) >> dev_priv->num_pch_pll = 0; >> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); >> WARN_ON(!IS_HASWELL(dev)); >> + } else { >> + found = 0; >> + } >> + if (found) { >> + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> + pci_dev_put(pch); >> + break; >> } >> - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> } >> - pci_dev_put(pch); >> + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); >> + pci_dev_put(curr); >> + } >> + if (!pch) { >> + DRM_DEBUG_KMS("No PCH found?\n"); >> } >> } >> > > I'd like to see a comment about this being for Xen in here, and I > wonder if there are other places where we might have to worry about the > Xen implementation. In that case, setting a flag in dev_priv when we > don't find the PCH where we expect would be a good idea too. > I can add a comment here if the overall idea is acceptable to you. But there is already a comment mentioning that the ISA bridge check is for virtualization: 404 /* 405 * The reason to probe ISA bridge instead of Dev31:Fun0 is to 406 * make graphics device passthrough work easy for VMM, that only 407 * need to expose ISA bridge to let driver know the real hardware 408 * underneath. This is a requirement from virtualization team. 409 */ > Ack on the general idea though; I'd like us to be able to run under Xen > without modification. > Stefano may be able to comment if it's feasible to achieve zero modification in this case. I believe this has something to do with getting rid of the PIIX3 device provided by qemu. But generally I think it's very hard to achieve perfect emulation. You can't always foresee what assumption a guest driver would make. Maybe we need some compromise. > Jesse > > -- > Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 17:43 ` G.R. @ 2012-12-18 18:20 ` Jesse Barnes 2012-12-19 3:40 ` G.R. 2012-12-20 4:04 ` G.R. 0 siblings, 2 replies; 16+ messages in thread From: Jesse Barnes @ 2012-12-18 18:20 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Wed, 19 Dec 2012 01:43:22 +0800 "G.R." <firemeteor@users.sourceforge.net> wrote: > On Wed, Dec 19, 2012 at 12:53 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > > On Wed, 19 Dec 2012 00:49:28 +0800 > > "G.R." <firemeteor@users.sourceforge.net> wrote: > > > >> Hi guys, > >> > >> In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. > >> This shadows the PCH ISA bridge on 1f.0 with the current > >> intel_detect_pch() implementation. > >> The issue can be easily solved by looping through all the ISA bridges > >> until the first match is found, instead of just check against the > >> first one. > >> > >> Here I attach the patch I used locally. It's created on Torvalds's git. > >> Looking forward to your comments. > >> > >> Thanks, > >> Timothy > >> > >> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > >> index 530db83..3f7e5fb 100644 > >> --- a/drivers/gpu/drm/i915/i915_drv.c > >> +++ b/drivers/gpu/drm/i915/i915_drv.c > >> @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) > >> * underneath. This is a requirement from virtualization team. > >> */ > >> pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); > >> - if (pch) { > >> + while (pch) { > >> + struct pci_dev * curr = pch; > >> if (pch->vendor == PCI_VENDOR_ID_INTEL) { > >> unsigned short id; > >> + unsigned found = 1; > >> id = pch->device & INTEL_PCH_DEVICE_ID_MASK; > >> dev_priv->pch_id = id; > >> > >> @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) > >> dev_priv->num_pch_pll = 0; > >> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > >> WARN_ON(!IS_HASWELL(dev)); > >> + } else { > >> + found = 0; > >> + } > >> + if (found) { > >> + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > >> + pci_dev_put(pch); > >> + break; > >> } > >> - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > >> } > >> - pci_dev_put(pch); > >> + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); > >> + pci_dev_put(curr); > >> + } > >> + if (!pch) { > >> + DRM_DEBUG_KMS("No PCH found?\n"); > >> } > >> } > >> > > > > I'd like to see a comment about this being for Xen in here, and I > > wonder if there are other places where we might have to worry about the > > Xen implementation. In that case, setting a flag in dev_priv when we > > don't find the PCH where we expect would be a good idea too. > > > > I can add a comment here if the overall idea is acceptable to you. > But there is already a comment mentioning that the ISA bridge check is > for virtualization: > > 404 /* > 405 * The reason to probe ISA bridge instead of Dev31:Fun0 is to > 406 * make graphics device passthrough work easy for VMM, that only > 407 * need to expose ISA bridge to let driver know the real hardware > 408 * underneath. This is a requirement from virtualization team. > 409 */ > > > Ack on the general idea though; I'd like us to be able to run under Xen > > without modification. > > > > Stefano may be able to comment if it's feasible to achieve zero > modification in this case. > I believe this has something to do with getting rid of the PIIX3 > device provided by qemu. > > But generally I think it's very hard to achieve perfect emulation. > You can't always foresee what assumption a guest driver would make. > Maybe we need some compromise. I meant that I'd like to see any other patches required for Xen get merged, that way people won't have to patch their kernels for i915 under Xen. -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 18:20 ` Jesse Barnes @ 2012-12-19 3:40 ` G.R. 2012-12-20 4:04 ` G.R. 1 sibling, 0 replies; 16+ messages in thread From: G.R. @ 2012-12-19 3:40 UTC (permalink / raw) To: Jesse Barnes Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Wed, Dec 19, 2012 at 2:20 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > On Wed, 19 Dec 2012 01:43:22 +0800 > "G.R." <firemeteor@users.sourceforge.net> wrote: > >> On Wed, Dec 19, 2012 at 12:53 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: >> > On Wed, 19 Dec 2012 00:49:28 +0800 >> > "G.R." <firemeteor@users.sourceforge.net> wrote: >> > >> >> Hi guys, >> >> >> >> In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. >> >> This shadows the PCH ISA bridge on 1f.0 with the current >> >> intel_detect_pch() implementation. >> >> The issue can be easily solved by looping through all the ISA bridges >> >> until the first match is found, instead of just check against the >> >> first one. >> >> >> >> Here I attach the patch I used locally. It's created on Torvalds's git. >> >> Looking forward to your comments. >> >> >> >> Thanks, >> >> Timothy >> >> >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c >> >> index 530db83..3f7e5fb 100644 >> >> --- a/drivers/gpu/drm/i915/i915_drv.c >> >> +++ b/drivers/gpu/drm/i915/i915_drv.c >> >> @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) >> >> * underneath. This is a requirement from virtualization team. >> >> */ >> >> pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); >> >> - if (pch) { >> >> + while (pch) { >> >> + struct pci_dev * curr = pch; >> >> if (pch->vendor == PCI_VENDOR_ID_INTEL) { >> >> unsigned short id; >> >> + unsigned found = 1; >> >> id = pch->device & INTEL_PCH_DEVICE_ID_MASK; >> >> dev_priv->pch_id = id; >> >> >> >> @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) >> >> dev_priv->num_pch_pll = 0; >> >> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); >> >> WARN_ON(!IS_HASWELL(dev)); >> >> + } else { >> >> + found = 0; >> >> + } >> >> + if (found) { >> >> + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> >> + pci_dev_put(pch); >> >> + break; >> >> } >> >> - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> >> } >> >> - pci_dev_put(pch); >> >> + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); >> >> + pci_dev_put(curr); >> >> + } >> >> + if (!pch) { >> >> + DRM_DEBUG_KMS("No PCH found?\n"); >> >> } >> >> } >> >> >> > >> > I'd like to see a comment about this being for Xen in here, and I >> > wonder if there are other places where we might have to worry about the >> > Xen implementation. In that case, setting a flag in dev_priv when we >> > don't find the PCH where we expect would be a good idea too. >> > >> >> I can add a comment here if the overall idea is acceptable to you. >> But there is already a comment mentioning that the ISA bridge check is >> for virtualization: >> >> 404 /* >> 405 * The reason to probe ISA bridge instead of Dev31:Fun0 is to >> 406 * make graphics device passthrough work easy for VMM, that only >> 407 * need to expose ISA bridge to let driver know the real hardware >> 408 * underneath. This is a requirement from virtualization team. >> 409 */ >> >> > Ack on the general idea though; I'd like us to be able to run under Xen >> > without modification. >> > >> >> Stefano may be able to comment if it's feasible to achieve zero >> modification in this case. >> I believe this has something to do with getting rid of the PIIX3 >> device provided by qemu. >> >> But generally I think it's very hard to achieve perfect emulation. >> You can't always foresee what assumption a guest driver would make. >> Maybe we need some compromise. > > I meant that I'd like to see any other patches required for Xen get > merged, that way people won't have to patch their kernels for i915 > under Xen. > Sorry for misreading your comment :-) > -- > Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 18:20 ` Jesse Barnes 2012-12-19 3:40 ` G.R. @ 2012-12-20 4:04 ` G.R. 2012-12-20 16:13 ` Jesse Barnes 1 sibling, 1 reply; 16+ messages in thread From: G.R. @ 2012-12-20 4:04 UTC (permalink / raw) To: Jesse Barnes Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Wed, Dec 19, 2012 at 2:20 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: >> > >> > I'd like to see a comment about this being for Xen in here, and I >> > wonder if there are other places where we might have to worry about the >> > Xen implementation. In that case, setting a flag in dev_priv when we >> > don't find the PCH where we expect would be a good idea too. >> > >> >> I can add a comment here if the overall idea is acceptable to you. >> But there is already a comment mentioning that the ISA bridge check is >> for virtualization: >> >> 404 /* >> 405 * The reason to probe ISA bridge instead of Dev31:Fun0 is to >> 406 * make graphics device passthrough work easy for VMM, that only >> 407 * need to expose ISA bridge to let driver know the real hardware >> 408 * underneath. This is a requirement from virtualization team. >> 409 */ >> >> > Ack on the general idea though; I'd like us to be able to run under Xen >> > without modification. >> > >> >> Stefano may be able to comment if it's feasible to achieve zero >> modification in this case. >> I believe this has something to do with getting rid of the PIIX3 >> device provided by qemu. >> >> But generally I think it's very hard to achieve perfect emulation. >> You can't always foresee what assumption a guest driver would make. >> Maybe we need some compromise. > > I meant that I'd like to see any other patches required for Xen get > merged, that way people won't have to patch their kernels for i915 > under Xen. Hi Jesse, I think I need to resend the patch with proper comment to have it formally accepted. Any guide line for formal patch submission? Do I need to start a separate thread? ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-20 4:04 ` G.R. @ 2012-12-20 16:13 ` Jesse Barnes 2012-12-23 6:51 ` G.R. 0 siblings, 1 reply; 16+ messages in thread From: Jesse Barnes @ 2012-12-20 16:13 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Thu, 20 Dec 2012 12:04:11 +0800 "G.R." <firemeteor@users.sourceforge.net> wrote: > On Wed, Dec 19, 2012 at 2:20 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > >> > > >> > I'd like to see a comment about this being for Xen in here, and I > >> > wonder if there are other places where we might have to worry about the > >> > Xen implementation. In that case, setting a flag in dev_priv when we > >> > don't find the PCH where we expect would be a good idea too. > >> > > >> > >> I can add a comment here if the overall idea is acceptable to you. > >> But there is already a comment mentioning that the ISA bridge check is > >> for virtualization: > >> > >> 404 /* > >> 405 * The reason to probe ISA bridge instead of Dev31:Fun0 is to > >> 406 * make graphics device passthrough work easy for VMM, that only > >> 407 * need to expose ISA bridge to let driver know the real hardware > >> 408 * underneath. This is a requirement from virtualization team. > >> 409 */ > >> > >> > Ack on the general idea though; I'd like us to be able to run under Xen > >> > without modification. > >> > > >> > >> Stefano may be able to comment if it's feasible to achieve zero > >> modification in this case. > >> I believe this has something to do with getting rid of the PIIX3 > >> device provided by qemu. > >> > >> But generally I think it's very hard to achieve perfect emulation. > >> You can't always foresee what assumption a guest driver would make. > >> Maybe we need some compromise. > > > > I meant that I'd like to see any other patches required for Xen get > > merged, that way people won't have to patch their kernels for i915 > > under Xen. > > Hi Jesse, I think I need to resend the patch with proper comment to > have it formally accepted. > Any guide line for formal patch submission? Do I need to start a > separate thread? No, just cc Daniel Vetter. -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-20 16:13 ` Jesse Barnes @ 2012-12-23 6:51 ` G.R. 2013-06-18 12:54 ` G.R. 0 siblings, 1 reply; 16+ messages in thread From: G.R. @ 2012-12-23 6:51 UTC (permalink / raw) To: Jesse Barnes, Daniel Vetter Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao >> >> > Ack on the general idea though; I'd like us to be able to run under Xen >> >> > without modification. >> >> > >> >> >> >> Stefano may be able to comment if it's feasible to achieve zero >> >> modification in this case. >> >> I believe this has something to do with getting rid of the PIIX3 >> >> device provided by qemu. >> >> >> >> But generally I think it's very hard to achieve perfect emulation. >> >> You can't always foresee what assumption a guest driver would make. >> >> Maybe we need some compromise. >> > >> > I meant that I'd like to see any other patches required for Xen get >> > merged, that way people won't have to patch their kernels for i915 >> > under Xen. >> >> Hi Jesse, I think I need to resend the patch with proper comment to >> have it formally accepted. >> Any guide line for formal patch submission? Do I need to start a >> separate thread? > > No, just cc Daniel Vetter. > > -- > Jesse Barnes, Intel Open Source Technology Center Thanks, Resend with updated patch && Daniel involved. Also include the background info for easy reading. In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. This shadows the PCH ISA bridge on 1f.0 with the current intel_detect_pch() implementation. The issue can be easily solved by looping through all the ISA bridges until the first match is found, instead of just check against the first one. Against torvalds tree 3.8-rc1 (a49f0d1) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 530db83..8f949c1 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -406,11 +406,18 @@ void intel_detect_pch(struct drm_device *dev) * make graphics device passthrough work easy for VMM, that only * need to expose ISA bridge to let driver know the real hardware * underneath. This is a requirement from virtualization team. + * + * In some virtualized environments (e.g. XEN), there is irrelevant + * ISA bridge in the system. To work reliably, we should scan trhough + * all the ISA bridge devices and check for the first match, instead + * of only checking the first one. */ pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); - if (pch) { + while (pch) { + struct pci_dev * curr = pch; if (pch->vendor == PCI_VENDOR_ID_INTEL) { unsigned short id; + unsigned found = 1; id = pch->device & INTEL_PCH_DEVICE_ID_MASK; dev_priv->pch_id = id; @@ -440,10 +447,20 @@ void intel_detect_pch(struct drm_device *dev) dev_priv->num_pch_pll = 0; DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); WARN_ON(!IS_HASWELL(dev)); + } else { + found = 0; + } + if (found) { + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); + pci_dev_put(pch); + break; } - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); } - pci_dev_put(pch); + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); + pci_dev_put(curr); + } + if (!pch) { + DRM_DEBUG_KMS("No PCH found?\n"); } } ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-23 6:51 ` G.R. @ 2013-06-18 12:54 ` G.R. 2013-06-19 6:01 ` Daniel Vetter 2013-06-19 7:57 ` Ville Syrjälä 0 siblings, 2 replies; 16+ messages in thread From: G.R. @ 2013-06-18 12:54 UTC (permalink / raw) To: Jesse Barnes, Daniel Vetter Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Sun, Dec 23, 2012 at 2:51 PM, G.R. <firemeteor@users.sourceforge.net> wrote: >>> Hi Jesse, I think I need to resend the patch with proper comment to >>> have it formally accepted. >>> Any guide line for formal patch submission? Do I need to start a >>> separate thread? >> >> No, just cc Daniel Vetter. >> >> -- >> Jesse Barnes, Intel Open Source Technology Center > > Thanks, > Resend with updated patch && Daniel involved. > Also include the background info for easy reading. > > In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. > This shadows the PCH ISA bridge on 1f.0 with the current > intel_detect_pch() implementation. > The issue can be easily solved by looping through all the ISA bridges > until the first match is found, instead of just check against the > first one. > This seems to have lost in the list. Retry it again with latest torvalds' kernel: diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a2e4953..e38fa86 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -454,11 +454,18 @@ void intel_detect_pch(struct drm_device *dev) * make graphics device passthrough work easy for VMM, that only * need to expose ISA bridge to let driver know the real hardware * underneath. This is a requirement from virtualization team. + * + * In some virtualized environments (e.g. XEN), there is irrelevant + * ISA bridge in the system. To work reliably, we should scan trhough + * all the ISA bridge devices and check for the first match, instead + * of only checking the first one. */ pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); - if (pch) { + while (pch) { + struct pci_dev * curr = pch; if (pch->vendor == PCI_VENDOR_ID_INTEL) { unsigned short id; + unsigned found = 1; id = pch->device & INTEL_PCH_DEVICE_ID_MASK; dev_priv->pch_id = id; @@ -490,10 +497,20 @@ void intel_detect_pch(struct drm_device *dev) DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); WARN_ON(!IS_HASWELL(dev)); WARN_ON(!IS_ULT(dev)); + } else { + found = 0; + } + if (found) { + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); + pci_dev_put(pch); + break; } - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); } - pci_dev_put(pch); + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); + pci_dev_put(curr); + } + if (!pch) { + DRM_DEBUG_KMS("No PCH found?\n"); } } ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2013-06-18 12:54 ` G.R. @ 2013-06-19 6:01 ` Daniel Vetter 2013-06-19 13:10 ` [PATCH] Fix PCH detect with multiple ISA bridges in VM Rui Guo 2013-06-19 15:29 ` [PATCH] Fix intel_detect_pch() to work in xen environment G.R. 2013-06-19 7:57 ` Ville Syrjälä 1 sibling, 2 replies; 16+ messages in thread From: Daniel Vetter @ 2013-06-19 6:01 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, Dong, Eddie, intel-gfx, Xu, Dongxiao, Zhang, Xiantao Can you please resubmit this as a proper patch with a committ message, signed-off-by line and everything else (see Documentation/SubmittingPatches). -Daniel On Tue, Jun 18, 2013 at 2:54 PM, G.R. <firemeteor@users.sourceforge.net> wrote: > On Sun, Dec 23, 2012 at 2:51 PM, G.R. <firemeteor@users.sourceforge.net> wrote: >>>> Hi Jesse, I think I need to resend the patch with proper comment to >>>> have it formally accepted. >>>> Any guide line for formal patch submission? Do I need to start a >>>> separate thread? >>> >>> No, just cc Daniel Vetter. >>> >>> -- >>> Jesse Barnes, Intel Open Source Technology Center >> >> Thanks, >> Resend with updated patch && Daniel involved. >> Also include the background info for easy reading. >> >> In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. >> This shadows the PCH ISA bridge on 1f.0 with the current >> intel_detect_pch() implementation. >> The issue can be easily solved by looping through all the ISA bridges >> until the first match is found, instead of just check against the >> first one. >> > > This seems to have lost in the list. Retry it again with latest > torvalds' kernel: > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index a2e4953..e38fa86 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -454,11 +454,18 @@ void intel_detect_pch(struct drm_device *dev) > * make graphics device passthrough work easy for VMM, that only > * need to expose ISA bridge to let driver know the real hardware > * underneath. This is a requirement from virtualization team. > + * > + * In some virtualized environments (e.g. XEN), there is irrelevant > + * ISA bridge in the system. To work reliably, we should scan trhough > + * all the ISA bridge devices and check for the first match, instead > + * of only checking the first one. > */ > pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); > - if (pch) { > + while (pch) { > + struct pci_dev * curr = pch; > if (pch->vendor == PCI_VENDOR_ID_INTEL) { > unsigned short id; > + unsigned found = 1; > id = pch->device & INTEL_PCH_DEVICE_ID_MASK; > dev_priv->pch_id = id; > > @@ -490,10 +497,20 @@ void intel_detect_pch(struct drm_device *dev) > DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > WARN_ON(!IS_HASWELL(dev)); > WARN_ON(!IS_ULT(dev)); > + } else { > + found = 0; > + } > + if (found) { > + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > + pci_dev_put(pch); > + break; > } > - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > } > - pci_dev_put(pch); > + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); > + pci_dev_put(curr); > + } > + if (!pch) { > + DRM_DEBUG_KMS("No PCH found?\n"); > } > } -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] Fix PCH detect with multiple ISA bridges in VM 2013-06-19 6:01 ` Daniel Vetter @ 2013-06-19 13:10 ` Rui Guo 2013-06-19 15:29 ` [PATCH] Fix intel_detect_pch() to work in xen environment G.R. 1 sibling, 0 replies; 16+ messages in thread From: Rui Guo @ 2013-06-19 13:10 UTC (permalink / raw) To: Daniel Vetter; +Cc: intel-gfx In some virtualized environments (e.g. XEN), there is irrelevant ISA bridge in the system. To work reliably, we should scan trhough all the ISA bridge devices and check for the first match, instead of only checking the first one. Signed-off-by: Rui Guo <firemeteor@users.sourceforge.net> --- drivers/gpu/drm/i915/i915_drv.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a2e4953..10316dc 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -454,9 +454,15 @@ void intel_detect_pch(struct drm_device *dev) * make graphics device passthrough work easy for VMM, that only * need to expose ISA bridge to let driver know the real hardware * underneath. This is a requirement from virtualization team. + * + * In some virtualized environments (e.g. XEN), there is irrelevant + * ISA bridge in the system. To work reliably, we should scan trhough + * all the ISA bridge devices and check for the first match, instead + * of only checking the first one. */ pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); - if (pch) { + while (pch) { + struct pci_dev *curr = pch; if (pch->vendor == PCI_VENDOR_ID_INTEL) { unsigned short id; id = pch->device & INTEL_PCH_DEVICE_ID_MASK; @@ -490,11 +496,20 @@ void intel_detect_pch(struct drm_device *dev) DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); WARN_ON(!IS_HASWELL(dev)); WARN_ON(!IS_ULT(dev)); + } else { + goto check_next; } + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); + pci_dev_put(pch); + break; } - pci_dev_put(pch); +check_next: + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); + pci_dev_put(curr); } + if (!pch) + DRM_DEBUG_KMS("No PCH found?\n"); } bool i915_semaphore_is_enabled(struct drm_device *dev) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2013-06-19 6:01 ` Daniel Vetter 2013-06-19 13:10 ` [PATCH] Fix PCH detect with multiple ISA bridges in VM Rui Guo @ 2013-06-19 15:29 ` G.R. 2013-06-20 12:01 ` Daniel Vetter 1 sibling, 1 reply; 16+ messages in thread From: G.R. @ 2013-06-19 15:29 UTC (permalink / raw) To: Daniel Vetter Cc: Stefano Stabellini, Dong, Eddie, intel-gfx, Xu, Dongxiao, Zhang, Xiantao On Wed, Jun 19, 2013 at 2:01 PM, Daniel Vetter <daniel@ffwll.ch> wrote: > Can you please resubmit this as a proper patch with a committ message, > signed-off-by line and everything else (see > Documentation/SubmittingPatches). > -Daniel > Done, sent in a separate thread: http://lists.freedesktop.org/archives/intel-gfx/2013-June/029161.html ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2013-06-19 15:29 ` [PATCH] Fix intel_detect_pch() to work in xen environment G.R. @ 2013-06-20 12:01 ` Daniel Vetter 0 siblings, 0 replies; 16+ messages in thread From: Daniel Vetter @ 2013-06-20 12:01 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, Dong, Eddie, intel-gfx, Xu, Dongxiao, Zhang, Xiantao On Wed, Jun 19, 2013 at 11:29:21PM +0800, G.R. wrote: > On Wed, Jun 19, 2013 at 2:01 PM, Daniel Vetter <daniel@ffwll.ch> wrote: > > Can you please resubmit this as a proper patch with a committ message, > > signed-off-by line and everything else (see > > Documentation/SubmittingPatches). > > -Daniel > > Done, sent in a separate thread: > http://lists.freedesktop.org/archives/intel-gfx/2013-June/029161.html Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2013-06-18 12:54 ` G.R. 2013-06-19 6:01 ` Daniel Vetter @ 2013-06-19 7:57 ` Ville Syrjälä 1 sibling, 0 replies; 16+ messages in thread From: Ville Syrjälä @ 2013-06-19 7:57 UTC (permalink / raw) To: G.R. Cc: Stefano Stabellini, intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao On Tue, Jun 18, 2013 at 08:54:35PM +0800, G.R. wrote: > On Sun, Dec 23, 2012 at 2:51 PM, G.R. <firemeteor@users.sourceforge.net> wrote: > >>> Hi Jesse, I think I need to resend the patch with proper comment to > >>> have it formally accepted. > >>> Any guide line for formal patch submission? Do I need to start a > >>> separate thread? > >> > >> No, just cc Daniel Vetter. > >> > >> -- > >> Jesse Barnes, Intel Open Source Technology Center > > > > Thanks, > > Resend with updated patch && Daniel involved. > > Also include the background info for easy reading. > > > > In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. > > This shadows the PCH ISA bridge on 1f.0 with the current > > intel_detect_pch() implementation. > > The issue can be easily solved by looping through all the ISA bridges > > until the first match is found, instead of just check against the > > first one. > > > > This seems to have lost in the list. Retry it again with latest > torvalds' kernel: > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index a2e4953..e38fa86 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -454,11 +454,18 @@ void intel_detect_pch(struct drm_device *dev) > * make graphics device passthrough work easy for VMM, that only > * need to expose ISA bridge to let driver know the real hardware > * underneath. This is a requirement from virtualization team. > + * > + * In some virtualized environments (e.g. XEN), there is irrelevant > + * ISA bridge in the system. To work reliably, we should scan trhough > + * all the ISA bridge devices and check for the first match, instead > + * of only checking the first one. > */ > pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); > - if (pch) { > + while (pch) { > + struct pci_dev * curr = pch; ^ No space there. I think checkpatch should catch that. > if (pch->vendor == PCI_VENDOR_ID_INTEL) { > unsigned short id; > + unsigned found = 1; bool found = true; Although it would be easy to adjust the patch to not need a 'found' variable. > id = pch->device & INTEL_PCH_DEVICE_ID_MASK; > dev_priv->pch_id = id; > > @@ -490,10 +497,20 @@ void intel_detect_pch(struct drm_device *dev) > DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > WARN_ON(!IS_HASWELL(dev)); > WARN_ON(!IS_ULT(dev)); > + } else { > + found = 0; > + } > + if (found) { > + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > + pci_dev_put(pch); > + break; > } > - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > } > - pci_dev_put(pch); > + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); > + pci_dev_put(curr); > + } > + if (!pch) { > + DRM_DEBUG_KMS("No PCH found?\n"); > } > } > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 16:49 [PATCH] Fix intel_detect_pch() to work in xen environment G.R. 2012-12-18 16:53 ` Jesse Barnes @ 2012-12-18 17:21 ` Ben Widawsky 2012-12-19 4:01 ` G.R. 1 sibling, 1 reply; 16+ messages in thread From: Ben Widawsky @ 2012-12-18 17:21 UTC (permalink / raw) To: G.R. Cc: intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao, Stefano Stabellini On Wed, 19 Dec 2012 00:49:28 +0800 "G.R." <firemeteor@users.sourceforge.net> wrote: > Hi guys, > > In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. > This shadows the PCH ISA bridge on 1f.0 with the current > intel_detect_pch() implementation. > The issue can be easily solved by looping through all the ISA bridges > until the first match is found, instead of just check against the > first one. > > Here I attach the patch I used locally. It's created on Torvalds's git. > Looking forward to your comments. > > Thanks, > Timothy Is this functionally equivalent to http://lists.freedesktop.org/archives/intel-gfx/2012-July/019126.html? > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 530db83..3f7e5fb 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) > * underneath. This is a requirement from virtualization team. > */ > pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); > - if (pch) { > + while (pch) { > + struct pci_dev * curr = pch; > if (pch->vendor == PCI_VENDOR_ID_INTEL) { > unsigned short id; > + unsigned found = 1; > id = pch->device & INTEL_PCH_DEVICE_ID_MASK; > dev_priv->pch_id = id; > > @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) > dev_priv->num_pch_pll = 0; > DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > WARN_ON(!IS_HASWELL(dev)); > + } else { > + found = 0; > + } > + if (found) { > + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > + pci_dev_put(pch); > + break; > } > - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); > } > - pci_dev_put(pch); > + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); > + pci_dev_put(curr); > + } > + if (!pch) { > + DRM_DEBUG_KMS("No PCH found?\n"); > } > } > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ben Widawsky, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Fix intel_detect_pch() to work in xen environment. 2012-12-18 17:21 ` Ben Widawsky @ 2012-12-19 4:01 ` G.R. 0 siblings, 0 replies; 16+ messages in thread From: G.R. @ 2012-12-19 4:01 UTC (permalink / raw) To: Ben Widawsky Cc: intel-gfx, Dong, Eddie, Xu, Dongxiao, Zhang, Xiantao, Stefano Stabellini On Wed, Dec 19, 2012 at 1:21 AM, Ben Widawsky <ben@bwidawsk.net> wrote: > On Wed, 19 Dec 2012 00:49:28 +0800 > "G.R." <firemeteor@users.sourceforge.net> wrote: > >> Hi guys, >> >> In XEN HVM guest, there is always an emulated PIIX3 ISA bridge on slot 01.0. >> This shadows the PCH ISA bridge on 1f.0 with the current >> intel_detect_pch() implementation. >> The issue can be easily solved by looping through all the ISA bridges >> until the first match is found, instead of just check against the >> first one. >> >> Here I attach the patch I used locally. It's created on Torvalds's git. >> Looking forward to your comments. >> >> Thanks, >> Timothy > > Is this functionally equivalent to > http://lists.freedesktop.org/archives/intel-gfx/2012-July/019126.html? > I don't think so. The patch you mentioned tries to detect the VM. The info could be used enables any required workaround later. Jesse also expressed the same concern in his mail. The problem is that there is no standard way to detect a VM. The patch you mentioned should only work for XEN HVM config. My patch tries to correctly detect the PCH type in a IGD passthrough VM. This enables PCH specific code path in the driver. It really fixes some failure related to gaming / video play back with VAAPI etc in such a config. (But it's not a cure-all solution of course, since this is specific to linux driver. And there may still be other some xen specific issues to triage. For example, my linux box almost work great now, but win7 still keeping BSOD and I even have no idea how to debug) I think it is feasible to combine the two ideas together if you are willing to provide VM specific support in your driver. But as I mentioned before, the problem is we may still need to do it case by case... >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c >> index 530db83..3f7e5fb 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.c >> +++ b/drivers/gpu/drm/i915/i915_drv.c >> @@ -408,9 +408,11 @@ void intel_detect_pch(struct drm_device *dev) >> * underneath. This is a requirement from virtualization team. >> */ >> pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); >> - if (pch) { >> + while (pch) { >> + struct pci_dev * curr = pch; >> if (pch->vendor == PCI_VENDOR_ID_INTEL) { >> unsigned short id; >> + unsigned found = 1; >> id = pch->device & INTEL_PCH_DEVICE_ID_MASK; >> dev_priv->pch_id = id; >> >> @@ -440,10 +442,20 @@ void intel_detect_pch(struct drm_device *dev) >> dev_priv->num_pch_pll = 0; >> DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); >> WARN_ON(!IS_HASWELL(dev)); >> + } else { >> + found = 0; >> + } >> + if (found) { >> + BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> + pci_dev_put(pch); >> + break; >> } >> - BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); >> } >> - pci_dev_put(pch); >> + pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr); >> + pci_dev_put(curr); >> + } >> + if (!pch) { >> + DRM_DEBUG_KMS("No PCH found?\n"); >> } >> } >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Ben Widawsky, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-06-20 12:01 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-18 16:49 [PATCH] Fix intel_detect_pch() to work in xen environment G.R. 2012-12-18 16:53 ` Jesse Barnes 2012-12-18 17:43 ` G.R. 2012-12-18 18:20 ` Jesse Barnes 2012-12-19 3:40 ` G.R. 2012-12-20 4:04 ` G.R. 2012-12-20 16:13 ` Jesse Barnes 2012-12-23 6:51 ` G.R. 2013-06-18 12:54 ` G.R. 2013-06-19 6:01 ` Daniel Vetter 2013-06-19 13:10 ` [PATCH] Fix PCH detect with multiple ISA bridges in VM Rui Guo 2013-06-19 15:29 ` [PATCH] Fix intel_detect_pch() to work in xen environment G.R. 2013-06-20 12:01 ` Daniel Vetter 2013-06-19 7:57 ` Ville Syrjälä 2012-12-18 17:21 ` Ben Widawsky 2012-12-19 4:01 ` G.R.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).