aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2018-09-01 10:08:46 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-09-03 12:17:06 -0400
commit77d1ed41c0c1eb2a19b5a6b1c99059ffb92da36e (patch)
tree47b7ccaef1c131d024f6674301280ba14d80572a
parent256ee417525a19ace2680a1f699c8656c0d907d5 (diff)
drm/bochs: use simpler remove_conflicting_pci_framebuffers()
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/b5fce8eba7472e5ba8e18c2624938be6c5aa6ebb.1535810304.git.mirq-linux@rere.qmqm.pl Link: https://patchwork.freedesktop.org/patch/msgid/a9a4691b6eea789664edd6b85a85b7990953a222.1535810304.git.mirq-linux@rere.qmqm.pl
-rw-r--r--drivers/gpu/drm/bochs/bochs_drv.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index 7b20318483e4..c61b40c72b62 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -143,22 +143,6 @@ static const struct dev_pm_ops bochs_pm_ops = {
143/* ---------------------------------------------------------------------- */ 143/* ---------------------------------------------------------------------- */
144/* pci interface */ 144/* pci interface */
145 145
146static int bochs_kick_out_firmware_fb(struct pci_dev *pdev)
147{
148 struct apertures_struct *ap;
149
150 ap = alloc_apertures(1);
151 if (!ap)
152 return -ENOMEM;
153
154 ap->ranges[0].base = pci_resource_start(pdev, 0);
155 ap->ranges[0].size = pci_resource_len(pdev, 0);
156 drm_fb_helper_remove_conflicting_framebuffers(ap, "bochsdrmfb", false);
157 kfree(ap);
158
159 return 0;
160}
161
162static int bochs_pci_probe(struct pci_dev *pdev, 146static int bochs_pci_probe(struct pci_dev *pdev,
163 const struct pci_device_id *ent) 147 const struct pci_device_id *ent)
164{ 148{
@@ -171,7 +155,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
171 return -ENOMEM; 155 return -ENOMEM;
172 } 156 }
173 157
174 ret = bochs_kick_out_firmware_fb(pdev); 158 ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "bochsdrmfb");
175 if (ret) 159 if (ret)
176 return ret; 160 return ret;
177 161