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

video: Move HP PARISC STI core code to shared location 



STI core files have been located in console and fbdev code. Move
the source code and header to the directories for video helpers.
Also update the config and build rules such that the code depends
on the config symbol CONFIG_STI_CORE, which STI console and STI
framebuffer select automatically.

Cleans up the console makefile and prepares PARISC to implement
fb_is_primary_device() within the arch/ directory. No functional
changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.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-12-tzimmermann@suse.de
parent 0d556f1f

drivers/video/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ config APERTURE_HELPERS 
	  Support tracking and hand-over of aperture ownership. Required

	  by graphics drivers for firmware-provided framebuffers.



config STI_CORE

	bool

	depends on PARISC

	help

	  STI refers to the HP "Standard Text Interface" which is a set of

	  BIOS routines contained in a ROM chip in HP PA-RISC based machines.



config VIDEO_CMDLINE

	bool

drivers/video/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_APERTURE_HELPERS)    += aperture.o

obj-$(CONFIG_STI_CORE)            += sticore.o

obj-$(CONFIG_VGASTATE)            += vgastate.o

obj-$(CONFIG_VIDEO_CMDLINE)       += cmdline.o

obj-$(CONFIG_VIDEO_NOMODESET)     += nomodeset.o

drivers/video/console/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config STI_CONSOLE 
	depends on PARISC && HAS_IOMEM

	select FONT_SUPPORT

	select CRC32

	select STI_CORE

	default y

	help

	  The STI console is the builtin display/keyboard on HP-PARISC

drivers/video/console/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 


obj-$(CONFIG_DUMMY_CONSOLE)       += dummycon.o

obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o

obj-$(CONFIG_STI_CONSOLE)         += sticon.o sticore.o

obj-$(CONFIG_STI_CONSOLE)         += sticon.o

obj-$(CONFIG_VGA_CONSOLE)         += vgacon.o

obj-$(CONFIG_MDA_CONSOLE)         += mdacon.o
 


obj-$(CONFIG_FB_STI)              += sticore.o

drivers/video/console/sticon.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


#include <asm/io.h>



#include "../fbdev/sticore.h"

#include <video/sticore.h>



/* switching to graphics mode */

#define BLANK 0