From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: Void lookup limit of 2 exceeded) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 31D40222DDBF4 for ; Sun, 14 Jan 2018 19:40:58 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2018 19:46:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,361,1511856000"; d="scan'208";a="19601233" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.19]) by FMSMGA003.fm.intel.com with ESMTP; 14 Jan 2018 19:46:15 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Christian Ehrhardt , Star Zeng Date: Mon, 15 Jan 2018 11:46:11 +0800 Message-Id: <20180115034612.381104-3-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.1.windows.2 In-Reply-To: <20180115034612.381104-1-ruiyu.ni@intel.com> References: <20180115034612.381104-1-ruiyu.ni@intel.com> Subject: [PATCH 2/3] MdeModulePkg/FrameBufferBltLib: Fix a bug causing display corrupted X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jan 2018 03:40:58 -0000 The Graphics Output Protocol's mode information specifies the PixelsPerScanLine property. Most of the time this is identical to HorizontalResolution. However, due to alignment requirements etc. it may be slightly larger. I.e. each scan line will have some "pixels" that are not visible on the screen but consume space in the frame buffer. If the graphics output protocol correctly initializes HorizontalResolution to 1366 and PixelsPerScanLine to 1376. As a result the graphics output is broken. If setting HorizontalResolution to 1376 instead, the output is fine (except for 10 invisible pixels on the right of the screen). The patch fixes this bug by using PixelsPerScanLine when calculating the line width. Contributed-under: TianoCore Contribution Agreement 1.1 Reported-by: Christian Ehrhardt Signed-off-by: Christian Ehrhardt Signed-off-by: Ruiyu Ni Cc: Star Zeng Cc: Christian Ehrhardt --- .../Library/FrameBufferBltLib/FrameBufferBltLib.c | 46 ++++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c index 3078fe6254..c88469859b 100644 --- a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c +++ b/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c @@ -21,9 +21,9 @@ #include struct FRAME_BUFFER_CONFIGURE { - UINT32 WidthInBytes; + UINT32 PixelsPerScanLine; UINT32 BytesPerPixel; - UINT32 WidthInPixels; + UINT32 Width; UINT32 Height; UINT8 *FrameBuffer; EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; @@ -144,6 +144,10 @@ FrameBufferBltConfigure ( return RETURN_INVALID_PARAMETER; } + if (FrameBufferInfo->PixelsPerScanLine < FrameBufferInfo->HorizontalResolution) { + return RETURN_UNSUPPORTED; + } + FrameBufferBltLibConfigurePixelFormat (BitMask, &BytesPerPixel, PixelShl, PixelShr); if (*ConfigureSize < sizeof (FRAME_BUFFER_CONFIGURE) @@ -160,12 +164,12 @@ FrameBufferBltConfigure ( CopyMem (&Configure->PixelMasks, BitMask, sizeof (*BitMask)); CopyMem (Configure->PixelShl, PixelShl, sizeof (PixelShl)); CopyMem (Configure->PixelShr, PixelShr, sizeof (PixelShr)); - Configure->BytesPerPixel = BytesPerPixel; - Configure->PixelFormat = FrameBufferInfo->PixelFormat; - Configure->FrameBuffer = (UINT8*) FrameBuffer; - Configure->WidthInPixels = FrameBufferInfo->HorizontalResolution; - Configure->Height = FrameBufferInfo->VerticalResolution; - Configure->WidthInBytes = Configure->WidthInPixels * Configure->BytesPerPixel; + Configure->BytesPerPixel = BytesPerPixel; + Configure->PixelFormat = FrameBufferInfo->PixelFormat; + Configure->FrameBuffer = (UINT8*) FrameBuffer; + Configure->Width = FrameBufferInfo->HorizontalResolution; + Configure->Height = FrameBufferInfo->VerticalResolution; + Configure->PixelsPerScanLine = FrameBufferInfo->PixelsPerScanLine; return RETURN_SUCCESS; } @@ -215,7 +219,7 @@ FrameBufferBltLibVideoFill ( return RETURN_INVALID_PARAMETER; } - if (DestinationX + Width > Configure->WidthInPixels) { + if (DestinationX + Width > Configure->Width) { DEBUG ((EFI_D_VERBOSE, "VideoFill: Past screen (X)\n")); return RETURN_INVALID_PARAMETER; } @@ -268,9 +272,9 @@ FrameBufferBltLibVideoFill ( } } - if (UseWideFill && (DestinationX == 0) && (Width == Configure->WidthInPixels)) { + if (UseWideFill && (DestinationX == 0) && (Width == Configure->PixelsPerScanLine)) { DEBUG ((EFI_D_VERBOSE, "VideoFill (wide, one-shot)\n")); - Offset = DestinationY * Configure->WidthInPixels; + Offset = DestinationY * Configure->PixelsPerScanLine; Offset = Configure->BytesPerPixel * Offset; Destination = Configure->FrameBuffer + Offset; SizeInBytes = WidthInBytes * Height; @@ -284,7 +288,7 @@ FrameBufferBltLibVideoFill ( } else { LineBufferReady = FALSE; for (IndexY = DestinationY; IndexY < (Height + DestinationY); IndexY++) { - Offset = (IndexY * Configure->WidthInPixels) + DestinationX; + Offset = (IndexY * Configure->PixelsPerScanLine) + DestinationX; Offset = Configure->BytesPerPixel * Offset; Destination = Configure->FrameBuffer + Offset; @@ -368,7 +372,7 @@ FrameBufferBltLibVideoToBltBuffer ( return RETURN_INVALID_PARAMETER; } - if (SourceX + Width > Configure->WidthInPixels) { + if (SourceX + Width > Configure->Width) { return RETURN_INVALID_PARAMETER; } @@ -394,7 +398,7 @@ FrameBufferBltLibVideoToBltBuffer ( DstY < (Height + DestinationY); SrcY++, DstY++) { - Offset = (SrcY * Configure->WidthInPixels) + SourceX; + Offset = (SrcY * Configure->PixelsPerScanLine) + SourceX; Offset = Configure->BytesPerPixel * Offset; Source = Configure->FrameBuffer + Offset; @@ -476,7 +480,7 @@ FrameBufferBltLibBufferToVideo ( return RETURN_INVALID_PARAMETER; } - if (DestinationX + Width > Configure->WidthInPixels) { + if (DestinationX + Width > Configure->Width) { return RETURN_INVALID_PARAMETER; } @@ -499,7 +503,7 @@ FrameBufferBltLibBufferToVideo ( SrcY < (Height + SourceY); SrcY++, DstY++) { - Offset = (DstY * Configure->WidthInPixels) + DestinationX; + Offset = (DstY * Configure->PixelsPerScanLine) + DestinationX; Offset = Configure->BytesPerPixel * Offset; Destination = Configure->FrameBuffer + Offset; @@ -572,7 +576,7 @@ FrameBufferBltLibVideoToVideo ( return RETURN_INVALID_PARAMETER; } - if (SourceX + Width > Configure->WidthInPixels) { + if (SourceX + Width > Configure->Width) { return RETURN_INVALID_PARAMETER; } @@ -580,7 +584,7 @@ FrameBufferBltLibVideoToVideo ( return RETURN_INVALID_PARAMETER; } - if (DestinationX + Width > Configure->WidthInPixels) { + if (DestinationX + Width > Configure->Width) { return RETURN_INVALID_PARAMETER; } @@ -590,15 +594,15 @@ FrameBufferBltLibVideoToVideo ( WidthInBytes = Width * Configure->BytesPerPixel; - Offset = (SourceY * Configure->WidthInPixels) + SourceX; + Offset = (SourceY * Configure->PixelsPerScanLine) + SourceX; Offset = Configure->BytesPerPixel * Offset; Source = Configure->FrameBuffer + Offset; - Offset = (DestinationY * Configure->WidthInPixels) + DestinationX; + Offset = (DestinationY * Configure->PixelsPerScanLine) + DestinationX; Offset = Configure->BytesPerPixel * Offset; Destination = Configure->FrameBuffer + Offset; - LineStride = Configure->WidthInBytes; + LineStride = Configure->BytesPerPixel * Configure->PixelsPerScanLine; if (Destination > Source) { // // Copy from last line to avoid source is corrupted by copying -- 2.15.1.windows.2