GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gfx: Move drivers/generic/gfx to drivers/gfx/generic 

This change creates gfx directory under drivers/ so that all drivers
handling gfx devices can be located in the same place. In follow-up
CLs, we will be adding another driver that handles gfx devices.

This change also updates the names used within the driver from
*generic_gfx* to *gfx_generic*. In addition to that, mainboard
drallion using this driver is updated to match the correct path and
Kconfig name.

TEST=Verified that drallion still builds.

Change-Id: I377743e0f6d770eed143c7b6041dab2a101e6252
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39047
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Mathew King <mathewk@chromium.org>
This commit is contained in:
Furquan Shaikh 2020-02-21 09:57:54 -08:00 committed by Patrick Georgi
parent 4684dc0c63
commit a0b0d42d69
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/generic/gfx/Makefile.inc
View File

@ -1 +0,0 @@
ramstage-$(CONFIG_DRIVERS_GENERIC_GFX) += gfx.c

2
src/drivers/generic/gfx/Kconfig → src/drivers/gfx/generic/Kconfig
View File

@ -1,4 +1,4 @@
config DRIVERS_GENERIC_GFX config DRIVERS_GFX_GENERIC
bool bool
default n default n
depends on HAVE_ACPI_TABLES depends on HAVE_ACPI_TABLES

1
src/drivers/gfx/generic/Makefile.inc Normal file
View File

@ -0,0 +1 @@
ramstage-$(CONFIG_DRIVERS_GFX_GENERIC) += generic.c

16
src/drivers/generic/gfx/chip.h → src/drivers/gfx/generic/chip.h
View File

