Received: by 2002:a89:d88:0:b0:1fa:5c73:8e2d with SMTP id eb8csp610928lqb; Fri, 24 May 2024 08:05:23 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXs4jh/stbcSwy51I8exkNeM2040FLqhHohPeDv7IlPx9Il6q2e1KJ9Na60obPDFpTVtCL+bvCrGvg/ayL0p6to7MUuU1i2nnxFPw0NHg== X-Google-Smtp-Source: AGHT+IE61F8+wXjHq45yHU01QekwyM4xQZOmJ1nyP1kJXRT9Dnvsgrf0WHEunkzPeLVlMzjgJaHd X-Received: by 2002:a2e:b385:0:b0:2e6:be3c:9d4d with SMTP id 38308e7fff4ca-2e95b096b68mr22352231fa.12.1716563123164; Fri, 24 May 2024 08:05:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716563123; cv=pass; d=google.com; s=arc-20160816; b=PEqWa3LmGWt30kSoSTQhQjOfXjWRO5OZplzZzBt0RsP0Jvg6b2Na9OjcXWQ8kQqI4y /NzEYBIi8ZxFwNgtKCU4EWPFvr2/0lc0gS8xMtyXSmT7mB3BZIpZwuTN4dn6qLOThUaZ CB4NKVyFV/wK863kTDAcVmeYPaixF/HEGMLUbBNzGqhIWmnhB4aGyZ9BtMPGmB7vIRyv 1weiU/dsyX4ZcsnjIWQ3NmgTfH6ZoG06VmEGN71xZbNmm5blZriaWYsyq4bsrfYobjDO 4uY7hZZhpVBsuYfWWrufdwXOzdzsvj0wvnMZuUbjmAneRP3Zmsnn1e2uYaHEpcnXWZZ7 FpgQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature:dkim-filter; bh=f1k1hDmw66DJaeViB0/rUpPvjFxDh3qw/IrEdAXHUpQ=; fh=2c/4t6GEL1kmnSrKxcIq47N+hfxcx/iq9f7IbjystKE=; b=QRqamD61mowj+4OnuRCH7MXAQI7KVjuJ2WSyYWrLO7wES0yI9jlu7oxtMurhAxscVL 3s8F1jYTbT9Pzfs7/IK6D4I99TEHfBklhaUBrMUNoJZHPalzXBGLds6sQx+xmI1stDDY JbGZhlKOI5j/HBsGv8HgwCYR8zRbri5u5dnQmYhhVfFiJv6LQqapoGhVgcS82BDwX2DZ JumpiLAUms806aRr51UiUYkBKZYMjR5jIe0omgGF0Rc9Kz4fRVxpp/5SfSmKRJKMbgVb EsbrmmLlz89tEbHhZ6v5+qPoX4zCTzoPHubUnXieDnkWiwD/6vHlXl/nvmazdpFzqaL5 UHIg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@classfun.cn header.s=default header.b=BG3SH4f9; arc=pass (i=1 spf=pass spfdomain=classfun.cn dkim=pass dkdomain=classfun.cn dmarc=pass fromdomain=classfun.cn); spf=pass (google.com: domain of linux-kernel+bounces-188824-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-188824-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=classfun.cn Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a640c23a62f3a-a626cd9594csi89624666b.867.2024.05.24.08.05.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 08:05:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-188824-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@classfun.cn header.s=default header.b=BG3SH4f9; arc=pass (i=1 spf=pass spfdomain=classfun.cn dkim=pass dkdomain=classfun.cn dmarc=pass fromdomain=classfun.cn); spf=pass (google.com: domain of linux-kernel+bounces-188824-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-188824-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=classfun.cn Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id D6D7B1F21D28 for ; Fri, 24 May 2024 15:05:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 74AB012CDBE; Fri, 24 May 2024 15:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=classfun.cn header.i=@classfun.cn header.b="BG3SH4f9" Received: from classfun.cn (unknown [129.204.178.38]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7629948CCC; Fri, 24 May 2024 15:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=129.204.178.38 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563114; cv=none; b=sCWoagOq3UbBnpuF+DjUxlxOMgXlmT1BubQvoB0VGMZLvGD8uuAJrcKvwmW10ftxdcB2SgXgoaAGYPvRcjjAj9yBJzJWOyZVyiA2OvujSVx8EFYdxuf+cD8dbA/Y66pF5y4i3IzrXAAc8heXzUJjv+6MAEJLhabuxKEbzQnGPl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563114; c=relaxed/simple; bh=W2qwYe5lYoI206gE8u1Jt6VhgkTCXZUz+nZbdVJdKmY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ajB1Q3+1eEkTFAr4fATrSQioslc5laiMo5nsZiE2GOXWPHplAAP0c3uY4jI/gljMOqmSUcMVJZBfCaA4J2GngEYJOaOqcnMKaODx7cNYB2TSwLVC7HBpuzc9El1iC/0WWB1H/pz8orJrQIgUWiF7s2JLiiZis2aBJFWtRywM81g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=classfun.cn; spf=pass smtp.mailfrom=classfun.cn; dkim=pass (1024-bit key) header.d=classfun.cn header.i=@classfun.cn header.b=BG3SH4f9; arc=none smtp.client-ip=129.204.178.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=classfun.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=classfun.cn Received: from bigfoot-server-arm-node1.classfun.cn (unknown [124.72.161.66]) (Authenticated sender: bigfoot) by classfun.cn (Postfix) with ESMTPSA id 2C6E27884E; Fri, 24 May 2024 23:03:01 +0800 (CST) DKIM-Filter: OpenDKIM Filter v2.11.0 classfun.cn 2C6E27884E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=classfun.cn; s=default; t=1716562985; bh=f1k1hDmw66DJaeViB0/rUpPvjFxDh3qw/IrEdAXHUpQ=; h=From:To:Cc:Subject:Date:From; b=BG3SH4f9nod7nbps+0gOGya81zfuxAOL8ao1HwcTA9DCjBnz5O1R0ZRrqOw6kcgLQ BOnIZpETXOt4bDdqHXFElXuPNHbS8e5os6VgThwLlghfQCY+BoPDx5UIw1bZcMsFYf FZWm56Lc74R/rgWJd5HFJukCuYufoW28FdyNbjjU= From: Junhao Xie To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Konrad Dybcio , Ryan McCann , Neil Armstrong , Jonathan Marek Cc: Junhao Xie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/msm/dpu: drop duplicate drm formats from wb2_formats arrays Date: Fri, 24 May 2024 23:01:12 +0800 Message-ID: <20240524150128.1878297-2-bigfoot@classfun.cn> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit There are duplicate items in wb2_formats_rgb and wb2_formats_rgb_yuv, which cause weston assertions failed. weston: libweston/drm-formats.c:131: weston_drm_format_array_add_format: Assertion `!weston_drm_format_array_find_format(formats, format)' failed. Signed-off-by: Junhao Xie --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 47fd8baf53e6..3138e73c04f1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -216,12 +216,9 @@ static const u32 wb2_formats_rgb[] = { DRM_FORMAT_RGBA4444, DRM_FORMAT_RGBX4444, DRM_FORMAT_XRGB4444, - DRM_FORMAT_BGR565, DRM_FORMAT_BGR888, - DRM_FORMAT_ABGR8888, DRM_FORMAT_BGRA8888, DRM_FORMAT_BGRX8888, - DRM_FORMAT_XBGR8888, DRM_FORMAT_ABGR1555, DRM_FORMAT_BGRA5551, DRM_FORMAT_XBGR1555, @@ -250,12 +247,9 @@ static const u32 wb2_formats_rgb_yuv[] = { DRM_FORMAT_RGBA4444, DRM_FORMAT_RGBX4444, DRM_FORMAT_XRGB4444, - DRM_FORMAT_BGR565, DRM_FORMAT_BGR888, - DRM_FORMAT_ABGR8888, DRM_FORMAT_BGRA8888, DRM_FORMAT_BGRX8888, - DRM_FORMAT_XBGR8888, DRM_FORMAT_ABGR1555, DRM_FORMAT_BGRA5551, DRM_FORMAT_XBGR1555, -- 2.44.0