Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87408eb1 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

vgacon: Set VGA struct resource types 




[ Upstream commit c82084117f79bcae085e40da526253736a247120 ]

Set the resource type when we reserve VGA-related I/O port resources.

The resource code doesn't actually look at the type, so it inserts
resources without a type in the tree correctly even without this change.
But if we ever print a resource without a type, it looks like this:

  vga+ [??? 0x000003c0-0x000003df flags 0x0]

Setting the type means it will be printed correctly as:

  vga+ [io  0x000003c0-0x000003df]

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eba1940e

arch/alpha/kernel/console.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
struct pci_controller *pci_vga_hose;

static struct resource alpha_vga = {

	.name	= "alpha-vga+",

	.flags	= IORESOURCE_IO,

	.start	= 0x3C0,

	.end	= 0x3DF

};

drivers/video/console/vgacon.c

+26 −8
Original line number Diff line number Diff line
@@ -405,7 +405,10 @@ static const char *vgacon_startup(void) 
		vga_video_port_val = VGA_CRT_DM;

		if ((screen_info.orig_video_ega_bx & 0xff) != 0x10) {

			static struct resource ega_console_resource =

			    { .name = "ega", .start = 0x3B0, .end = 0x3BF };

			    { .name	= "ega",

			      .flags	= IORESOURCE_IO,

			      .start	= 0x3B0,

			      .end	= 0x3BF };

			vga_video_type = VIDEO_TYPE_EGAM;

			vga_vram_size = 0x8000;

			display_desc = "EGA+";
@@ -413,9 +416,15 @@ static const char *vgacon_startup(void) 
					 &ega_console_resource);

		} else {

			static struct resource mda1_console_resource =

			    { .name = "mda", .start = 0x3B0, .end = 0x3BB };

			    { .name	= "mda",

			      .flags	= IORESOURCE_IO,

			      .start	= 0x3B0,

			      .end	= 0x3BB };

			static struct resource mda2_console_resource =

			    { .name = "mda", .start = 0x3BF, .end = 0x3BF };

			    { .name	= "mda",

			      .flags	= IORESOURCE_IO,

			      .start	= 0x3BF,

			      .end	= 0x3BF };

			vga_video_type = VIDEO_TYPE_MDA;

			vga_vram_size = 0x2000;

			display_desc = "*MDA";
@@ -437,15 +446,21 @@ static const char *vgacon_startup(void) 
			vga_vram_size = 0x8000;



			if (!screen_info.orig_video_isVGA) {

				static struct resource ega_console_resource

				    = { .name = "ega", .start = 0x3C0, .end = 0x3DF };

				static struct resource ega_console_resource =

				    { .name	= "ega",

				      .flags	= IORESOURCE_IO,

				      .start	= 0x3C0,

				      .end	= 0x3DF };

				vga_video_type = VIDEO_TYPE_EGAC;

				display_desc = "EGA";

				request_resource(&ioport_resource,

						 &ega_console_resource);

			} else {

				static struct resource vga_console_resource

				    = { .name = "vga+", .start = 0x3C0, .end = 0x3DF };

				static struct resource vga_console_resource =

				    { .name	= "vga+",

				      .flags	= IORESOURCE_IO,

				      .start	= 0x3C0,

				      .end	= 0x3DF };

				vga_video_type = VIDEO_TYPE_VGAC;

				display_desc = "VGA+";

				request_resource(&ioport_resource,
@@ -489,7 +504,10 @@ static const char *vgacon_startup(void) 
			}

		} else {

			static struct resource cga_console_resource =

			    { .name = "cga", .start = 0x3D4, .end = 0x3D5 };

			    { .name	= "cga",

			      .flags	= IORESOURCE_IO,

			      .start	= 0x3D4,

			      .end	= 0x3D5 };

			vga_video_type = VIDEO_TYPE_CGA;

			vga_vram_size = 0x2000;

			display_desc = "*CGA";