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 at wdc.com>
Reported-by: David Abdurachmanov <david.abdurachmanov at gmail.com>
---
drivers/gpu/drm/bochs/bochs_drv.c | 4 ++++
1 file changed, 4 insertions(+)
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);
--
2.20.1
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 at wdc.com> > Reported-by: David Abdurachmanov <david.abdurachmanov at gmail.com>Pushed to drm-misc-fixes. thanks, Gerd
On Thu, Feb 21, 2019 at 3:52 AM kraxel at redhat.com <kraxel at 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 at wdc.com> > > Reported-by: David Abdurachmanov <david.abdurachmanov at gmail.com> > > Pushed to drm-misc-fixes.Thanks. Any chance this will make it into 5.0? Alistair> > thanks, > Gerd >