From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA283CF9C69 for ; Mon, 23 Sep 2024 11:00:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A579010E21E; Mon, 23 Sep 2024 11:00:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PfMs24W5"; dkim-atps=neutral Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E3CA10E21E for ; Mon, 23 Sep 2024 11:00:39 +0000 (UTC) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5c26311c6f0so5808855a12.3 for ; Mon, 23 Sep 2024 04:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727089238; x=1727694038; darn=lists.freedesktop.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:reply-to:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=mrAqgOitREHBvztgVZUneCOVLQLlYQU0PNPGBn0eEag=; b=PfMs24W5lchMaKv9VBZur2lOahbu9vRYtLfqi4vdUrZuz94g7TuPqrnN6yLMkSReiD /W7pgTOH6FLJZ+gv6qqeVKbaV925sXdI5ty2hmPqfM616fyTaYQjCDZdyFscFjBAhWUQ 0r6qaAiI6Nsd24vv5BfGlLN0r/jYJsYXibVdi8szgg6DUBBky2+hTMVaZQwFEqHJUQ6c vfVO+9vmtXNOZqx4+h2GsV+CW6rQ+9PePQuqJc+1aD6Fpj+zl0RIHvBL+VDIDYJgl1r3 2unq5ZlTCCa1av0kIroSfpMr+jMqkNuM8ZnNKgH1Izb0GDbAf18dEKKuKYbaIGvE4OzZ wSUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727089238; x=1727694038; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:reply-to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mrAqgOitREHBvztgVZUneCOVLQLlYQU0PNPGBn0eEag=; b=pYABjK0vapVAsMgNZ4xARKd7m1ZEXeKeH+j+TR0d1WRs2eZIDLg9wgcpICygcuxA3j 8mCr2NxXeuxHAaJkdN8ffkGnLiaT3JE2qb8KTqD19Op0xZXzYL900W9rCHBT/3Etfour 1a5ATtVuWC7G7KA0qJEjIAjK+IWlghVZexWv36M67z89TAPnCm2ebZRmjC2NOkLjQ9oe WUAWg/bxDG+KBLYS2PwyIElE/MkVwoKl8hrs94cCFEdUjMPsMymBHxtyRm98nvrhcIZQ 4ii+hNDtGwFUgORm4NRUuZdPu/L2hqXvOLUBhK/oMAmOjO2ivlZ/Q+8NRsWOgKFJBBmi y/bg== X-Forwarded-Encrypted: i=1; AJvYcCVgfP0DWNkFiMuUCNR2wIwUuLWvDEfYiJun8QDK0Eh2i3gNnZFrGcNGZiAFVxf0/iCblzdpOuOG@lists.freedesktop.org X-Gm-Message-State: AOJu0YzCM8six8o4MGmF4D6OW36VjJaTNbg3YpBMMIldKiDZsJ8vkx/g uS+W1nVXH0LysG0N+x8dVmpVzdUOE4VdPU1EC/EcXIOpzUICykYA X-Google-Smtp-Source: AGHT+IE5zUnuf7lvmzcAQL6VFgB05fh5QBflhhaq7GiG2jhrFccNdV3hmgQ+MapxMaK2aagboU2VMg== X-Received: by 2002:a17:906:cae1:b0:a8d:3f6a:99cb with SMTP id a640c23a62f3a-a90d51281d6mr1070927066b.47.1727089237431; Mon, 23 Sep 2024 04:00:37 -0700 (PDT) Received: from [0.0.0.0] ([134.134.137.72]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-a90612e1a55sm1198113866b.157.2024.09.23.04.00.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 23 Sep 2024 04:00:36 -0700 (PDT) Message-ID: <2bde40b9-ea8f-4138-8ae3-7da8aec16602@gmail.com> Date: Mon, 23 Sep 2024 14:00:30 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH i-g-t v2 15/18] tests/kms_ccs: Correctly check clear color for fp16 formats To: Ville Syrjala , igt-dev@lists.freedesktop.org References: <20240918120518.30258-1-ville.syrjala@linux.intel.com> <20240918120518.30258-16-ville.syrjala@linux.intel.com> Content-Language: en-US From: Juha-Pekka Heikkila In-Reply-To: <20240918120518.30258-16-ville.syrjala@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: juhapekka.heikkila@gmail.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Reviewed-by: Juha-Pekka Heikkila On 18.9.2024 15.05, Ville Syrjala wrote: > From: Ville Syrjälä > > The hardware generated clear color will be in the native > pixel format. Generate the reference correctly for fp16 > formats. > > Signed-off-by: Ville Syrjälä > --- > tests/intel/kms_ccs.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) > > diff --git a/tests/intel/kms_ccs.c b/tests/intel/kms_ccs.c > index 68e925382bd6..971d9fe0fcae 100644 > --- a/tests/intel/kms_ccs.c > +++ b/tests/intel/kms_ccs.c > @@ -35,6 +35,7 @@ > */ > > #include "igt.h" > +#include "igt_halffloat.h" > > #include "i915/gem_create.h" > #include "intel_pat.h" > @@ -200,6 +201,7 @@ static const uint32_t formats[] = { > DRM_FORMAT_XYUV8888, > DRM_FORMAT_XRGB8888, > DRM_FORMAT_XRGB2101010, > + DRM_FORMAT_XBGR16161616F, > DRM_FORMAT_YUYV, > DRM_FORMAT_NV12, > DRM_FORMAT_P012, > @@ -324,7 +326,8 @@ static void check_ccs_cc_plane(int drm_fd, igt_fb_t *fb, int plane, const float > uint32_t d; > } *cc_p; > void *map; > - uint32_t native_color = 0; > + uint32_t native_color[2] = {}; > + uint16_t half[4]; > > if (is_i915_device(drm_fd)) { > gem_set_domain(drm_fd, fb->gem_handle, I915_GEM_DOMAIN_CPU, 0); > @@ -341,25 +344,32 @@ static void check_ccs_cc_plane(int drm_fd, igt_fb_t *fb, int plane, const float > > switch (fb->drm_format) { > case DRM_FORMAT_XRGB8888: > - native_color = (uint32_t)(cc_color[3] * 0xff) << 24 | > + native_color[0] = (uint32_t)(cc_color[3] * 0xff) << 24 | > (uint32_t)(cc_color[0] * 0xff) << 16 | > (uint32_t)(cc_color[1] * 0xff) << 8 | > (uint32_t)(cc_color[2] * 0xff); > break; > case DRM_FORMAT_XRGB2101010: > - native_color = (uint32_t)(cc_color[3] * 0x3) << 30 | > + native_color[0] = (uint32_t)(cc_color[3] * 0x3) << 30 | > (uint32_t)(cc_color[0] * 0x3ff) << 20 | > (uint32_t)(cc_color[1] * 0x3ff) << 10 | > (uint32_t)(cc_color[2] * 0x3ff); > break; > + case DRM_FORMAT_XBGR16161616F: > + igt_float_to_half(cc_color, half, 4); > + > + native_color[1] = (uint64_t)half[3] << 16 | (uint64_t)half[2]; > + native_color[0] = (uint64_t)half[1] << 16 | (uint64_t)half[0]; > + break; > default: > break; > } > > - igt_assert_eq_u32(native_color, cc_p[4].d); > + igt_assert_eq_u32(native_color[0], cc_p[4].d); > + igt_assert_eq_u32(native_color[1], cc_p[5].d); > > igt_assert_eq(0, gem_munmap(map, fb->size)); > -}; > +} > > static void check_all_ccs_planes(int drm_fd, igt_fb_t *fb, const float *cc_color, bool check_cc_plane) > { > @@ -854,7 +864,8 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags, > > if (igt_fb_is_gen12_rc_ccs_cc_modifier(data->ccs_modifier) && > data->format != DRM_FORMAT_XRGB8888 && > - data->format != DRM_FORMAT_XRGB2101010) > + data->format != DRM_FORMAT_XRGB2101010 && > + data->format != DRM_FORMAT_XBGR16161616F) > return false; > > /* VEBOX just hangs with an actual 10bpc format */