From patchwork Tue Mar 1 17:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12764946 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 799F5C433FE for ; Tue, 1 Mar 2022 17:09:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6505E10E55F; Tue, 1 Mar 2022 17:09:06 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3FA4E10E2DA for ; Tue, 1 Mar 2022 17:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646154544; x=1677690544; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j1z0lAuxEOtHRIPWoqtSaKOQG+Vclv/9Doozc/SBQws=; b=PjarISNSmsydHXbLF46rcQo5Qp+L43Si237BxVZ1O/zx3YY89jzxmaqW ja4WsR+F9gWSqp4eFa4hs2Gw07uA1bMN0Doyw4PMzO1bMB5O8ikAdLrTV ptoFuScr49QLE0MYozLuUgBnVHWZm1jhfovigaB9pTOdDu4b9f5c5kMab WhTXFqVf10U4++1gNRO4AqI+4rLRZV4rgqJGqSk9YCVlhdVKuztewxgTl IqdrDNeV+n+drHeZ3QuzPmJrEkuCXXukYHcPL9aOPOUKRvji4SxpSTba4 VZ/zB7bjZl5wq37FOOqi5c8v2uvk4B6KjDPnuKLhTbsW8UrGjCxMQ6519 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10273"; a="313904424" X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="313904424" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 09:09:04 -0800 X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="493185398" Received: from daithiby-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.15.82]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 09:09:03 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Tue, 1 Mar 2022 17:08:34 +0000 Message-Id: <20220301170835.682715-2-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301170835.682715-1-matthew.auld@intel.com> References: <20220301170835.682715-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [CI 2/3] drm/i915/fbdev: fixup setting screen_size X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Since we are actually mapping the object and not the vma, when dealing with LMEM, we should be careful and use the obj->base.size here, since the vma could have all kinds of funny padding constraints. Signed-off-by: Matthew Auld Cc: Stanislav Lisovskiy --- drivers/gpu/drm/i915/display/intel_fbdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index 2cd62a187df3..3167ae334684 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -290,7 +290,10 @@ static int intelfb_create(struct drm_fb_helper *helper, goto out_unpin; } info->screen_base = vaddr; - info->screen_size = vma->node.size; + if (i915_gem_object_is_lmem(obj)) + info->screen_size = vma->obj->base.size; + else + info->screen_size = vma->node.size; drm_fb_helper_fill_info(info, &ifbdev->helper, sizes);