From patchwork Wed Mar 23 07:16:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Zbigniew_Kempczy=C5=84ski?= X-Patchwork-Id: 12789490 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 D1AC5C433F5 for ; Wed, 23 Mar 2022 07:17:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BA5B10E261; Wed, 23 Mar 2022 07:17:10 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07BA110E261 for ; Wed, 23 Mar 2022 07:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648019830; x=1679555830; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=M3TsZp7+dbgw9BDQJwexJhvrcw9uBDKSsYiznKI6/YM=; b=EW6b9X4vUUQd0KSMCkUIdbPjIjItm05Tw5B1xUD4hQrgCFMdtMqt8Tmd vsHGAPcalPA2BRNxyzIVQIOkVfLW0UdcvgbTZ/dbl3NEhnrfeT5dQm5vW JmGQM9pRoFbCPLNlWAFaaNNU4IGuA56KphGTuuwIM2y/skTYB7Bya9LPm ldBXj+4lj+zpBSYHSLBKmMw5wS4qg2OkVStu3e1TDiNwqZdlJpqmMtBNc OKRGAea3VPbXAeaPWUyRF6+pQfR6JCFsZkyx0KxembsWuP9PkTXCRI43l gNoELGsRv4Sw17j9bVoJ5nC3cLU08hxULLcfCFRoOLjMH0BJ2jk8Qy7wQ Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10294"; a="282885033" X-IronPort-AV: E=Sophos;i="5.90,203,1643702400"; d="scan'208";a="282885033" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2022 00:17:09 -0700 X-IronPort-AV: E=Sophos;i="5.90,203,1643702400"; d="scan'208";a="560775395" Received: from echudzi-mobl1.ger.corp.intel.com (HELO localhost) ([10.213.9.227]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2022 00:17:05 -0700 From: =?utf-8?q?Zbigniew_Kempczy=C5=84ski?= To: intel-gfx@lists.freedesktop.org Date: Wed, 23 Mar 2022 08:16:41 +0100 Message-Id: <20220323071641.14560-1-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] [topic/core-for-CI] Revert "drm/i915/dg2: Add relocation exception" 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: Daniel Vetter , Lucas De Marchi , Rodrigo Vivi , Dave Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This reverts commit 904ebf2ba89edaeba5c7c10540e43dba63541dc6. Failures on dg2 tests were caused by invalid alignment when local memory was in use. Changes which adopt alignment according to gen were already merged in IGT so lets revert relocation temporary enabler for dg2. Keeping it is a little bit problematic for IGT because on premerge we would see results with kernel which supports relocation. To see no-relocation results we need to send disabler (like this revert), point IGT with "Test-with" tag what is cumbersome and time consuming so lets do this permanently. If we will see some failures they need to be fixed instead of keeping relocation enabler. Signed-off-by: Zbigniew Kempczyński Cc: Lucas De Marchi Cc: Dave Airlie Cc: Daniel Vetter Cc: Jason Ekstrand Cc: Rodrigo Vivi --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 42a49fd2f2ab..8b0b4aeb6716 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -501,7 +501,7 @@ static bool platform_has_relocs_enabled(const struct i915_execbuffer *eb) */ if (GRAPHICS_VER(eb->i915) < 12 || IS_TIGERLAKE(eb->i915) || IS_ROCKETLAKE(eb->i915) || IS_ALDERLAKE_S(eb->i915) || - IS_ALDERLAKE_P(eb->i915) || IS_DG2(eb->i915)) + IS_ALDERLAKE_P(eb->i915)) return true; return false;