android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "parisc/stifb: Keep track of hardware path of graphics card"

Browse Source 
This reverts commit 860e44f21f which is
commit b046f984814af7985f444150ec28716d42d00d9a upstream.

It breaks the Android kernel ABI and is not needed for Android devices,
so it is safe to revert for now.  If it is determined that it is needed
in the future, it can be brought back in an abi-preserving way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iecee4bbc7165e712da3b7683697a6bd29daae1f8
This commit is contained in:
Greg Kroah-Hartman 2022-07-28 10:32:51 +02:00
parent 26e506a63e
commit 8324f66c71
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,6 @@
#include <linux/slab.h>
#include <linux/font.h>
#include <linux/crc32.h>
#include <linux/fb.h>
#include <asm/io.h>
@ -393,9 +392,7 @@ static int __init sticonsole_init(void)
for (i = 0; i < MAX_NR_CONSOLES; i++)
font_data[i] = STI_DEF_FONT;
pr_info("sticon: Initializing STI text console on %s at [%s]\n",
sticon_sti->sti_data->inq_outptr.dev_name,
sticon_sti->pa_path);
pr_info("sticon: Initializing STI text console.\n");
console_lock();
err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1,
PAGE0->mem_cons.cl_class != CL_DUPLEX);

15
drivers/video/console/sticore.c
View File

@ -34,7 +34,7 @@
#include "../fbdev/sticore.h"
#define STI_DRIVERVERSION "Version 0.9c"
#define STI_DRIVERVERSION "Version 0.9b"
static struct sti_struct *default_sti __read_mostly;
@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
if (!fbfont)
return NULL;
pr_info(" using %ux%u framebuffer font %s\n",
pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
fbfont->width, fbfont->height, fbfont->name);
bpc = ((fbfont->width+7)/8) * fbfont->height;
@ -947,7 +947,6 @@ static struct sti_struct *sti_try_rom_generic(unsigned long address,
static void sticore_check_for_default_sti(struct sti_struct *sti, char *path)
{
pr_info(" located at [%s]\n", sti->pa_path);
if (strcmp (path, default_sti_path) == 0)
default_sti = sti;
}
@ -959,6 +958,7 @@ static void sticore_check_for_default_sti(struct sti_struct *sti, char *path)
*/
static int __init sticore_pa_init(struct parisc_device *dev)
{
char pa_path[21];
struct sti_struct *sti = NULL;
int hpa = dev->hpa.start;
@ -971,8 +971,8 @@ static int __init sticore_pa_init(struct parisc_device *dev)
if (!sti)
return 1;
print_pa_hwpath(dev, sti->pa_path);
sticore_check_for_default_sti(sti, sti->pa_path);
print_pa_hwpath(dev, pa_path);
sticore_check_for_default_sti(sti, pa_path);
return 0;
}
@ -1008,8 +1008,9 @@ static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent)
sti = sti_try_rom_generic(rom_base, fb_base, pd);
if (sti) {
print_pci_hwpath(pd, sti->pa_path);
sticore_check_for_default_sti(sti, sti->pa_path);
char pa_path[30];
print_pci_hwpath(pd, pa_path);
sticore_check_for_default_sti(sti, pa_path);
}
if (!sti) {

3
drivers/video/fbdev/sticore.h
View File

@ -370,9 +370,6 @@ struct sti_struct {
/* pointer to all internal data */
struct sti_all_data *sti_data;
/* pa_path of this device */
char pa_path[24];
};