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 C8A4BC197A0 for ; Thu, 16 Nov 2023 06:42:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9350110E29E; Thu, 16 Nov 2023 06:42:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B33B410E249 for ; Thu, 16 Nov 2023 06:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700116940; x=1731652940; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6wWytlmJiGYjeDaS/BhftIdylYAu6yCiXk/qzL5WFT8=; b=ixDpN5B9UQ3e0Ya7ZUM2UOaqNbpjvDemeLtf9CTuXMkRocbsgnahbB3b Sl3gsMBUEtWA+qZ/hdnXGGKUTUkErrVuC2wzGO7GfaHyr/BOuGLyb04JF n3cHJruvIbxNRkY7rR/hO6cjRIZecTx2ArWErxGa0RtqoT37NjmFIhkNH Tpc5yfPIoA+a6kDaEg6YcR5JBTTAuEfsu5CMpl15BE1gtBqad2wefd9tt 7nAc00HSIkbvA+KXdf41XMSZ6fuMKloW4u2Hf/HdDkjRU2uYdTXCEw65M 7sLadi6kapxvUrYaPZIqNAT8VapEax2cBtd5KRd2X9HCgLgyM1OeC1S73 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="381422790" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="381422790" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 22:42:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="765216690" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="765216690" Received: from dcarcium-mobl.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.40.251]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 22:42:19 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Thu, 16 Nov 2023 08:41:39 +0200 Message-Id: <20231116064145.3969338-3-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116064145.3969338-1-jouni.hogander@intel.com> References: <20231116064145.3969338-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 2/8] Revert "FIXME: drm/i915: xe intel_fb.c framebuffer init and destroy xe changes" 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 14d1d786caacdb3438d07ab86fabf2e36c8151cc. Revert this as we are about to introduce implementation without any ifdefs. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_fb.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 16198c3a229d..748502936899 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1876,17 +1876,6 @@ static void intel_user_framebuffer_destroy_vm(struct drm_framebuffer *fb) if (intel_fb_uses_dpt(fb)) intel_dpt_destroy(intel_fb->dpt_vm); -#ifndef I915 - if (intel_fb_obj(fb)->flags & XE_BO_CREATE_PINNED_BIT) { - struct xe_bo *bo = intel_fb_obj(fb); - - /* Unpin our kernel fb first */ - xe_bo_lock(bo, false); - xe_bo_unpin(bo); - xe_bo_unlock(bo); - } - xe_bo_put(intel_fb_obj(fb)); -#endif } static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) @@ -2130,10 +2119,6 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, intel_fb->dpt_vm = vm; } -#ifndef I915 - /* Hold a reference to object while fb is alive */ - xe_bo_get(obj); -#endif ret = drm_framebuffer_init(&dev_priv->drm, fb, &intel_fb_funcs); if (ret) { -- 2.34.1