@ -13,11 +13,11 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef __DRIVERS_GENERIC_GFX_CHIP_H__ #ifndef __DRIVERS_GFX_GENERIC_CHIP_H__
#define __DRIVERS_GENERIC_GFX_CHIP_H__ #define __DRIVERS_GFX_GENERIC_CHIP_H__
/* Config for electronic privacy screen */ /* Config for electronic privacy screen */
struct drivers_generic_gfx_privacy_screen_config { struct drivers_gfx_generic_privacy_screen_config {
/* Is privacy screen available on this graphics device */ /* Is privacy screen available on this graphics device */
int enabled; int enabled;
/* ACPI namespace path to privacy screen detection function */ /* ACPI namespace path to privacy screen detection function */
@ -31,17 +31,17 @@ struct drivers_generic_gfx_privacy_screen_config {
}; };
/* Config for an output device as defined in section A.5 of the ACPI spec */ /* Config for an output device as defined in section A.5 of the ACPI spec */
struct drivers_generic_gfx_device_config { struct drivers_gfx_generic_device_config {
/* ACPI device name of the output device */ /* ACPI device name of the output device */
const char *name; const char *name;
/* The address of the output device. See section A.3.2 */ /* The address of the output device. See section A.3.2 */
unsigned int addr; unsigned int addr;
/* Electronic privacy screen specific config */ /* Electronic privacy screen specific config */
struct drivers_generic_gfx_privacy_screen_config privacy; struct drivers_gfx_generic_privacy_screen_config privacy;
}; };
/* Config for an ACPI video device defined in Appendix A of the ACPI spec */ /* Config for an ACPI video device defined in Appendix A of the ACPI spec */
struct drivers_generic_gfx_config { struct drivers_gfx_generic_config {
/* /*
* ACPI device name of the graphics card, "GFX0" will be used if name is * ACPI device name of the graphics card, "GFX0" will be used if name is
* not set * not set
@ -50,7 +50,7 @@ struct drivers_generic_gfx_config {
/* The number of output devices defined */ /* The number of output devices defined */
int device_count; int device_count;
/* Config for output devices */ /* Config for output devices */
struct drivers_generic_gfx_device_config device[5]; struct drivers_gfx_generic_device_config device[5];
}; };
#endif /* __DRIVERS_GENERIC_GFX_CHIP_H__ */ #endif /* __DRIVERS_GFX_GENERIC_CHIP_H__ */

18
src/drivers/generic/gfx/gfx.c → src/drivers/gfx/generic/generic.c
View File

@ -26,7 +26,7 @@
static void privacy_screen_detect_cb(void *arg) static void privacy_screen_detect_cb(void *arg)
{ {
struct drivers_generic_gfx_privacy_screen_config *config = arg; struct drivers_gfx_generic_privacy_screen_config *config = arg;
acpigen_write_store(); acpigen_write_store();
acpigen_emit_namestring(config->detect_function); acpigen_emit_namestring(config->detect_function);
@ -37,20 +37,20 @@ static void privacy_screen_detect_cb(void *arg)
} }
static void privacy_screen_get_status_cb(void *arg) static void privacy_screen_get_status_cb(void *arg)
{ {
struct drivers_generic_gfx_privacy_screen_config *config = arg; struct drivers_gfx_generic_privacy_screen_config *config = arg;
acpigen_emit_byte(RETURN_OP); acpigen_emit_byte(RETURN_OP);
acpigen_emit_namestring(config->status_function); acpigen_emit_namestring(config->status_function);
} }
static void privacy_screen_enable_cb(void *arg) static void privacy_screen_enable_cb(void *arg)
{ {
struct drivers_generic_gfx_privacy_screen_config *config = arg; struct drivers_gfx_generic_privacy_screen_config *config = arg;
acpigen_emit_namestring(config->enable_function); acpigen_emit_namestring(config->enable_function);
} }
static void privacy_screen_disable_cb(void *arg) static void privacy_screen_disable_cb(void *arg)
{ {
struct drivers_generic_gfx_privacy_screen_config *config = arg; struct drivers_gfx_generic_privacy_screen_config *config = arg;
acpigen_emit_namestring(config->disable_function); acpigen_emit_namestring(config->disable_function);
} }
@ -65,7 +65,7 @@ static void (*privacy_screen_callbacks[])(void *) = {
static void gfx_fill_ssdt_generator(struct device *dev) static void gfx_fill_ssdt_generator(struct device *dev)
{ {
size_t i; size_t i;
struct drivers_generic_gfx_config *config = dev->chip_info; struct drivers_gfx_generic_config *config = dev->chip_info;
const char *scope = acpi_device_scope(dev); const char *scope = acpi_device_scope(dev);
@ -103,7 +103,7 @@ static void gfx_fill_ssdt_generator(struct device *dev)
static const char *gfx_acpi_name(const struct device *dev) static const char *gfx_acpi_name(const struct device *dev)
{ {
struct drivers_generic_gfx_config *config = dev->chip_info; struct drivers_gfx_generic_config *config = dev->chip_info;
return config->name ? : "GFX0"; return config->name ? : "GFX0";
} }
@ -115,7 +115,7 @@ static struct device_operations gfx_ops = {
static void gfx_enable(struct device *dev) static void gfx_enable(struct device *dev)
{ {
struct drivers_generic_gfx_config *config = dev->chip_info; struct drivers_gfx_generic_config *config = dev->chip_info;
if (!config) if (!config)
return; return;
@ -123,7 +123,7 @@ static void gfx_enable(struct device *dev)
dev->ops = &gfx_ops; dev->ops = &gfx_ops;
} }
struct chip_operations drivers_generic_gfx_ops = { struct chip_operations drivers_gfx_generic_ops = {
CHIP_NAME("Graphics Device") CHIP_NAME("Generic Graphics Device")
.enable_dev = gfx_enable .enable_dev = gfx_enable
}; };

2
src/mainboard/google/drallion/Kconfig
View File

@ -2,7 +2,7 @@
config BOARD_GOOGLE_BASEBOARD_DRALLION config BOARD_GOOGLE_BASEBOARD_DRALLION
def_bool n def_bool n
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_32768
select DRIVERS_GENERIC_GFX select DRIVERS_GFX_GENERIC
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_HID select DRIVERS_I2C_HID
select DRIVERS_INTEL_ISH select DRIVERS_INTEL_ISH

2
src/mainboard/google/drallion/variants/drallion/devicetree.cb
View File

@ -226,7 +226,7 @@ chip soc/intel/cannonlake
device domain 0 on device domain 0 on
device pci 00.0 on end # Host Bridge device pci 00.0 on end # Host Bridge
device pci 02.0 on device pci 02.0 on
chip drivers/generic/gfx chip drivers/gfx/generic
register "device_count" = "1" register "device_count" = "1"
register "device[0].name" = ""LCD"" register "device[0].name" = ""LCD""
# Address is set following the ACPI spec section A.3.2 # Address is set following the ACPI spec section A.3.2