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 6B0D4C001E0 for ; Mon, 23 Oct 2023 06:34:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3378310E14F; Mon, 23 Oct 2023 06:34:54 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80EBA10E14F for ; Mon, 23 Oct 2023 06:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698042891; x=1729578891; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1CDfLcPihlfxpJ3OeQWdAuL8MPXBI4R/iG6r5gXonJ4=; b=cuBt/wqeaIKOPpSfFfht9DjXt9VmvPJQPtpTh1v8tPttRYQZCCE1bswK PTc4PmMhVqzfUsR19QQ5ZmID9Eb9SB3CXsNT/jrStluD024bE/wBq2+Bd dhroh0akdW4A2Iil4RyCY475mbh4RSXloivYxOHj2XLgYM1Oepspl5+wT uu5rfxS/cy/WBckZkED0bDfEKLBgQH1SUnaTIEB9Fev+XVjK/KyP6iE/v bEFVAWzD0sOGfB3JCWKy2HBGTJtil9LginI601lsINJdU1sz8ZCxcSISh nXKzEXlRY05X/0LiMY9jqZWuM3tryIuYXqvZEPwaRXhZiE2LBtEF2rRfY Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="472990974" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="472990974" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 23:34:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="901704668" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="901704668" Received: from spalanis-mobl.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.62.239]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 23:32:32 -0700 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Mon, 23 Oct 2023 09:34:20 +0300 Message-Id: <20231023063420.3298731-5-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023063420.3298731-1-jouni.hogander@intel.com> References: <20231023063420.3298731-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 4/4] drm/i915/display: Use intel_bo_to_drm_bo instead of obj->base X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Jouni=20H=C3=B6gander?= Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Xe and i915 objects have differing implementation. Use intel_bo_to_drm_bo instead of obj->base as xe_bo doesn't have base pointer. Signed-off-by: Jouni Högander Reviewed-by: Juha-Pekka Heikkila Link: https://patchwork.freedesktop.org/patch/msgid/20231012072158.4115795-3-jouni.hogander@intel.com (cherry picked from commit 3594d00b71eea66d183b310c19aa5a6bf4206e62) --- drivers/gpu/drm/i915/display/intel_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 35ea058bb797..fd0b978dbef9 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1964,10 +1964,10 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb, if (!atomic_read(&front->bits)) return 0; - if (dma_resv_test_signaled(obj->base.resv, dma_resv_usage_rw(false))) + if (dma_resv_test_signaled(intel_bo_to_drm_bo(obj)->resv, dma_resv_usage_rw(false))) goto flush; - ret = dma_resv_get_singleton(obj->base.resv, dma_resv_usage_rw(false), + ret = dma_resv_get_singleton(intel_bo_to_drm_bo(obj)->resv, dma_resv_usage_rw(false), &fence); if (ret || !fence) goto flush; -- 2.34.1