From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10222145FFC; Tue, 23 Apr 2024 21:44:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908655; cv=none; b=ThSwl160nb1EkgWncAIA+UwZ8WKL7bo0oXEF1Vuh6bXwbofxYWOb8pQo+HQIUAVV+PI4MPzgQht143vz5mlv3RIQ/+4EsOGiF78+vMmtIs3L4msHd4OMA4FsLJSgb8gQ+zJsKWTjn5QmkipVUJeVb08NV8hJnACMcaw7PiiC0R4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908655; c=relaxed/simple; bh=1Wh6xDdr5nRnacWW6kTtC5AQgTimLV3tc1qnKw456Bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kNVYpzQMz0nKgIdUg7WnBTxLoUfLsPgAsYp29H7C5qheoSW2bBTnQ0i14BAeuMftiiZP2wHUyzjh+75Ys4hO8o3JqI/2VH+PR2paaotDmR4lQ+/+wHa4ZiDBr7v90iV5uGGjCOHfa1cL+vi43bBgotpEdOpzSaCvLqQQoOpzHSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TuNSA7Dp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TuNSA7Dp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAE8CC3277B; Tue, 23 Apr 2024 21:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713908654; bh=1Wh6xDdr5nRnacWW6kTtC5AQgTimLV3tc1qnKw456Bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TuNSA7Dp3Ilw4+gqDaH3F4cI0nTzUA3Ax/7oQUvNT2KUDMVbtVkQP4kBgEClyo1q7 XXV4osIKbgJSQoSBmhBxIGKIZOWG5mioqvN4Qoy/59FOswpLeT+65LoVdVReBJIKYz OJzsTa8sbwEW/DYaowJQKHdP5WkZYLPrqE5JDd6Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zack Rusin , Broadcom internal kernel review list , dri-devel@lists.freedesktop.org, Pekka Paalanen Subject: [PATCH 6.6 145/158] drm/vmwgfx: Sort primary plane formats by order of preference Date: Tue, 23 Apr 2024 14:39:42 -0700 Message-ID: <20240423213900.393804458@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423213855.696477232@linuxfoundation.org> References: <20240423213855.696477232@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zack Rusin commit d4c972bff3129a9dd4c22a3999fd8eba1a81531a upstream. The table of primary plane formats wasn't sorted at all, leading to applications picking our least desirable formats by defaults. Sort the primary plane formats according to our order of preference. Nice side-effect of this change is that it makes IGT's kms_atomic plane-invalid-params pass because the test picks the first format which for vmwgfx was DRM_FORMAT_XRGB1555 and uses fb's with odd sizes which make Pixman, which IGT depends on assert due to the fact that our 16bpp formats aren't 32 bit aligned like Pixman requires all formats to be. Signed-off-by: Zack Rusin Fixes: 36cc79bc9077 ("drm/vmwgfx: Add universal plane support") Cc: Broadcom internal kernel review list Cc: dri-devel@lists.freedesktop.org Cc: # v4.12+ Acked-by: Pekka Paalanen Link: https://patchwork.freedesktop.org/patch/msgid/20240412025511.78553-6-zack.rusin@broadcom.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -243,10 +243,10 @@ struct vmw_framebuffer_bo { static const uint32_t __maybe_unused vmw_primary_plane_formats[] = { - DRM_FORMAT_XRGB1555, - DRM_FORMAT_RGB565, DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_RGB565, + DRM_FORMAT_XRGB1555, }; static const uint32_t __maybe_unused vmw_cursor_plane_formats[] = {