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 3549CC10F1A for ; Thu, 9 May 2024 05:34:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1C9110E1E8; Thu, 9 May 2024 05:34:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nYFsDA8R"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9127D10E1E8 for ; Thu, 9 May 2024 05:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715232866; x=1746768866; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M1R/vENmYfPcV0pPP/Ldk8PqLyMiqSpIqXyDc31gY8Y=; b=nYFsDA8R8LG9LuMUeeRSXG7dzYAg1OBBe8Sd51cD5x/6XNB2QMJlbupd uqM7XKTyNfv9qRnjhlu2X5UVV1kNZlmcl04SaMjfXY/F2XT/ejYl/eN9T yYeM3fGYcR/ZgnUf6tID/I9fqpOItk3IPtVv698MyPrXRqguhIGwSG8fx ROyNZSGjMJEobztjrOi1PtOJ5ki39HdDLZr16XxJWCHvyruxLVaksM7tF Dxle6dW2YrDZzw/CypZsRrORscrLdK7poKQhbUq3AM1hIbzmPxL6+8R4m 0frm2zuR2dTe13/qeek8DMfuCb4AWdPhNFByv6cn+dN+c+/Q5oRfJeeyd g==; X-CSE-ConnectionGUID: uUDi5fRpSneOyMsaDb7f8Q== X-CSE-MsgGUID: 99RGU83GRwGE5j6KOQkN+Q== X-IronPort-AV: E=McAfee;i="6600,9927,11067"; a="21802889" X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="21802889" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 22:34:26 -0700 X-CSE-ConnectionGUID: vpJw0OXqTe+ve8TOQ9gbEw== X-CSE-MsgGUID: 8GNPGIVOSqWiud2h49T5ig== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="29187231" Received: from unknown (HELO localhost) ([10.245.246.122]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 22:34:24 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Juha-Pekka Heikkila Subject: [PATCH i-g-t v5 04/11] lib/intel_bufops: Restrict tilings on non-flatccs platforms Date: Thu, 9 May 2024 07:33:52 +0200 Message-Id: <20240509053359.449885-5-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240509053359.449885-1-zbigniew.kempczynski@intel.com> References: <20240509053359.449885-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" JP noticed after last changes introduced in bufops we keep unnecessary two conditions instead of pack them to single one. This is refactor, no functional change. Signed-off-by: Zbigniew Kempczyński Suggested-by: Juha-Pekka Heikkila Reviewed-by: Juha-Pekka Heikkila --- lib/intel_bufops.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 43d6dd5b43..7118272e5f 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -896,7 +896,9 @@ static void __intel_buf_init(struct buf_ops *bops, size = buf->surface[0].size = buf->surface[0].stride * aligned_height; - if (compression) { + if (compression && !HAS_FLATCCS(buf_ops_get_devid(bops))) { + int aux_width, aux_height; + igt_require(bops->intel_gen >= 9); igt_assert(req_tiling == I915_TILING_Y || req_tiling == I915_TILING_Yf || @@ -907,17 +909,12 @@ static void __intel_buf_init(struct buf_ops *bops, * CCS units, that is 4 * 64 bytes. These 4 CCS units are in * turn mapped by one L1 AUX page table entry. */ + aux_width = intel_buf_ccs_width(bops->intel_gen, buf); + aux_height = intel_buf_ccs_height(bops->intel_gen, buf); - if (!HAS_FLATCCS(intel_get_drm_devid(bops->fd))) { - int aux_width, aux_height; - - aux_width = intel_buf_ccs_width(bops->intel_gen, buf); - aux_height = intel_buf_ccs_height(bops->intel_gen, buf); - - buf->ccs[0].offset = buf->surface[0].stride * ALIGN(height, 32); - buf->ccs[0].stride = aux_width; - size = buf->ccs[0].offset + aux_width * aux_height; - } + buf->ccs[0].offset = buf->surface[0].stride * ALIGN(height, 32); + buf->ccs[0].stride = aux_width; + size = buf->ccs[0].offset + aux_width * aux_height; } /* Store buffer size to avoid mistakes in calculating it again */ -- 2.34.1