| Message ID | 20241017125145.34729-2-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/bochs: Replace deprecated PCI implicit devres | expand |
On Thu, 2024-10-17 at 14:51 +0200, Philipp Stanner wrote: > bochs uses pcim_enable_device(), which causes pci_request_region() to > implicitly set up devres callbacks which will release the region on > driver detach. Despite this, the driver calls pci_release_regions() > manually on driver teardown. > > Implicit devres has been deprecated in PCI in commit 81fcf28e74a3 > ("PCI: > Document hybrid devres hazards"). > > Replace the calls to pci_request_region() with ones to always-managed > pcim_request_region(). Remove the unnecessary call to > pci_release_regions(). Just saw that this patch is still floating around. Anyone feeling responsible for bochs who could review this? P. > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > --- > drivers/gpu/drm/tiny/bochs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/tiny/bochs.c > b/drivers/gpu/drm/tiny/bochs.c > index 31fc5d839e10..888f12a67470 100644 > --- a/drivers/gpu/drm/tiny/bochs.c > +++ b/drivers/gpu/drm/tiny/bochs.c > @@ -217,7 +217,7 @@ static int bochs_hw_init(struct drm_device *dev) > > if (pdev->resource[2].flags & IORESOURCE_MEM) { > /* mmio bar with vga and bochs registers present */ > - if (pci_request_region(pdev, 2, "bochs-drm") != 0) { > + if (pcim_request_region(pdev, 2, "bochs-drm") != 0) > { > DRM_ERROR("Cannot request mmio region\n"); > return -EBUSY; > } > @@ -258,7 +258,7 @@ static int bochs_hw_init(struct drm_device *dev) > size = min(size, mem); > } > > - if (pci_request_region(pdev, 0, "bochs-drm") != 0) > + if (pcim_request_region(pdev, 0, "bochs-drm") != 0) > DRM_WARN("Cannot request framebuffer, boot fb still > active?\n"); > > bochs->fb_map = ioremap(addr, size); > @@ -302,7 +302,7 @@ static void bochs_hw_fini(struct drm_device *dev) > release_region(VBE_DISPI_IOPORT_INDEX, 2); > if (bochs->fb_map) > iounmap(bochs->fb_map); > - pci_release_regions(to_pci_dev(dev->dev)); > + > drm_edid_free(bochs->drm_edid); > } >
Hi Am 20.11.24 um 15:30 schrieb Philipp Stanner: > On Thu, 2024-10-17 at 14:51 +0200, Philipp Stanner wrote: >> bochs uses pcim_enable_device(), which causes pci_request_region() to >> implicitly set up devres callbacks which will release the region on >> driver detach. Despite this, the driver calls pci_release_regions() >> manually on driver teardown. >> >> Implicit devres has been deprecated in PCI in commit 81fcf28e74a3 >> ("PCI: >> Document hybrid devres hazards"). >> >> Replace the calls to pci_request_region() with ones to always-managed >> pcim_request_region(). Remove the unnecessary call to >> pci_release_regions(). > Just saw that this patch is still floating around. Anyone feeling > responsible for bochs who could review this? It looks like this patch is already outdated. There's been https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/58e980c16815ce4ff8a5e036a126358afceca538 in drm-misc-next for some time. Best regards Thomas > > > P. > > >> Signed-off-by: Philipp Stanner <pstanner@redhat.com> >> --- >> drivers/gpu/drm/tiny/bochs.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/tiny/bochs.c >> b/drivers/gpu/drm/tiny/bochs.c >> index 31fc5d839e10..888f12a67470 100644 >> --- a/drivers/gpu/drm/tiny/bochs.c >> +++ b/drivers/gpu/drm/tiny/bochs.c >> @@ -217,7 +217,7 @@ static int bochs_hw_init(struct drm_device *dev) >> >> if (pdev->resource[2].flags & IORESOURCE_MEM) { >> /* mmio bar with vga and bochs registers present */ >> - if (pci_request_region(pdev, 2, "bochs-drm") != 0) { >> + if (pcim_request_region(pdev, 2, "bochs-drm") != 0) >> { >> DRM_ERROR("Cannot request mmio region\n"); >> return -EBUSY; >> } >> @@ -258,7 +258,7 @@ static int bochs_hw_init(struct drm_device *dev) >> size = min(size, mem); >> } >> >> - if (pci_request_region(pdev, 0, "bochs-drm") != 0) >> + if (pcim_request_region(pdev, 0, "bochs-drm") != 0) >> DRM_WARN("Cannot request framebuffer, boot fb still >> active?\n"); >> >> bochs->fb_map = ioremap(addr, size); >> @@ -302,7 +302,7 @@ static void bochs_hw_fini(struct drm_device *dev) >> release_region(VBE_DISPI_IOPORT_INDEX, 2); >> if (bochs->fb_map) >> iounmap(bochs->fb_map); >> - pci_release_regions(to_pci_dev(dev->dev)); >> + >> drm_edid_free(bochs->drm_edid); >> } >>
diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 31fc5d839e10..888f12a67470 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -217,7 +217,7 @@ static int bochs_hw_init(struct drm_device *dev) if (pdev->resource[2].flags & IORESOURCE_MEM) { /* mmio bar with vga and bochs registers present */ - if (pci_request_region(pdev, 2, "bochs-drm") != 0) { + if (pcim_request_region(pdev, 2, "bochs-drm") != 0) { DRM_ERROR("Cannot request mmio region\n"); return -EBUSY; } @@ -258,7 +258,7 @@ static int bochs_hw_init(struct drm_device *dev) size = min(size, mem); } - if (pci_request_region(pdev, 0, "bochs-drm") != 0) + if (pcim_request_region(pdev, 0, "bochs-drm") != 0) DRM_WARN("Cannot request framebuffer, boot fb still active?\n"); bochs->fb_map = ioremap(addr, size); @@ -302,7 +302,7 @@ static void bochs_hw_fini(struct drm_device *dev) release_region(VBE_DISPI_IOPORT_INDEX, 2); if (bochs->fb_map) iounmap(bochs->fb_map); - pci_release_regions(to_pci_dev(dev->dev)); + drm_edid_free(bochs->drm_edid); }
bochs uses pcim_enable_device(), which causes pci_request_region() to implicitly set up devres callbacks which will release the region on driver detach. Despite this, the driver calls pci_release_regions() manually on driver teardown. Implicit devres has been deprecated in PCI in commit 81fcf28e74a3 ("PCI: Document hybrid devres hazards"). Replace the calls to pci_request_region() with ones to always-managed pcim_request_region(). Remove the unnecessary call to pci_release_regions(). Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/gpu/drm/tiny/bochs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)