summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-04-13 14:27:20 -0700
committerMartin Roth <martinroth@google.com>2017-04-17 18:12:02 +0200
commit7b58319e9c320426f7dee202bf9201b6628bf958 (patch)
treeb3cf6dc883076ecfad1d6a4d1b0d2db4f0ca7916 /payloads/libpayload/drivers
parent1f8a28cbaea7bbebef4f4c626d1f0d094b76b151 (diff)
downloadcoreboot-7b58319e9c320426f7dee202bf9201b6628bf958.tar.xz
libpayload: cbgfx: Show square images on portrait displays
CBGFX currently doesn't support portrait screens at all. This will have to be fixed eventually but might take a bit of effort. As a first step to make devices with a portrait panel somewhat usable, this patch will just force a square canvas on these panels and keep the bottom part of the screen black. Also switch set_pixel to calculate framebuffer position via bytes_per_line instead of x_resolution. This is supposed to be the canonical way to do that and may differ in cases where the display controller requires a certain alignment from framebuffer lines. Change-Id: I47dd3bf95ab8a7d8b7e1913e0ddab346eedd46f1 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/19279 Tested-by: build bot (Jenkins) Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'payloads/libpayload/drivers')
-rw-r--r--payloads/libpayload/drivers/video/graphics.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/payloads/libpayload/drivers/video/graphics.c b/payloads/libpayload/drivers/video/graphics.c
index f1d916a18f..4a8792c151 100644
--- a/payloads/libpayload/drivers/video/graphics.c
+++ b/payloads/libpayload/drivers/video/graphics.c
@@ -125,9 +125,9 @@ static inline uint32_t calculate_color(const struct rgb_color *rgb)
static inline void set_pixel(struct vector *coord, uint32_t color)
{
const int bpp = fbinfo->bits_per_pixel;
+ const int bpl = fbinfo->bytes_per_line;
int i;
- uint8_t * const pixel = fbaddr + (coord->x +
- coord->y * fbinfo->x_resolution) * bpp / 8;
+ uint8_t * const pixel = fbaddr + coord->y * bpl + coord->x * bpp / 8;
for (i = 0; i < bpp / 8; i++)
pixel[i] = (color >> (i * 8));
}
@@ -156,8 +156,11 @@ static int cbgfx_init(void)
/* Calculate canvas size & offset, assuming the screen is landscape */
if (screen.size.height > screen.size.width) {
- LOG("Portrait screen not supported\n");
- return CBGFX_ERROR_PORTRAIT_SCREEN;
+ const int bpl = fbinfo->bytes_per_line;
+ LOG("Portrait screen not supported, forcing square image!\n");
+ memset(fbaddr + screen.size.width * bpl, 0,
+ (screen.size.height - screen.size.width) * bpl);
+ screen.size.height = screen.size.width;
}
canvas.size.height = screen.size.height;
canvas.size.width = canvas.size.height;