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 EB22BE784B2 for ; Mon, 2 Oct 2023 10:24:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 559AC10E27B; Mon, 2 Oct 2023 10:24:34 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8556110E280 for ; Mon, 2 Oct 2023 10:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696242269; x=1727778269; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2Z055bXZDQLuHrg3AhOVmAnh//YNmZwHee1fuIeBj0E=; b=epglpvN0uPEHtIMI+XoQl2+AvzNnfOLDzl9lbULTm5mmPR6/dCw9yzrY L3BJRFaIoaCP3CgkS25mz7I3cGIe6e6qRxPCXxp5MKvcIVcUXpNb7V2cW sNlJsMn8hQIzDmQPI38aymmyO7DKvhZuJk6b9EI6x3WHFJSh/lVWOvGV8 K7pmx8g/5n95pquYP0o9XLMcdMsHidsvr3SQciwhRXLN9HkbaKGnVE/Jq zDCz7RBU0O/PV0cNDcdSwTUxwJDFllirWygEj+p0tCyjElKHHXied6YXT YGdgDpcA7TY9d1f8e41DIdF97CnWR1ls+MG33xu29toEd4wdlSLSqtZ+v Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="468894353" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="468894353" 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="744075772" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="744075772" 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:23 -0700 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Mon, 2 Oct 2023 13:23:59 +0300 Message-Id: <20231002102359.3740026-5-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 4/4] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile 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" Generic dirtyfb implementation which Xe is currently using is doing atomic commit which is inefficient. We have now dma fence handling in our dirtyfb implementation. This works with Xe and CPU/GPU frontbuffer rendering as long as sync objects are imported by userspace (dma_buf_import_sync_file). Switch to our custom dirtyfb implementation. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_fb.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 6aa1a6ac0728..fd0b978dbef9 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1949,7 +1949,6 @@ 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, @@ -1999,16 +1998,11 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb, intel_frontbuffer_flush(front, ORIGIN_DIRTYFB); return ret; } -#endif static const struct drm_framebuffer_funcs intel_fb_funcs = { .destroy = intel_user_framebuffer_destroy, .create_handle = intel_user_framebuffer_create_handle, -#ifdef I915 .dirty = intel_user_framebuffer_dirty, -#else - .dirty = drm_atomic_helper_dirtyfb, -#endif }; int intel_framebuffer_init(struct intel_framebuffer *intel_fb, -- 2.34.1