kevin/linux
1
Fork 0
Code

video: Move HP PARISC STI core code to shared location

Browse Source 
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: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230417125651.25126-12-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-04-17 14:56:43 +02:00
parent 0d556f1f0e
commit 7470849745
9 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/Kconfig
View File

@ -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

1
drivers/video/Makefile
View File

@ -1,6 +1,7 @@
# 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

1
drivers/video/console/Kconfig
View File

@ -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

4
drivers/video/console/Makefile
View File

@ -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

2
drivers/video/console/sticon.c
View File

@ -50,7 +50,7 @@
#include <asm/io.h>
#include "../fbdev/sticore.h"
#include <video/sticore.h>
/* switching to graphics mode */
#define BLANK 0

3
drivers/video/fbdev/Kconfig
View File

@ -551,10 +551,9 @@ config FB_STI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select STI_CORE
default y
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.
Enabling this option will implement the linux framebuffer device
using calls to the STI BIOS routines for initialisation.

2
drivers/video/fbdev/stifb.c
View File

@ -69,7 +69,7 @@
#include <asm/grfioctl.h> /* for HP-UX compatibility */
#include <linux/uaccess.h>
#include "sticore.h"
#include <video/sticore.h>
/* REGION_BASE(fb_info, index) returns the virtual address for region <index> */
#define REGION_BASE(fb_info, index) \

2
drivers/video/console/sticore.c → drivers/video/sticore.c
View File

@ -32,7 +32,7 @@
#include <asm/grfioctl.h>
#include <asm/fb.h>
#include "../fbdev/sticore.h"
#include <video/sticore.h>
#define STI_DRIVERVERSION "Version 0.9c"

0
drivers/video/fbdev/sticore.h → include/video/sticore.h
View File