| Message ID | 20190221003231.31625-1-alistair.francis@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/bochs: Fix the ID mismatch error | expand |
On Thu, Feb 21, 2019 at 12:33:03AM +0000, Alistair Francis wrote: > When running RISC-V QEMU with the Bochs device attached via PCIe the > probe of the Bochs device fails with: > [drm:bochs_hw_init] *ERROR* ID mismatch > > This was introduced by this commit: > 7780eb9ce8 bochs: convert to drm_dev_register > > To fix the error we ensure that pci_enable_device() is called before > bochs_load(). > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > Reported-by: David Abdurachmanov <david.abdurachmanov@gmail.com> Pushed to drm-misc-fixes. thanks, Gerd
On Thu, Feb 21, 2019 at 3:52 AM kraxel@redhat.com <kraxel@redhat.com> wrote: > > On Thu, Feb 21, 2019 at 12:33:03AM +0000, Alistair Francis wrote: > > When running RISC-V QEMU with the Bochs device attached via PCIe the > > probe of the Bochs device fails with: > > [drm:bochs_hw_init] *ERROR* ID mismatch > > > > This was introduced by this commit: > > 7780eb9ce8 bochs: convert to drm_dev_register > > > > To fix the error we ensure that pci_enable_device() is called before > > bochs_load(). > > > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > > Reported-by: David Abdurachmanov <david.abdurachmanov@gmail.com> > > Pushed to drm-misc-fixes. Thanks. Any chance this will make it into 5.0? Alistair > > thanks, > Gerd >
On Thu, Feb 21, 2019 at 10:44:06AM -0800, Alistair Francis wrote: > On Thu, Feb 21, 2019 at 3:52 AM kraxel@redhat.com <kraxel@redhat.com> wrote: > > > > On Thu, Feb 21, 2019 at 12:33:03AM +0000, Alistair Francis wrote: > > > When running RISC-V QEMU with the Bochs device attached via PCIe the > > > probe of the Bochs device fails with: > > > [drm:bochs_hw_init] *ERROR* ID mismatch > > > > > > This was introduced by this commit: > > > 7780eb9ce8 bochs: convert to drm_dev_register > > > > > > To fix the error we ensure that pci_enable_device() is called before > > > bochs_load(). > > > > > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > > > Reported-by: David Abdurachmanov <david.abdurachmanov@gmail.com> > > > > Pushed to drm-misc-fixes. > > Thanks. Any chance this will make it into 5.0? Hmm, we are damn close to the release, not sure there will be one more drm-fixes pull req. But I've added a proper Fixes: tag, so even if the patch misses the boat it should land in the stable branches shortly thereafter. cheers, Gerd
On Thu, Feb 21, 2019 at 9:37 PM kraxel@redhat.com <kraxel@redhat.com> wrote: > > On Thu, Feb 21, 2019 at 10:44:06AM -0800, Alistair Francis wrote: > > On Thu, Feb 21, 2019 at 3:52 AM kraxel@redhat.com <kraxel@redhat.com> wrote: > > > > > > On Thu, Feb 21, 2019 at 12:33:03AM +0000, Alistair Francis wrote: > > > > When running RISC-V QEMU with the Bochs device attached via PCIe the > > > > probe of the Bochs device fails with: > > > > [drm:bochs_hw_init] *ERROR* ID mismatch > > > > > > > > This was introduced by this commit: > > > > 7780eb9ce8 bochs: convert to drm_dev_register > > > > > > > > To fix the error we ensure that pci_enable_device() is called before > > > > bochs_load(). > > > > > > > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > > > > Reported-by: David Abdurachmanov <david.abdurachmanov@gmail.com> > > > > > > Pushed to drm-misc-fixes. > > > > Thanks. Any chance this will make it into 5.0? > > Hmm, we are damn close to the release, not sure there will be one more > drm-fixes pull req. But I've added a proper Fixes: tag, so even if the > patch misses the boat it should land in the stable branches shortly > thereafter. Landing in the stable branches is probably enough. If you do end up sending another pull request it would be great if this gets in. It would be nice to have this fixed in the official 5.0 tag. Alistair > > cheers, > Gerd >
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index f3dd66ae990a..aa35007262cd 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -154,6 +154,10 @@ static int bochs_pci_probe(struct pci_dev *pdev, if (IS_ERR(dev)) return PTR_ERR(dev); + ret = pci_enable_device(pdev); + if (ret) + goto err_free_dev; + dev->pdev = pdev; pci_set_drvdata(pdev, dev);
When running RISC-V QEMU with the Bochs device attached via PCIe the probe of the Bochs device fails with: [drm:bochs_hw_init] *ERROR* ID mismatch This was introduced by this commit: 7780eb9ce8 bochs: convert to drm_dev_register To fix the error we ensure that pci_enable_device() is called before bochs_load(). Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Reported-by: David Abdurachmanov <david.abdurachmanov@gmail.com> --- drivers/gpu/drm/bochs/bochs_drv.c | 4 ++++ 1 file changed, 4 insertions(+)