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 EB613EE6434 for ; Fri, 15 Sep 2023 07:49:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B931010E5D2; Fri, 15 Sep 2023 07:49:12 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A381310E5CE for ; Fri, 15 Sep 2023 07:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694764148; x=1726300148; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qIgy1+wfYCfHjEY6slmyqnMUgN9a0RhfCJmCbuNboi0=; b=HECNHaQqYJX60sgi2f6Sk6QoDeklZ+g/II5r3a3jKFq9yldg5QrH6IWx HEhp68LDgvxOMX51G82UzEjw+KIRzZfue8CtMxKifuwYlcIVJ5wYv8K3l +xLNhJWNiBMNmqB8zedXIYQDxzx4rBLZHEc3BtMq2Q1iMsCfiaeQvKbQJ 2zP9ccCwWQ9hRT7wqZZNYnwhkOdy7Y2w5uk8OqFyPwi7mcofdBffkuU75 8HPHd361HP7PcVqRD/TwcbZ2gcR9U5I3889L4kP4tGWqkJHyso4Pixg3Q FqrW+7onjlDubMyH4ROTy9n8EPauN3Q2+Apo2g1qSDHthAoT4muHaoVYQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="369507609" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="369507609" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 00:48:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="1075711676" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="1075711676" Received: from cohrs-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.48.100]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 00:48:47 -0700 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Fri, 15 Sep 2023 10:48:18 +0300 Message-Id: <20230915074818.903353-8-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915074818.903353-1-jouni.hogander@intel.com> References: <20230915074818.903353-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 7/7] 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 --- 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 80b19d4b3086..a5cb41bec60e 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1963,10 +1963,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