lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 005/879] parisc/stifb: Keep track of hardware path of graphics card
    Date
    From: Helge Deller <deller@gmx.de>

    commit b046f984814af7985f444150ec28716d42d00d9a upstream.

    Keep the pa_path (hardware path) of the graphics card in sti_struct and use
    this info to give more useful info which card is currently being used.

    Signed-off-by: Helge Deller <deller@gmx.de>
    Cc: stable@vger.kernel.org # v5.10+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/video/console/sticon.c | 5 ++++-
    drivers/video/console/sticore.c | 15 +++++++--------
    drivers/video/fbdev/sticore.h | 3 +++
    3 files changed, 14 insertions(+), 9 deletions(-)

    --- a/drivers/video/console/sticon.c
    +++ b/drivers/video/console/sticon.c
    @@ -46,6 +46,7 @@
    #include <linux/slab.h>
    #include <linux/font.h>
    #include <linux/crc32.h>
    +#include <linux/fb.h>

    #include <asm/io.h>

    @@ -392,7 +393,9 @@ 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.\n");
    + pr_info("sticon: Initializing STI text console on %s at [%s]\n",
    + sticon_sti->sti_data->inq_outptr.dev_name,
    + sticon_sti->pa_path);
    console_lock();
    err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1,
    PAGE0->mem_cons.cl_class != CL_DUPLEX);
    --- a/drivers/video/console/sticore.c
    +++ b/drivers/video/console/sticore.c
    @@ -34,7 +34,7 @@

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

    -#define STI_DRIVERVERSION "Version 0.9b"
    +#define STI_DRIVERVERSION "Version 0.9c"

    static struct sti_struct *default_sti __read_mostly;

    @@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom
    if (!fbfont)
    return NULL;

    - pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
    + pr_info(" using %ux%u framebuffer font %s\n",
    fbfont->width, fbfont->height, fbfont->name);

    bpc = ((fbfont->width+7)/8) * fbfont->height;
    @@ -947,6 +947,7 @@ out_err:

    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;
    }
    @@ -958,7 +959,6 @@ static void sticore_check_for_default_st
    */
    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
    if (!sti)
    return 1;

    - print_pa_hwpath(dev, pa_path);
    - sticore_check_for_default_sti(sti, pa_path);
    + print_pa_hwpath(dev, sti->pa_path);
    + sticore_check_for_default_sti(sti, sti->pa_path);
    return 0;
    }

    @@ -1008,9 +1008,8 @@ static int sticore_pci_init(struct pci_d

    sti = sti_try_rom_generic(rom_base, fb_base, pd);
    if (sti) {
    - char pa_path[30];
    - print_pci_hwpath(pd, pa_path);
    - sticore_check_for_default_sti(sti, pa_path);
    + print_pci_hwpath(pd, sti->pa_path);
    + sticore_check_for_default_sti(sti, sti->pa_path);
    }

    if (!sti) {
    --- a/drivers/video/fbdev/sticore.h
    +++ b/drivers/video/fbdev/sticore.h
    @@ -370,6 +370,9 @@ struct sti_struct {

    /* pointer to all internal data */
    struct sti_all_data *sti_data;
    +
    + /* pa_path of this device */
    + char pa_path[24];
    };



    \
     
     \ /
      Last update: 2022-06-07 23:59    [W:2.400 / U:1.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site