From patchwork Fri Mar 5 17:14:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 393545 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp636445jai; Fri, 5 Mar 2021 09:54:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfPYxfDheFVdOnf9VuDaa+FDF95+v8tyYnv6fpwALmtkfrP2m9NZzVqPRZnS+geDHcPYgB X-Received: by 2002:a6b:7c4a:: with SMTP id b10mr6714059ioq.170.1614966869033; Fri, 05 Mar 2021 09:54:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614966869; cv=none; d=google.com; s=arc-20160816; b=BhG6wNgelPnhK/INgr5P3GUWo94l6Bm1AeNxi9bUl6EngJaCBGLhNJpCfZZBMIuoLC ZYO7UTnR+2FCVTNACx72UHFraEAGcH7TLKVLY+de+Ml8g8fQXoeazIHIsy3Zdpm4cmnh K8wwjlbWBtByxgTz44y8Vwt31tR0SLDZ/5A5seR+q/iR7B6Uj+CCxn6+313UJCGlgoqb 6TqaT5sXmJLKxUeMzrC+fkMBQ0MRTGOVxCd8zR+rE0+S8dG4eI0Q0aldrd8O5hWWhmGI sNaFon0UjcUAhoc7Ist5qoVDS93OKbepz0BJm82mxrdWkKDvY7/ZxEySuCJA35KZr+94 d2tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1YovYc2LIv645u50nIn6bkmgm6nXTMjECoAetz4WC4k=; b=BRYkHrfA5oR3ELIsJm6ZL6n37E1KdK0H35fc6a13Yo+N2mfDFQTCVQq/pzi2/zYdZP W8BJktHGvQJBpQgQjS4//AujI4+CECxJJmhH5uazK7YnyYaF0OkMyDW36GIR23CRgQTI u5/KA/9NGsdT5vM9h0lYS/8WfQ1OnQwbPGrfYieRXyz5YO4C9U6hjR+9g2m2kkfj6gei 7QJfbLNyj7qbvMn9UA8cms1bq3NQR/AYdF1qky6R6WaM2czP5uUGgyDLyZpq9ryG6rrR fVCqe79IdTd4Mv48mCH8VmYWFXGT2emubG94c21xcs/yZPELPRSSHKei/M2Jxu6OmmXD +TGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F7d29E4R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 190si2970914iow.71.2021.03.05.09.54.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 09:54:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F7d29E4R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIEei-0003XW-Fu for patch@linaro.org; Fri, 05 Mar 2021 12:54:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIE3T-00077D-2h for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:15:59 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIE33-0007Yn-Rd for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:15:58 -0500 Received: by mail-wm1-x330.google.com with SMTP id h7so2106506wmf.3 for ; Fri, 05 Mar 2021 09:15:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1YovYc2LIv645u50nIn6bkmgm6nXTMjECoAetz4WC4k=; b=F7d29E4RV5FcMvjMujP7jquhou2818LE1mRa1xPY2IzWJor9g1is5tArDrYYpMQ/vK jCIfCuZw/Ni8Ln8nnX8P02UnOC90zCYgdCBOtLJrfcwxwPTdDq/3S1rP7FI3MQVHtONJ 2IVcNqd1Am+ZbL1zXS6+QEmD+Le1cI3xivct3L1WVzr0fwmRSmyZ13JGmLfJ/EFmncSD Bfvc7ZdhLVkQDHzhcjRUX9z/euQFBpahXZSOZeMO7MW/T/KSqUUwzYrhL6dmbn6TuiO3 JrYa7strUk2ocpVyycyZnVPii6hi7W3L81qUJwlvzO5S2pSCxvYt78kEsAG56/D3qMGq IRbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1YovYc2LIv645u50nIn6bkmgm6nXTMjECoAetz4WC4k=; b=IWej22mxYe0JVshVA9/orKmptyo8gnkBP4fIxRdS3zUfE++brc2kOjVvw7Jn6Uhbks euDtRDGbvdROw/ZmgnxN0lDJstM2dtRCS3H8z8o+tkaASX5T0CVo5iVC+1gtcPvX/HLC 1pczdUQEb2LNdfrU8RQBUdpYmfipsS1ENmpZ0/CLDSy26ZPUDGrbI3IL6+8C44rJwYoG TAc9s5sebzZQPrVamzWE6EeDSBzIfni135VhgSFq2RWPiTPeEcZANU8pCl9nEAT++JMu QOKO5VSAXWcwwGeukDspk1o0R9Y6V5y9+zpSAeHcZxwUk5vTloZ8AKfStt+b9Xyeb1gO +l3g== X-Gm-Message-State: AOAM530sW0wBvRgSeRerBpIVcaPqglTDtB/ftENQN1vSzL5+OYtrJqvy PU9BBfsJWFN5Z+T2THnKT1tBL6EZw10WBw== X-Received: by 2002:a7b:cb01:: with SMTP id u1mr9968387wmj.149.1614964532616; Fri, 05 Mar 2021 09:15:32 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m132sm5942357wmf.45.2021.03.05.09.15.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:15:32 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/49] hw/display/omap_lcdc: Drop broken bigendian ifdef Date: Fri, 5 Mar 2021 17:14:47 +0000 Message-Id: <20210305171515.1038-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305171515.1038-1-peter.maydell@linaro.org> References: <20210305171515.1038-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The draw_line16_32() function in the omap_lcdc template header includes an ifdef for the case where HOST_WORDS_BIGENDIAN matches TARGET_WORDS_BIGENDIAN. This is trying to optimise for "source bitmap and destination bitmap format match", but it is broken, because in this function the formats don't match: the source is 16-bit colour and the destination is 32-bit colour, so a memcpy() will produce corrupted graphics output. Drop the bogus ifdef. This bug was introduced in commit ea644cf343129, when we dropped support for DEPTH values other than 32 from the template header. The old #if line was #if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) and this was mistakenly changed to #if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) rather than deleting the #if as now having an always-false condition. Fixes: ea644cf343129 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20210215103215.4944-7-peter.maydell@linaro.org --- hw/display/omap_lcd_template.h | 4 ---- 1 file changed, 4 deletions(-) -- 2.20.1 diff --git a/hw/display/omap_lcd_template.h b/hw/display/omap_lcd_template.h index c7c5025fb04..22e51d9bffb 100644 --- a/hw/display/omap_lcd_template.h +++ b/hw/display/omap_lcd_template.h @@ -139,9 +139,6 @@ static void draw_line12_32(void *opaque, uint8_t *d, const uint8_t *s, static void draw_line16_32(void *opaque, uint8_t *d, const uint8_t *s, int width, int deststep) { -#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) - memcpy(d, s, width * 2); -#else uint16_t v; uint8_t r, g, b; @@ -154,5 +151,4 @@ static void draw_line16_32(void *opaque, uint8_t *d, const uint8_t *s, s += 2; d += 4; } while (-- width != 0); -#endif }