mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-21 05:53:14 +00:00
140 lines
4.7 KiB
Diff
140 lines
4.7 KiB
Diff
From b2cd1b1c95adc11e78a8d688a196c2f7786c1682 Mon Sep 17 00:00:00 2001
|
|
From: Raptor Engineering Development Team <support@raptorengineering.com>
|
|
Date: Tue, 18 Feb 2020 16:24:55 -0600
|
|
Subject: [PATCH] drm/ast: Add option to initialize palette on driver load
|
|
|
|
Non-x86 systems, such as OpenPOWER and ARM machines, do not execute the ASPEED-
|
|
provided option ROM on system start. As a result, the VGA palette registers
|
|
remain uninitialized, leading to odd colors and generally hard to read output
|
|
on the VGA port.
|
|
|
|
Add a new module option, ast_resetpalette, to enable loading a linear greyscale
|
|
palette into the VGA RAMDAC. This option is intended for use by the first Linux
|
|
kernel to load after initial power on, such as the skiroot kernel on OpenPOWER
|
|
systems.
|
|
|
|
Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
|
|
---
|
|
drivers/gpu/drm/ast/ast_drv.c | 4 ++++
|
|
drivers/gpu/drm/ast/ast_drv.h | 14 ++++++++++++++
|
|
drivers/gpu/drm/ast/ast_main.c | 8 ++++++++
|
|
drivers/gpu/drm/ast/ast_mode.c | 14 --------------
|
|
4 files changed, 26 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
|
|
index 1f17794..0b9ffee 100644
|
|
--- a/drivers/gpu/drm/ast/ast_drv.c
|
|
+++ b/drivers/gpu/drm/ast/ast_drv.c
|
|
@@ -1,5 +1,6 @@
|
|
/*
|
|
* Copyright 2012 Red Hat Inc.
|
|
+ * Copyright 2018 - 2020 Raptor Engineering, LLC.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
@@ -39,9 +40,12 @@
|
|
#include "ast_drv.h"
|
|
|
|
int ast_modeset = -1;
|
|
+int ast_resetpalette = -1;
|
|
|
|
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
|
|
+MODULE_PARM_DESC(resetpalette, "Disable/Enable palette reset on load");
|
|
module_param_named(modeset, ast_modeset, int, 0400);
|
|
+module_param_named(resetpalette, ast_resetpalette, int, 0400);
|
|
|
|
#define PCI_VENDOR_ASPEED 0x1a03
|
|
|
|
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
|
|
index ff161bd..bd30b0a 100644
|
|
--- a/drivers/gpu/drm/ast/ast_drv.h
|
|
+++ b/drivers/gpu/drm/ast/ast_drv.h
|
|
@@ -283,6 +283,20 @@ struct ast_vbios_mode_info {
|
|
extern int ast_mode_init(struct drm_device *dev);
|
|
extern void ast_mode_fini(struct drm_device *dev);
|
|
|
|
+static inline void ast_load_palette_index(struct ast_private *ast,
|
|
+ u8 index, u8 red, u8 green,
|
|
+ u8 blue)
|
|
+{
|
|
+ ast_io_write8(ast, AST_IO_DAC_INDEX_WRITE, index);
|
|
+ ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
+ ast_io_write8(ast, AST_IO_DAC_DATA, red);
|
|
+ ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
+ ast_io_write8(ast, AST_IO_DAC_DATA, green);
|
|
+ ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
+ ast_io_write8(ast, AST_IO_DAC_DATA, blue);
|
|
+ ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
+}
|
|
+
|
|
#define AST_MM_ALIGN_SHIFT 4
|
|
#define AST_MM_ALIGN_MASK ((1 << AST_MM_ALIGN_SHIFT) - 1)
|
|
|
|
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
|
|
index 21715d6..8590118 100644
|
|
--- a/drivers/gpu/drm/ast/ast_main.c
|
|
+++ b/drivers/gpu/drm/ast/ast_main.c
|
|
@@ -1,5 +1,6 @@
|
|
/*
|
|
* Copyright 2012 Red Hat Inc.
|
|
+ * Copyright 2018 - 2020 Raptor Engineering, LLC.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
@@ -36,6 +37,8 @@
|
|
|
|
#include "ast_drv.h"
|
|
|
|
+extern int ast_resetpalette;
|
|
+
|
|
void ast_set_index_reg_mask(struct ast_private *ast,
|
|
uint32_t base, uint8_t index,
|
|
uint8_t mask, uint8_t val)
|
|
@@ -428,6 +431,7 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
|
|
struct ast_private *ast;
|
|
bool need_post;
|
|
int ret = 0;
|
|
+ int index = 0;
|
|
|
|
ast = kzalloc(sizeof(struct ast_private), GFP_KERNEL);
|
|
if (!ast)
|
|
@@ -510,6 +514,10 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
|
|
if (ret)
|
|
goto out_free;
|
|
|
|
+ if (ast_resetpalette == 1)
|
|
+ for (index = 0x00; index < 0x100; index++)
|
|
+ ast_load_palette_index(ast, index, index, index, index);
|
|
+
|
|
return 0;
|
|
out_free:
|
|
kfree(ast);
|
|
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
|
|
index b13eaa2..c8fa9f4 100644
|
|
--- a/drivers/gpu/drm/ast/ast_mode.c
|
|
+++ b/drivers/gpu/drm/ast/ast_mode.c
|
|
@@ -51,20 +51,6 @@ static int ast_cursor_set(struct drm_crtc *crtc,
|
|
static int ast_cursor_move(struct drm_crtc *crtc,
|
|
int x, int y);
|
|
|
|
-static inline void ast_load_palette_index(struct ast_private *ast,
|
|
- u8 index, u8 red, u8 green,
|
|
- u8 blue)
|
|
-{
|
|
- ast_io_write8(ast, AST_IO_DAC_INDEX_WRITE, index);
|
|
- ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
- ast_io_write8(ast, AST_IO_DAC_DATA, red);
|
|
- ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
- ast_io_write8(ast, AST_IO_DAC_DATA, green);
|
|
- ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
- ast_io_write8(ast, AST_IO_DAC_DATA, blue);
|
|
- ast_io_read8(ast, AST_IO_SEQ_PORT);
|
|
-}
|
|
-
|
|
static void ast_crtc_load_lut(struct drm_crtc *crtc)
|
|
{
|
|
struct ast_private *ast = crtc->dev->dev_private;
|
|
--
|
|
1.9.1
|
|
|