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 13DB4C02194 for ; Tue, 4 Feb 2025 11:25:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D488710E5F7; Tue, 4 Feb 2025 11:25:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b="RhgGnpC6"; dkim-atps=neutral Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A76D10E5F7 for ; Tue, 4 Feb 2025 11:25:33 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43622267b2eso54554525e9.0 for ; Tue, 04 Feb 2025 03:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20230601.gappssmtp.com; s=20230601; t=1738668332; x=1739273132; darn=lists.freedesktop.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=AkGxQJsxFoKyFcByP0eCjMi8WPcyaxJF+z7Eeu0hFLI=; b=RhgGnpC6pkRiTgtfLbQkkirTVbMnYT70iaBhdokhmdp1s9ZxLyk7b1wytr9LRFfL77 xlAf+DrEKTPGtrySV8og4rF9toQQfyCDMFn+NMnw4jbfRCv1S0BD+8i2CGyObHMBBgwA y2Oy61m1hm3Xiwe/vl5l4c4mBP8+yr0HaO84HDwfZXsthEEnbwWYzg5Ut7K/9eNMrakV XD0YAhleg2MlPaXGACtZ+b7viXH5bx+kC/c+RtFzLiH4LX9B4tOPQXzy9EZXVaGjvETh bPTv6l569NDg34ALCj/sXrKFqiJCfFGZ0DVu4X48Q2Vwq//GpboZAq/o/BYpm4zbb1K9 BKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738668332; x=1739273132; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AkGxQJsxFoKyFcByP0eCjMi8WPcyaxJF+z7Eeu0hFLI=; b=i+dnrlWP6gmLkRtnW9ka4Ab1U+e647gQueaKOOTAQ2JHfs8vHzm/P3NaA7ddO8Ki7Y MFAymY0qmUo6ex7NxsHDZqb10vqtBDNZpvd/8IX9kXdkRwaErnU3kjXTtyN+mK1u0RDv 14POSpcaw7B3/yd2wlY1k8O+ZS06JgXvv7zVXv4RGBWCyTs+quqJWbqICyX3F14loI76 PQtZdVtukTG/IQI4PbZTfINvHr5ljd/VmGhKLpODdxORKs087FH7tR2elMQuYuaNTc1o +91MMtKZAbLtKcr9wCLBKKKP98s+3NtVIClwBr9V4uTJ/QEly5Ay7KhN2nGtHvXgHHai MAAg== X-Forwarded-Encrypted: i=1; AJvYcCXbE4TRpJI/FXbfScSUgptTicT/AffTenJFiqPZoWm9FQosExwyTbvuCTqNNBg1pJQ4lnpl1QT6FQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0YxL4CytyZianPg/DLd523UWgkMt5J220ZuT60V9EWBHJRQgpn1L SqmqRq82aVuuIJOU/P/rSMyLoX8nN224DZn7B4CiMk9+j1LTcLTrPAXMallw07U= X-Gm-Gg: ASbGnctyI9qU7wxiXn9utZ15w7kNozHHEMUFNU+bQl3FzMJsXUsNVpJrKuNPVKlm+wy NMqH8j2xGOurJE6iWbeNBGYY+7vY84JhgW1hBbyglCNdJ0PGGdFVemYxYwya0adWnWTsfDx+k40 n+Ls1Z0j8+IaQTVzlP7lHQxCcKw5uiIGB60fKwdoLVL0xCJ78jISlwL/ZoQoDZ0Pp9gqx8ugEu5 jZtPHxsD8gPxHF2zITznFQxGjt8xfvCbK8J6tBy0LZHREDN8ngf9EHf7cBOnDdinJVEydHRsbZn U5LyfxLKyi0c4rRCOoyTBH1wjpsw+4c= X-Google-Smtp-Source: AGHT+IGMZHfGfN2zVXOgS6qdXW4bu8B9oeAaoygrURLxZg4YzCa9m9UBZ2pYeT9aG32yPCWdIusb0w== X-Received: by 2002:a05:6000:194b:b0:38a:418e:1171 with SMTP id ffacd0b85a97d-38c52097117mr14728969f8f.37.1738668331585; Tue, 04 Feb 2025 03:25:31 -0800 (PST) Received: from [192.168.0.101] ([90.241.98.187]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438e23de772sm185056405e9.13.2025.02.04.03.25.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 03:25:31 -0800 (PST) Message-ID: <64decd28-e020-4a53-9766-7d57a5137c86@ursulin.net> Date: Tue, 4 Feb 2025 11:25:30 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] drm/xe/display: Unify display page table mapping To: Juha-Pekka Heikkila , intel-xe@lists.freedesktop.org References: <20250114180403.896587-1-juhapekka.heikkila@gmail.com> <20250114180403.896587-2-juhapekka.heikkila@gmail.com> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <20250114180403.896587-2-juhapekka.heikkila@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 14/01/2025 18:04, Juha-Pekka Heikkila wrote: > Unify writing of remapped and straight DPTs. Take out writing of > rotated DPT since Xe doesn't support any platform that does > 90 degree rotated framebuffers. Consider giving my series which fixes AuxCSS a look instead? Given there is external interest to have all that work on ADL-P. I could respin with rotated cleaned up in a similar fashion I did for remapped. Maintenance cost is minimal since it is all very contained. Regards, Tvrtko > Signed-off-by: Juha-Pekka Heikkila > --- > drivers/gpu/drm/xe/display/xe_fb_pin.c | 141 +++++++++---------------- > 1 file changed, 48 insertions(+), 93 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c > index c28885316986..70322f28eee5 100644 > --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c > +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c > @@ -14,66 +14,44 @@ > #include "xe_ggtt.h" > #include "xe_pm.h" > > -static void > -write_dpt_rotated(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs, u32 bo_ofs, > - u32 width, u32 height, u32 src_stride, u32 dst_stride) > +static void encode_and_write_pte(struct xe_bo *bo, struct iosys_map *map, > + u32 *ofs, u32 src_idx, struct xe_device *xe) > { > - struct xe_device *xe = xe_bo_device(bo); > struct xe_ggtt *ggtt = xe_device_get_root_tile(xe)->mem.ggtt; > - u32 column, row; > - > - /* TODO: Maybe rewrite so we can traverse the bo addresses sequentially, > - * by writing dpt/ggtt in a different order? > - */ > - > - for (column = 0; column < width; column++) { > - u32 src_idx = src_stride * (height - 1) + column + bo_ofs; > - > - for (row = 0; row < height; row++) { > - u64 pte = ggtt->pt_ops->pte_encode_bo(bo, src_idx * XE_PAGE_SIZE, > - xe->pat.idx[XE_CACHE_NONE]); > - > - iosys_map_wr(map, *dpt_ofs, u64, pte); > - *dpt_ofs += 8; > - src_idx -= src_stride; > - } > - > - /* The DE ignores the PTEs for the padding tiles */ > - *dpt_ofs += (dst_stride - height) * 8; > - } > - > - /* Align to next page */ > - *dpt_ofs = ALIGN(*dpt_ofs, 4096); > + u64 pte = ggtt->pt_ops->pte_encode_bo(bo, src_idx * XE_PAGE_SIZE, > + xe->pat.idx[XE_CACHE_NONE]); > + iosys_map_wr(map, *ofs, u64, pte); > + *ofs += 8; > } > > -static void > -write_dpt_remapped(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs, > - u32 bo_ofs, u32 width, u32 height, u32 src_stride, > - u32 dst_stride) > +static void write_dpt(struct xe_bo *bo, struct iosys_map *map, u32 *dpt_ofs, > + const struct intel_remapped_plane_info *plane, > + enum i915_gtt_view_type type) > { > struct xe_device *xe = xe_bo_device(bo); > - struct xe_ggtt *ggtt = xe_device_get_root_tile(xe)->mem.ggtt; > - u64 (*pte_encode_bo)(struct xe_bo *bo, u64 bo_offset, u16 pat_index) > - = ggtt->pt_ops->pte_encode_bo; > - u32 column, row; > - > - for (row = 0; row < height; row++) { > - u32 src_idx = src_stride * row + bo_ofs; > - > - for (column = 0; column < width; column++) { > - iosys_map_wr(map, *dpt_ofs, u64, > - pte_encode_bo(bo, src_idx * XE_PAGE_SIZE, > - xe->pat.idx[XE_CACHE_NONE])); > - > - *dpt_ofs += 8; > - src_idx++; > + const u32 dpt_even = (plane->dst_stride - plane->width) * 8; > + const u32 dest_width = plane->width; > + const u32 dest_height = plane->height; > + u32 src_idx; > + > + for (u32 row = 0; row < dest_height; ++row) { > + for (u32 column = 0; column < dest_width; ++column) { > + switch (type) { > + case I915_GTT_VIEW_NORMAL: > + src_idx = plane->offset + column; > + break; > + case I915_GTT_VIEW_REMAPPED: > + src_idx = plane->offset + > + row * plane->src_stride + column; > + break; > + default: > + WARN(1, "Unsupported GTT view type: %d", type); > + return; > + } > + encode_and_write_pte(bo, map, dpt_ofs, src_idx, xe); > } > - > - /* The DE ignores the PTEs for the padding tiles */ > - *dpt_ofs += (dst_stride - width) * 8; > + *dpt_ofs += dpt_even; > } > - > - /* Align to next page */ > *dpt_ofs = ALIGN(*dpt_ofs, 4096); > } > > @@ -125,59 +103,36 @@ static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb, > { > struct xe_device *xe = to_xe_device(fb->base.dev); > struct xe_tile *tile0 = xe_device_get_root_tile(xe); > - struct xe_ggtt *ggtt = tile0->mem.ggtt; > struct drm_gem_object *obj = intel_fb_bo(&fb->base); > struct xe_bo *bo = gem_to_xe_bo(obj), *dpt; > u32 dpt_size, size = bo->ttm.base.size; > + const struct intel_remapped_plane_info *plane; > + u32 i, plane_count, dpt_ofs = 0; > + struct intel_remapped_plane_info normal_plane; > > - if (view->type == I915_GTT_VIEW_NORMAL) > + if (view->type == I915_GTT_VIEW_NORMAL) { > dpt_size = ALIGN(size / XE_PAGE_SIZE * 8, XE_PAGE_SIZE); > - else if (view->type == I915_GTT_VIEW_REMAPPED) > - dpt_size = ALIGN(intel_remapped_info_size(&fb->remapped_view.gtt.remapped) * 8, > - XE_PAGE_SIZE); > - else > - /* display uses 4K tiles instead of bytes here, convert to entries.. */ > - dpt_size = ALIGN(intel_rotation_info_size(&view->rotated) * 8, > + normal_plane.offset = 0; > + normal_plane.width = size / XE_PAGE_SIZE; > + normal_plane.height = 1; > + normal_plane.src_stride = size / XE_PAGE_SIZE; > + normal_plane.dst_stride = size / XE_PAGE_SIZE; > + plane = &normal_plane; > + plane_count = 1; > + } else { > + dpt_size = ALIGN(intel_remapped_info_size(&view->remapped) * 8, > XE_PAGE_SIZE); > + plane = view->remapped.plane; > + plane_count = ARRAY_SIZE(view->remapped.plane); > + } > > dpt = xe_alloc_dpt_bo(xe, tile0, dpt_size, physical_alignment); > > if (IS_ERR(dpt)) > return PTR_ERR(dpt); > > - if (view->type == I915_GTT_VIEW_NORMAL) { > - u32 x; > - > - for (x = 0; x < size / XE_PAGE_SIZE; x++) { > - u64 pte = ggtt->pt_ops->pte_encode_bo(bo, x * XE_PAGE_SIZE, > - xe->pat.idx[XE_CACHE_NONE]); > - > - iosys_map_wr(&dpt->vmap, x * 8, u64, pte); > - } > - } else if (view->type == I915_GTT_VIEW_REMAPPED) { > - const struct intel_remapped_info *remap_info = &view->remapped; > - u32 i, dpt_ofs = 0; > - > - for (i = 0; i < ARRAY_SIZE(remap_info->plane); i++) > - write_dpt_remapped(bo, &dpt->vmap, &dpt_ofs, > - remap_info->plane[i].offset, > - remap_info->plane[i].width, > - remap_info->plane[i].height, > - remap_info->plane[i].src_stride, > - remap_info->plane[i].dst_stride); > - > - } else { > - const struct intel_rotation_info *rot_info = &view->rotated; > - u32 i, dpt_ofs = 0; > - > - for (i = 0; i < ARRAY_SIZE(rot_info->plane); i++) > - write_dpt_rotated(bo, &dpt->vmap, &dpt_ofs, > - rot_info->plane[i].offset, > - rot_info->plane[i].width, > - rot_info->plane[i].height, > - rot_info->plane[i].src_stride, > - rot_info->plane[i].dst_stride); > - } > + for (i = 0; i < plane_count; i++) > + write_dpt(bo, &dpt->vmap, &dpt_ofs, &plane[i], view->type); > > vma->dpt = dpt; > vma->node = dpt->ggtt_node[tile0->id];