Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44adece5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/fb-helper: Add a dummy remove_conflicting_framebuffers 



Lots of drivers don't properly compile without this when CONFIG_FB=n.
It's kinda a hack, but since CONFIG_FB doesn't stub any fucntions when
it's disabled I think it makes sense to add it to drm_fb_helper.h.

Long term we probably need to rethink all the logic to unload firmware
framebuffer drivers, at least if we want to be able to move away from
CONFIG_FB and fbcon.

v2: Unfortunately just stubbing out remove_conflicting_framebuffers in
drm_fb_helper.h upset gcc about static vs. non-static declarations, so
a new wrapper it needs to be. Means more churn :(

Cc: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: tomi.valkeinen@ti.com
Cc: dh.herrmann@gmail.com
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470847958-28465-2-git-send-email-daniel.vetter@ffwll.ch
parent e2416553

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int amdgpu_kick_out_firmware_fb(struct pci_dev *pdev) 
#ifdef CONFIG_X86

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

#endif

	remove_conflicting_framebuffers(ap, "amdgpudrmfb", primary);

	drm_fb_helper_remove_conflicting_framebuffers(ap, "amdgpudrmfb", primary);

	kfree(ap);



	return 0;

drivers/gpu/drm/bochs/bochs_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <drm/drm_fb_helper.h>



#include "bochs.h"
@@ -153,7 +154,7 @@ static int bochs_kick_out_firmware_fb(struct pci_dev *pdev) 


	ap->ranges[0].base = pci_resource_start(pdev, 0);

	ap->ranges[0].size = pci_resource_len(pdev, 0);

	remove_conflicting_framebuffers(ap, "bochsdrmfb", false);

	drm_fb_helper_remove_conflicting_framebuffers(ap, "bochsdrmfb", false);

	kfree(ap);



	return 0;

drivers/gpu/drm/cirrus/cirrus_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int cirrus_kick_out_firmware_fb(struct pci_dev *pdev) 
#ifdef CONFIG_X86

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

#endif

	remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);

	drm_fb_helper_remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);

	kfree(ap);



	return 0;

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 
	primary =

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



	ret = remove_conflicting_framebuffers(ap, "inteldrmfb", primary);

	ret = drm_fb_helper_remove_conflicting_framebuffers(ap, "inteldrmfb", primary);



	kfree(ap);

drivers/gpu/drm/mgag200/mgag200_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) 
#ifdef CONFIG_X86

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

#endif

	remove_conflicting_framebuffers(ap, "mgag200drmfb", primary);

	drm_fb_helper_remove_conflicting_framebuffers(ap, "mgag200drmfb", primary);

	kfree(ap);

}