Commit cf41d18b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

arch/parisc: Implement fb_is_primary_device() under arch/parisc 



Move PARISC's implementation of fb_is_primary_device() into the
architecture directory. This the place of the declaration and
where other architectures implement this function. No functional
changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230417125651.25126-14-tzimmermann@suse.de
parent d77f0ecd

arch/parisc/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -119,6 +119,8 @@ export LIBGCC 




libs-y	+= arch/parisc/lib/ $(LIBGCC)

libs-y	+= arch/parisc/lib/ $(LIBGCC)





drivers-y += arch/parisc/video/



boot	:= arch/parisc/boot

boot	:= arch/parisc/boot





PALO := $(shell if (which palo 2>&1); then : ; \

PALO := $(shell if (which palo 2>&1); then : ; \

arch/parisc/include/asm/fb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 
	pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;

	pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;

}

}





#if defined(CONFIG_FB_STI)

#if defined(CONFIG_STI_CORE)

int fb_is_primary_device(struct fb_info *info);

int fb_is_primary_device(struct fb_info *info);

#else

#else

static inline int fb_is_primary_device(struct fb_info *info)

static inline int fb_is_primary_device(struct fb_info *info)

arch/parisc/video/Makefile

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_STI_CORE) += fbdev.o

arch/parisc/video/fbdev.c

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>

 * Copyright (C) 2001-2020 Helge Deller <deller@gmx.de>

 * Copyright (C) 2001-2002 Thomas Bogendoerfer <tsbogend@alpha.franken.de>

 */



#include <linux/module.h>



#include <asm/fb.h>



#include <video/sticore.h>



int fb_is_primary_device(struct fb_info *info)

{

	struct sti_struct *sti;



	sti = sti_get_rom(0);



	/* if no built-in graphics card found, allow any fb driver as default */

	if (!sti)

		return true;



	/* return true if it's the default built-in framebuffer driver */

	return (sti->info == info);

}

EXPORT_SYMBOL(fb_is_primary_device);

drivers/video/sticore.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <asm/pdc.h>

#include <asm/pdc.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/grfioctl.h>

#include <asm/grfioctl.h>

#include <asm/fb.h>





#include <video/sticore.h>

#include <video/sticore.h>
@@ -1148,24 +1147,6 @@ int sti_call(const struct sti_struct *sti, unsigned long func, 
	return ret;

	return ret;

}

}





#if defined(CONFIG_FB_STI)

/* check if given fb_info is the primary device */

int fb_is_primary_device(struct fb_info *info)

{

	struct sti_struct *sti;



	sti = sti_get_rom(0);



	/* if no built-in graphics card found, allow any fb driver as default */

	if (!sti)

		return true;



	/* return true if it's the default built-in framebuffer driver */

	return (sti->info == info);

}

EXPORT_SYMBOL(fb_is_primary_device);

#endif



MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer");

MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer");

MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");

MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");

MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");