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 F4133C4332F for ; Tue, 14 Nov 2023 13:05:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C4BB510E441; Tue, 14 Nov 2023 13:05:23 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C643C10E441 for ; Tue, 14 Nov 2023 13:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699967119; x=1731503119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HCz7UfePCzASJMNQigD/PzRVN8phLOrscOlMwYSmFew=; b=WN7mZeZHreY4HjR9ZMcyTRSSdYxACcNsUwDjGYQO8X+/6pFNjWmeVMi5 DOgKflCtLaMZOGGNIsbXN1Z62NZkX7SYegUWzQpuxzWCSLTaVBghuV1me +OkaySQBPksFwdjm12AjpjNf1uAzd98Sb58vRWGxTr2894NRDR3XuqvDP JEd0jKEweU1/DENjfyz3QCrDtw7kra7TYqtsb9ZS3twLwPZM1H9rugzlQ fJ56GMsy1T/tojnPTvzTmN8m+0rYnfB9U2XzkPfUOvbuoUu2V90BZb4a4 8a5gzOV9ES1zFPfvIf7ZaYJIcxq0nS3VFM+Ughv6QoIM3P0tXaRBcda+P w==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="394565396" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="394565396" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 05:05:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="793778974" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="793778974" Received: from mmaiores-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.56.172]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 05:05:17 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Tue, 14 Nov 2023 15:04:43 +0200 Message-Id: <20231114130443.2503708-10-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114130443.2503708-1-jouni.hogander@intel.com> References: <20231114130443.2503708-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 v2 9/9] drm/i915/display: use intel_bo_to_drm_bo in intel_fbdev 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 preparing for Xe driver. I915 and Xe object implementation are differing. Do not use i915_gem_object->base directly. Instead use intel_bo_to_drm_bo. Signed-off-by: Jouni Högander Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/i915/display/intel_fbdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index 252f254345a2..05f614f992d6 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -332,12 +332,12 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, continue; } - if (obj->base.size > max_size) { + if (intel_bo_to_drm_bo(obj)->size > max_size) { drm_dbg_kms(&i915->drm, "found possible fb from [PLANE:%d:%s]\n", plane->base.base.id, plane->base.name); fb = to_intel_framebuffer(plane_state->uapi.fb); - max_size = obj->base.size; + max_size = intel_bo_to_drm_bo(obj)->size; } } -- 2.34.1