Commit 62aeaeaa authored by Daniel Vetter's avatar Daniel Vetter Committed by Thomas Zimmermann
Browse files

drm/aperture: Remove primary argument 



Only really pci devices have a business setting this - it's for
figuring out whether the legacy vga stuff should be nuked too. And
with the preceding two patches those are all using the pci version of
this.

Which means for all other callers primary == false and we can remove
it now.

v2:
- Reorder to avoid compile fail (Thomas)
- Include gma500, which retained it's called to the non-pci version.

v4:
- fix Daniel's S-o-b address

v5:
- add back an S-o-b tag with Daniel's Intel address

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Deepak Rawat <drawat.floss@gmail.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Emma Anholt <emma@anholt.net>
Cc: Helge Deller <deller@gmx.de>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-hyperv@vger.kernel.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-tegra@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230406132109.32050-4-tzimmermann@suse.de
parent db082219

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int hdlcd_drm_bind(struct device *dev) 
	 */

	if (hdlcd_read(hdlcd, HDLCD_REG_COMMAND)) {

		hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);

		drm_aperture_remove_framebuffers(false, &hdlcd_driver);

		drm_aperture_remove_framebuffers(&hdlcd_driver);

	}



	drm_mode_config_reset(drm);

drivers/gpu/drm/armada/armada_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int armada_drm_bind(struct device *dev) 
	}



	/* Remove early framebuffers */

	ret = drm_aperture_remove_framebuffers(false, &armada_drm_driver);

	ret = drm_aperture_remove_framebuffers(&armada_drm_driver);

	if (ret) {

		dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",

			__func__, ret);

drivers/gpu/drm/drm_aperture.c

+3 −8
Original line number Diff line number Diff line
@@ -32,17 +32,13 @@ 
 *

 *	static int remove_conflicting_framebuffers(struct pci_dev *pdev)

 *	{

 *		bool primary = false;

 *		resource_size_t base, size;

 *		int ret;

 *

 *		base = pci_resource_start(pdev, 0);

 *		size = pci_resource_len(pdev, 0);

 *	#ifdef CONFIG_X86

 *		primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;

 *	#endif

 *

 *		return drm_aperture_remove_conflicting_framebuffers(base, size, primary,

 *		return drm_aperture_remove_conflicting_framebuffers(base, size,

 *		                                                    &example_driver);

 *	}

 *
@@ -161,7 +157,6 @@ EXPORT_SYMBOL(devm_aperture_acquire_from_firmware); 
 * drm_aperture_remove_conflicting_framebuffers - remove existing framebuffers in the given range

 * @base: the aperture's base address in physical memory

 * @size: aperture size in bytes

 * @primary: also kick vga16fb if present

 * @req_driver: requesting DRM driver

 *

 * This function removes graphics device drivers which use the memory range described by
@@ -171,9 +166,9 @@ EXPORT_SYMBOL(devm_aperture_acquire_from_firmware); 
 * 0 on success, or a negative errno code otherwise

 */

int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,

						 bool primary, const struct drm_driver *req_driver)

						 const struct drm_driver *req_driver)

{

	return aperture_remove_conflicting_devices(base, size, primary, req_driver->name);

	return aperture_remove_conflicting_devices(base, size, false, req_driver->name);

}

EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);

drivers/gpu/drm/gma500/psb_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * TODO: Refactor psb_driver_load() to map vdc_reg earlier. Then we

	 *       might be able to read the framebuffer range from the device.

	 */

	ret = drm_aperture_remove_framebuffers(false, &driver);

	ret = drm_aperture_remove_framebuffers(&driver);

	if (ret)

		return ret;

drivers/gpu/drm/hyperv/hyperv_drm_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static int hyperv_setup_vram(struct hyperv_drm_device *hv, 


	drm_aperture_remove_conflicting_framebuffers(screen_info.lfb_base,

						     screen_info.lfb_size,

						     false,

						     &hyperv_driver);



	hv->fb_size = (unsigned long)hv->mmio_megabytes * 1024 * 1024;