From cba3a125e1b7af015a736d44ab84a36129ee6890 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Sat, 23 May 2015 13:37:04 +0100 Subject: arm: Workaround incorrect HDLCD register order in kernel Some versions of the kernel incorrectly swap the red and blue color select registers. This changeset adds a workaround for that by swapping them when instantiating a PixelConverter. --- src/dev/arm/hdlcd.cc | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'src/dev/arm/hdlcd.cc') diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc index b1c1c450b..3fc30f16d 100644 --- a/src/dev/arm/hdlcd.cc +++ b/src/dev/arm/hdlcd.cc @@ -74,7 +74,8 @@ HDLcd::HDLcd(const Params *p) fillPixelBufferEvent(this), intEvent(this), dmaDoneEventAll(MAX_OUTSTANDING_DMA_REQ_CAPACITY, this), dmaDoneEventFree(MAX_OUTSTANDING_DMA_REQ_CAPACITY), - enableCapture(p->enable_capture) + enableCapture(p->enable_capture), + workaround_swap_rb(p->workaround_swap_rb) { pioSize = 0xFFFF; @@ -504,11 +505,24 @@ HDLcd::renderPixel() PixelConverter HDLcd::pixelConverter() const { - return PixelConverter( - bytesPerPixel(), - red_select.offset, green_select.offset, blue_select.offset, - red_select.size, green_select.size, blue_select.size, + ByteOrder byte_order( pixel_format.big_endian ? BigEndianByteOrder : LittleEndianByteOrder); + + /* Some Linux kernels have a broken driver that swaps the red and + * blue color select registers. */ + if (!workaround_swap_rb) { + return PixelConverter( + bytesPerPixel(), + red_select.offset, green_select.offset, blue_select.offset, + red_select.size, green_select.size, blue_select.size, + byte_order); + } else { + return PixelConverter( + bytesPerPixel(), + blue_select.offset, green_select.offset, red_select.offset, + blue_select.size, green_select.size, red_select.size, + byte_order); + } } void -- cgit v1.2.3