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 D8C47E784B0 for ; Mon, 2 Oct 2023 10:24:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C9CE10E27A; Mon, 2 Oct 2023 10:24:33 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FC3210E279 for ; Mon, 2 Oct 2023 10:24: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=1696242268; x=1727778268; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O3qhRKexhliFoOD0TqdFN8gC3K7cvsrdkT6ZltXsC7o=; b=XwbBsQsJuUW15S/eDR1cgtjcAnmMotqEq88xb24qV8JYzRU95elG5Dz3 HggkHhiHCn/mPjNdR1WDf+GzUIRuUrgH0VGh7mbpBt9fQHdnFUJfG41Cm b41Oq7KUfBCmzbqAKsfVysPA97C1H8gXPQk7LMGTfs/99ct2mnPjK4Iy6 ApV3zXfzQrq3hHz+sdcz+j9crDmvn1vkK4Ek9ifHMgvvWdMC4KwvXF9Td vwikRX1ZGbv4Ef7+Kn98Rz/Qt5tN//XgDKybR/bTI5bbL5P/SW9ZgN2Gb sP0C7roF+U2bfLZWLu8qT8GfIRUoa8T/wUczQEdFY02MGWAVz7XvNdyNR g==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="468894348" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="468894348" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 03:24:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="744075760" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="744075760" Received: from apascali-mobl3.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.221.122]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 03:24:18 -0700 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Mon, 2 Oct 2023 13:23:57 +0300 Message-Id: <20231002102359.3740026-3-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002102359.3740026-1-jouni.hogander@intel.com> References: <20231002102359.3740026-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 v4 2/4] Revert "FIXME: drm/i915: More display ugly wa needed after rebase" 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" This reverts commit 4bf10efdff69a34bfa55813593bfecbf6f5d6db9. We have now emtpy define for i915_gem_object_flush_if_display about to enable custom dirtyfb for Xe as well. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_fb.c | 2 +- drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 961fa778ba88..abca5a3652d4 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1939,7 +1939,6 @@ struct frontbuffer_fence_cb { struct intel_frontbuffer *front; }; -#ifdef I915 static void intel_user_framebuffer_fence_wake(struct dma_fence *dma, struct dma_fence_cb *data) { @@ -1950,6 +1949,7 @@ static void intel_user_framebuffer_fence_wake(struct dma_fence *dma, dma_fence_put(dma); } +#ifdef I915 static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb, struct drm_file *file, unsigned int flags, unsigned int color, diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c index b80cf8fb1c97..d64ce5bfeca8 100644 --- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c +++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c @@ -209,9 +209,7 @@ static void intel_frontbuffer_flush_work(struct work_struct *work) struct intel_frontbuffer *front = container_of(work, struct intel_frontbuffer, flush_work); -#ifdef I915 i915_gem_object_flush_if_display(front->obj); -#endif intel_frontbuffer_flush(front, ORIGIN_DIRTYFB); intel_frontbuffer_put(front); } -- 2.34.1