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 4D989C433F5 for ; Wed, 20 Apr 2022 18:16:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C3D010F160; Wed, 20 Apr 2022 18:16:32 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0247010F0C6; Wed, 20 Apr 2022 18:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650478589; x=1682014589; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q1/mJKKYNUjIp6VsGHLq+zW5dpH68asDqzLG+kPoEwg=; b=kzuFtXaecDCy5xOO2PsNdaWwF4h3SB9ViJ0aTBib+sf0nQqiUbwkkXtY j06ASshHevm0pnUALpSsMf+Z4ay247fWYxfDA+QV2sRyOquPnSZtviPUN AdD7ofgKgWY+gro3nQOd+OEJQpYn0ya1R9fHi2K940EBhWF5rZ6AEZF1y SGXBaXgROoFtJcHW8Ai6TwDC/UqnKICzBOpE1SDlKyf1auWuCGbgcBMt0 4bZMJalFDkUbC5z6wR/IgYjZl6Dxk0cDWle62Je0W7iKr/99aTPhqPdns YK30hYKF0Nd4eU5UJ9iYDTEaJPp2QCKSJTwG0wTSM5G9JCcsk5f5aZPT5 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10323"; a="261723159" X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="261723159" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 11:16:28 -0700 X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="593286110" Received: from briansim-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.3.144]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 11:16:27 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Subject: [CI 3/4] drm/i915/selftests: fixup min_alignment usage Date: Wed, 20 Apr 2022 19:16:12 +0100 Message-Id: <20220420181613.70033-3-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420181613.70033-1-matthew.auld@intel.com> References: <20220420181613.70033-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , dri-devel@lists.freedesktop.org, Nirmoy Das Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Trying to cast the region id into the region type doesn't work too well, since the i915_vm_min_alignment() won't give us the correct value for the stolen-lmem case. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das Cc: Ramalingam C --- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 5c9bfa409ff5..bccc49a8ab5e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -1150,7 +1150,7 @@ static int misaligned_pin(struct i915_address_space *vm, flags |= PIN_GLOBAL; for_each_memory_region(mr, vm->i915, id) { - u64 min_alignment = i915_vm_min_alignment(vm, (enum intel_memory_type)id); + u64 min_alignment = i915_vm_min_alignment(vm, mr->type); u64 size = min_alignment; u64 addr = round_down(hole_start + (hole_size / 2), min_alignment); -- 2.34.1 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 6BA10C433EF for ; Wed, 20 Apr 2022 18:16:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EF1710F1A6; Wed, 20 Apr 2022 18:16:37 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0247010F0C6; Wed, 20 Apr 2022 18:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650478589; x=1682014589; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q1/mJKKYNUjIp6VsGHLq+zW5dpH68asDqzLG+kPoEwg=; b=kzuFtXaecDCy5xOO2PsNdaWwF4h3SB9ViJ0aTBib+sf0nQqiUbwkkXtY j06ASshHevm0pnUALpSsMf+Z4ay247fWYxfDA+QV2sRyOquPnSZtviPUN AdD7ofgKgWY+gro3nQOd+OEJQpYn0ya1R9fHi2K940EBhWF5rZ6AEZF1y SGXBaXgROoFtJcHW8Ai6TwDC/UqnKICzBOpE1SDlKyf1auWuCGbgcBMt0 4bZMJalFDkUbC5z6wR/IgYjZl6Dxk0cDWle62Je0W7iKr/99aTPhqPdns YK30hYKF0Nd4eU5UJ9iYDTEaJPp2QCKSJTwG0wTSM5G9JCcsk5f5aZPT5 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10323"; a="261723159" X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="261723159" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 11:16:28 -0700 X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="593286110" Received: from briansim-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.3.144]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 11:16:27 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Apr 2022 19:16:12 +0100 Message-Id: <20220420181613.70033-3-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420181613.70033-1-matthew.auld@intel.com> References: <20220420181613.70033-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [CI 3/4] drm/i915/selftests: fixup min_alignment usage X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Trying to cast the region id into the region type doesn't work too well, since the i915_vm_min_alignment() won't give us the correct value for the stolen-lmem case. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Nirmoy Das Cc: Ramalingam C --- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 5c9bfa409ff5..bccc49a8ab5e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -1150,7 +1150,7 @@ static int misaligned_pin(struct i915_address_space *vm, flags |= PIN_GLOBAL; for_each_memory_region(mr, vm->i915, id) { - u64 min_alignment = i915_vm_min_alignment(vm, (enum intel_memory_type)id); + u64 min_alignment = i915_vm_min_alignment(vm, mr->type); u64 size = min_alignment; u64 addr = round_down(hole_start + (hole_size / 2), min_alignment); -- 2.34.1