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 9E79DC4167B for ; Fri, 8 Dec 2023 07:56:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DD3E10EA05; Fri, 8 Dec 2023 07:56:40 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id B646910E9F3 for ; Fri, 8 Dec 2023 07:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702022196; x=1733558196; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ue/tRVE+KiunDaUOzuXqeRqHHSQotJZRHpWjU57os3U=; b=oKkNhKBIQsWVqa4oQ+RbVY23MwwD59TL7z19JMQYU8JQm1Q8xLAtRVmo 39HWuRv6IjN4iHX50ycjImq1U0YdwXGaibU3gi4ztTiWS7GUCe8h98GsA tawCGroqDTbIGhw2Jm5v9aYrxEVC2UTFSIQWbR5HxFjHDCAPDaF1mbW0v sHYqOZgteL4t4q6wJXlfOxxww2dJyq6xtEefMt/DLylgef6TscdSVB3BY IDRS6gI86MnVpqiLognZ+hhFQ9vJoFhiFaRCSvn3tx+9+LhzSkp6D//v7 kPN5/4wFEMejnZtS4PZR0qvxPN+wTFxhlK6CLETIRw5XBamsY/yCfBYyu Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="391542406" X-IronPort-AV: E=Sophos;i="6.04,260,1695711600"; d="scan'208";a="391542406" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 23:56:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="838044700" X-IronPort-AV: E=Sophos;i="6.04,260,1695711600"; d="scan'208";a="838044700" Received: from cannonro-mobl.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.63.126]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 23:56:35 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Subject: [PATCH v3 1/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Date: Fri, 8 Dec 2023 09:56:02 +0200 Message-Id: <20231208075610.3005795-2-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231208075610.3005795-1-jouni.hogander@intel.com> References: <20231208075610.3005795-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 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" We are about to backport patch which is helping us to get rid of Xe build changes in intel_cursor.c: https://patchwork.freedesktop.org/series/127300/ Signed-off-by: Jouni Högander Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/display/intel_cursor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c index 8ed8a623fa98..b342fad180ca 100644 --- a/drivers/gpu/drm/i915/display/intel_cursor.c +++ b/drivers/gpu/drm/i915/display/intel_cursor.c @@ -30,17 +30,15 @@ static const u32 intel_cursor_formats[] = { static u32 intel_cursor_base(const struct intel_plane_state *plane_state) { - __maybe_unused struct drm_i915_private *dev_priv = + struct drm_i915_private *dev_priv = to_i915(plane_state->uapi.plane->dev); - __maybe_unused const struct drm_framebuffer *fb = plane_state->hw.fb; - __maybe_unused const struct drm_i915_gem_object *obj = intel_fb_obj(fb); + const struct drm_framebuffer *fb = plane_state->hw.fb; + const struct drm_i915_gem_object *obj = intel_fb_obj(fb); u32 base; -#ifdef I915 if (DISPLAY_INFO(dev_priv)->cursor_needs_physical) base = sg_dma_address(obj->mm.pages->sgl); else -#endif base = intel_plane_ggtt_offset(plane_state); return base + plane_state->view.color_plane[0].offset; -- 2.34.1