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 23DFCC433EF for ; Thu, 10 Mar 2022 12:28:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CB1910EAF2; Thu, 10 Mar 2022 12:28:36 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCBEA10EAC2; Thu, 10 Mar 2022 12:28: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=1646915309; x=1678451309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bWnB1eeU4C7I17oPteuIHEN4bwXKfJOkVRL1nnP6O3o=; b=Q+CrfatQqYvAxzp5COyraf+lrs63GLMyuyfVagLE5/Y7WQLRVLkcJoU1 ZtoWRlnuULy7hLawKJdp1cAieJnGEE2wR6zTa7XFZGyDvA85F+zYVyaDg KU2JWFaAtiOLQulZ0OkSsdac0HdtfBDx7IcJ8P5HoWdBHsBAiz2uI4IK/ ziqPW0pRq9F4BjcIjFD70WBm5N0/OdUcn0eO5pa/UyeIomfeG/7EE2FMy yoaD6Z6fZkx1vcUruPHyxxmQpGHF1RCcZzyZmEeTq8lemATdFIrCItWvM Ha0lsuFhG7kobY8BOUWXVd7cIKSVw8sVOLwhShrGjCV0x8Wr6W+7PJOwW A==; X-IronPort-AV: E=McAfee;i="6200,9189,10281"; a="341665182" X-IronPort-AV: E=Sophos;i="5.90,170,1643702400"; d="scan'208";a="341665182" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 04:28:29 -0800 X-IronPort-AV: E=Sophos;i="5.90,170,1643702400"; d="scan'208";a="496237745" Received: from tcuddihy-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.3.1]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 04:28:28 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Subject: [PATCH v2 7/8] drm/i915: fixup the initial fb base on DG1 Date: Thu, 10 Mar 2022 12:27:50 +0000 Message-Id: <20220310122751.89693-8-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220310122751.89693-1-matthew.auld@intel.com> References: <20220310122751.89693-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The offset we get looks to be the exact start of DSM, but the inital_plane_vma expects the address to be relative. v2(Ville): - The base is actually the pre-programmed GGTT address, which is then meant to 1:1 map to somewhere inside dsm. In the case of dgpu the base looks to just be some offset within lmem, but this also happens to be the exact dsm start, on dg1. Therefore we should only need to fudge the physical address, before allocating from stolen. - Bail if it's not located in dsm. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Ville Syrjälä --- .../drm/i915/display/intel_plane_initial.c | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index f797fcef18fc..2aebde02ff57 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -50,7 +50,7 @@ initial_plane_vma(struct drm_i915_private *i915, struct intel_memory_region *mem = i915->mm.stolen_region; struct drm_i915_gem_object *obj; struct i915_vma *vma; - u32 base, size; + u32 base, phys_base, size; u64 pinctl; if (!mem || plane_config->size == 0) @@ -71,8 +71,25 @@ initial_plane_vma(struct drm_i915_private *i915, size * 2 > i915->stolen_usable_size) return NULL; + /* + * On discrete, it looks like the GGTT base address should 1:1 map to + * somewhere in lmem. On DG1 for some reason this intersects with the + * exact start of DSM(possibly due to small lmem size), in which case we + * need to allocate it directly from stolen, which means fudging the + * physical address to be relative to the start of DSM. In such cases + * we might also need to choose between initial fb vs fbc, if space is + * limited. + */ + phys_base = base; + if (IS_DG1(i915)) { + if (WARN_ON(phys_base < i915->dsm.start)) + return NULL; + + phys_base -= i915->dsm.start; + } + obj = i915_gem_object_create_region_at(i915->mm.stolen_region, - base, size, 0); + phys_base, size, 0); if (IS_ERR(obj)) return NULL; -- 2.34.1 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 98451C433EF for ; Thu, 10 Mar 2022 12:28:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8A8A10EAA4; Thu, 10 Mar 2022 12:28:30 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCBEA10EAC2; Thu, 10 Mar 2022 12:28: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=1646915309; x=1678451309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bWnB1eeU4C7I17oPteuIHEN4bwXKfJOkVRL1nnP6O3o=; b=Q+CrfatQqYvAxzp5COyraf+lrs63GLMyuyfVagLE5/Y7WQLRVLkcJoU1 ZtoWRlnuULy7hLawKJdp1cAieJnGEE2wR6zTa7XFZGyDvA85F+zYVyaDg KU2JWFaAtiOLQulZ0OkSsdac0HdtfBDx7IcJ8P5HoWdBHsBAiz2uI4IK/ ziqPW0pRq9F4BjcIjFD70WBm5N0/OdUcn0eO5pa/UyeIomfeG/7EE2FMy yoaD6Z6fZkx1vcUruPHyxxmQpGHF1RCcZzyZmEeTq8lemATdFIrCItWvM Ha0lsuFhG7kobY8BOUWXVd7cIKSVw8sVOLwhShrGjCV0x8Wr6W+7PJOwW A==; X-IronPort-AV: E=McAfee;i="6200,9189,10281"; a="341665182" X-IronPort-AV: E=Sophos;i="5.90,170,1643702400"; d="scan'208";a="341665182" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 04:28:29 -0800 X-IronPort-AV: E=Sophos;i="5.90,170,1643702400"; d="scan'208";a="496237745" Received: from tcuddihy-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.3.1]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 04:28:28 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Mar 2022 12:27:50 +0000 Message-Id: <20220310122751.89693-8-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220310122751.89693-1-matthew.auld@intel.com> References: <20220310122751.89693-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH v2 7/8] drm/i915: fixup the initial fb base on DG1 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: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The offset we get looks to be the exact start of DSM, but the inital_plane_vma expects the address to be relative. v2(Ville): - The base is actually the pre-programmed GGTT address, which is then meant to 1:1 map to somewhere inside dsm. In the case of dgpu the base looks to just be some offset within lmem, but this also happens to be the exact dsm start, on dg1. Therefore we should only need to fudge the physical address, before allocating from stolen. - Bail if it's not located in dsm. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Ville Syrjälä --- .../drm/i915/display/intel_plane_initial.c | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index f797fcef18fc..2aebde02ff57 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -50,7 +50,7 @@ initial_plane_vma(struct drm_i915_private *i915, struct intel_memory_region *mem = i915->mm.stolen_region; struct drm_i915_gem_object *obj; struct i915_vma *vma; - u32 base, size; + u32 base, phys_base, size; u64 pinctl; if (!mem || plane_config->size == 0) @@ -71,8 +71,25 @@ initial_plane_vma(struct drm_i915_private *i915, size * 2 > i915->stolen_usable_size) return NULL; + /* + * On discrete, it looks like the GGTT base address should 1:1 map to + * somewhere in lmem. On DG1 for some reason this intersects with the + * exact start of DSM(possibly due to small lmem size), in which case we + * need to allocate it directly from stolen, which means fudging the + * physical address to be relative to the start of DSM. In such cases + * we might also need to choose between initial fb vs fbc, if space is + * limited. + */ + phys_base = base; + if (IS_DG1(i915)) { + if (WARN_ON(phys_base < i915->dsm.start)) + return NULL; + + phys_base -= i915->dsm.start; + } + obj = i915_gem_object_create_region_at(i915->mm.stolen_region, - base, size, 0); + phys_base, size, 0); if (IS_ERR(obj)) return NULL; -- 2.34.1