From patchwork Mon Apr 7 13:42:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jocelyn Falempe X-Patchwork-Id: 14040597 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01ED7C3601E for ; Mon, 7 Apr 2025 14:02:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1A3F6B000D; Mon, 7 Apr 2025 10:02:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC66E6B000E; Mon, 7 Apr 2025 10:02:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C68EC6B0010; Mon, 7 Apr 2025 10:02:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A3D386B000D for ; Mon, 7 Apr 2025 10:02:23 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A28B1120B20 for ; Mon, 7 Apr 2025 14:02:23 +0000 (UTC) X-FDA: 83307412566.18.0BBBE01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id C24441A0020 for ; Mon, 7 Apr 2025 14:02:21 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QWHxz4YU; spf=pass (imf19.hostedemail.com: domain of jfalempe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=jfalempe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744034541; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=O7RBa4axGhmBePDdEFsFyWJE7Ktbo1O3sCu5uta1lZ4=; b=ncDLKM5QGMMyzFRbTlGFpXIsky6rdJA9rHchRQU1ylwUj2Rz5u4EfzLSuPCZccCgfmQUhV +RZYbuWvnoy60sgoalN7+DLh8R35nnnd4GI7zE4/YKej6isNe18jAMUEamhS8ZPrsA4Oul 3YjDjykF0AsU0DrRaY4geVtVd4sBhNM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744034541; a=rsa-sha256; cv=none; b=rsgPKTQqAeTNPljqQGA0HBpHnCNenCETk3sPsuKYkq2UxM0jhQEhDyPgUn79Gywm4urfGV bv8UF7v27IeWvWINfE3ILYMehVyYBeA6SM7gsyyz+Gygjq8x7jQp9SDb/bFf4dY3BOH9kn diK2Hy7HjES1b5c/djiL3rYOIKS+gqo= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QWHxz4YU; spf=pass (imf19.hostedemail.com: domain of jfalempe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=jfalempe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744034540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O7RBa4axGhmBePDdEFsFyWJE7Ktbo1O3sCu5uta1lZ4=; b=QWHxz4YUU1XcGLsckPiYTNcef+eLlKycesNerasZzlrioPjIqFz943+XUBt2Xvdanplmcz 5xIKjV/l8wJcEdnSoP7jp9qDTq3lImGjBI0eitouHUJl2/uIgNLrlS9/0x2YyngvgDnwly xSonQhs/pLcj3ySW9a8MGJl/0bilDFI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-c9AKPgVpOvSNHt0nPkQyvQ-1; Mon, 07 Apr 2025 10:02:15 -0400 X-MC-Unique: c9AKPgVpOvSNHt0nPkQyvQ-1 X-Mimecast-MFC-AGG-ID: c9AKPgVpOvSNHt0nPkQyvQ_1744034532 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E33B7180AF65; Mon, 7 Apr 2025 14:02:11 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.175]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7BEE3192C7C3; Mon, 7 Apr 2025 14:02:06 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Ryosuke Yasuoka , Javier Martinez Canillas , Wei Yang , Andrew Morton , David Hildenbrand , John Ogness , Thomas Gleixner , linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jocelyn Falempe Subject: [PATCH v3 2/2] drm/panic: Add support to scanout buffer as array of pages Date: Mon, 7 Apr 2025 15:42:26 +0200 Message-ID: <20250407140138.162383-3-jfalempe@redhat.com> In-Reply-To: <20250407140138.162383-1-jfalempe@redhat.com> References: <20250407140138.162383-1-jfalempe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Stat-Signature: 74tukjd59oue6gzm8r73iwrgid6uqai6 X-Rspam-User: X-Rspamd-Queue-Id: C24441A0020 X-Rspamd-Server: rspam08 X-HE-Tag: 1744034541-141589 X-HE-Meta: U2FsdGVkX1+KWUea39xvFg/ARl/qWG0Gy4ME5Xe34d7fCs4S44TvPr8fhoFisbtJKDhW848mEE4bYHcDO2HT79YlSY6ljRYqik6eAros8Jht2hPww3aY2cuTzd+Emq8oX5h3+4t8Vr8iFEUY78GMbcJFyFx5cRjFq3IJJqwf8F27RZPuP88llJy3GP9sA3afW8WPi4Vu70L/+BGT2Yz/6FG87PiZ2ja6bT8DDgkb1v2m8d1PlIuv2QIpfjeC6uvTEGzBuO1YUuZ/jlqsZNiCaqjTo5Je0Na1D0dKNyTvFrjmeWeN5FqQutKMnTnoyRuuYlX37tHE8SMqrz3nFFcE2G9OroouzHc4NvaJ6BKv9/tQEij69QEfyJBlWpfJrU/AtEXxoMjwV27b2Fhv6ynJESKfChjUOj6WrS6ngnhSc8GHYKUR1/7nAYPI5yOfTfC+Ccjm9wJY2ITeRoIl1q5p3X3kiV6HR//VFqmn+HONy2AGTMMTLl5bgkSY8NnUtSIplYO2b3UM/rxzsnXKLGCK+dhrqpcdbJd0NcqNF9uuZqg3Z0ojfvD9u9FKqIUUZYJa8UPR0aIb1VKC8Mojh/73aBrfg9crsLylp0pJtvvHdlY1zVc5s4NsjY9jWcsFa0oKQ99q5mt/FjN+3iKhAEQTUqyy8FCTpeOQ8TecRtwl+g5QZJqNPWzdrDPki46FRmrvpzhmLEXytKXO0qYw4YJy53tdGXGIH/h3AT5mBQd76TpsjFfrh0/sZbO9vEXU/VezudRtcFfPVEn9498oKY7Q/LoMj/WfHtE0bO/wrmO/PBnC7uJeyOBNCLa0hepfeooGFCU45/bzNDDgsIo3PLLZyDAWvecZUetiGsHc3ZlV9V/PThWSfGZredaYxMddNa4lyWOo1LdsYwgv3NWJHJvdX6uRkZLIxs2gHEFyFrDe5VwQ5iTvOYidfka9jxFqjFQkRn6AXT4opEb2XankXQ3 yB7AHNqg 3pAS2HhGsvxsNn5oGj+RyJqT8nzqWSyG0HQKLZTFlaRH92RYVpluJiK4Ne3hC8hGMSN/xA3ib+cDJux5M8tESEbmY+lHpQ5QyVcvh6mndlMYQ9/Xn1u26HZObr4Ksgbae8FlWoXMBQurqd/BI0wQB2RSPK9HZNNbvc8mtXxEZB13ezzhw3BEma6jdWtyIcmlmJSooZajmFtBx4UkZaAPFSsl42I/4j7FNBLEe2ALKiF33jYrbvOP+5WB7o+ilemyro8iL5x5aVy/I8AxhYOeO8THBw7DDXwAFIliYu32YHQJ6NnQWjYFuJ7nrie2Kx+/3PY2AegUDZFXOd6iU+/Yie81ApjWiQtlmfJcw2HjjL0cbpsGdOV5k+vo6Cuy4CGdSzsGbadcAAcpDwXIwLHQvNv38c+fQ2GSgp8bq0uLHpc5wIEI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Some drivers like virtio-gpu, don't map the scanout buffer in the kernel. Calling vmap() in a panic handler is not safe, and writing an atomic_vmap() API is more complex than expected [1]. So instead, pass the array of pages of the scanout buffer to the panic handler, and map only one page at a time to draw the pixels. This is obviously slow, but acceptable for a panic handler. [1] https://lore.kernel.org/dri-devel/20250305152555.318159-1-ryasuoka@redhat.com/ Acked-by: Thomas Zimmermann Acked-by: Simona Vetter Signed-off-by: Jocelyn Falempe --- v3: * Replace DRM_WARN_ONCE with pr_debug_once (Simona Vetter) drivers/gpu/drm/drm_panic.c | 142 ++++++++++++++++++++++++++++++++++-- include/drm/drm_panic.h | 12 ++- 2 files changed, 147 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index ab42a2b1567d0..ed27d1ef4a9ca 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -154,6 +155,90 @@ static void drm_panic_blit_pixel(struct drm_scanout_buffer *sb, struct drm_rect sb->set_pixel(sb, clip->x1 + x, clip->y1 + y, fg_color); } +static void drm_panic_write_pixel16(void *vaddr, unsigned int offset, u16 color) +{ + u16 *p = vaddr + offset; + + *p = color; +} + +static void drm_panic_write_pixel24(void *vaddr, unsigned int offset, u32 color) +{ + u8 *p = vaddr + offset; + + *p++ = color & 0xff; + color >>= 8; + *p++ = color & 0xff; + color >>= 8; + *p = color & 0xff; +} + +static void drm_panic_write_pixel32(void *vaddr, unsigned int offset, u32 color) +{ + u32 *p = vaddr + offset; + + *p = color; +} + +static void drm_panic_write_pixel(void *vaddr, unsigned int offset, u32 color, unsigned int cpp) +{ + switch (cpp) { + case 2: + drm_panic_write_pixel16(vaddr, offset, color); + break; + case 3: + drm_panic_write_pixel24(vaddr, offset, color); + break; + case 4: + drm_panic_write_pixel32(vaddr, offset, color); + break; + default: + pr_debug_once("Can't blit with pixel width %d\n", cpp); + } +} + +/* + * The scanout buffer pages are not mapped, so for each pixel, + * use kmap_local_page_try_from_panic() to map the page, and write the pixel. + * Try to keep the map from the previous pixel, to avoid too much map/unmap. + */ +static void drm_panic_blit_page(struct page **pages, unsigned int dpitch, + unsigned int cpp, const u8 *sbuf8, + unsigned int spitch, struct drm_rect *clip, + unsigned int scale, u32 fg32) +{ + unsigned int y, x; + unsigned int page = ~0; + unsigned int height = drm_rect_height(clip); + unsigned int width = drm_rect_width(clip); + void *vaddr = NULL; + + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + if (drm_draw_is_pixel_fg(sbuf8, spitch, x / scale, y / scale)) { + unsigned int new_page; + unsigned int offset; + + offset = (y + clip->y1) * dpitch + (x + clip->x1) * cpp; + new_page = offset >> PAGE_SHIFT; + offset = offset % PAGE_SIZE; + if (new_page != page) { + if (!pages[new_page]) + continue; + if (vaddr) + kunmap_local(vaddr); + page = new_page; + vaddr = kmap_local_page_try_from_panic(pages[page]); + } + if (vaddr) + drm_panic_write_pixel(vaddr, offset, fg32, cpp); + } + } + } + if (vaddr) + kunmap_local(vaddr); +} + /* * drm_panic_blit - convert a monochrome image to a linear framebuffer * @sb: destination scanout buffer @@ -177,6 +262,10 @@ static void drm_panic_blit(struct drm_scanout_buffer *sb, struct drm_rect *clip, if (sb->set_pixel) return drm_panic_blit_pixel(sb, clip, sbuf8, spitch, scale, fg_color); + if (sb->pages) + return drm_panic_blit_page(sb->pages, sb->pitch[0], sb->format->cpp[0], + sbuf8, spitch, clip, scale, fg_color); + map = sb->map[0]; iosys_map_incr(&map, clip->y1 * sb->pitch[0] + clip->x1 * sb->format->cpp[0]); @@ -209,6 +298,35 @@ static void drm_panic_fill_pixel(struct drm_scanout_buffer *sb, sb->set_pixel(sb, clip->x1 + x, clip->y1 + y, color); } +static void drm_panic_fill_page(struct page **pages, unsigned int dpitch, + unsigned int cpp, struct drm_rect *clip, + u32 color) +{ + unsigned int y, x; + unsigned int page = ~0; + void *vaddr = NULL; + + for (y = clip->y1; y < clip->y2; y++) { + for (x = clip->x1; x < clip->x2; x++) { + unsigned int new_page; + unsigned int offset; + + offset = y * dpitch + x * cpp; + new_page = offset >> PAGE_SHIFT; + offset = offset % PAGE_SIZE; + if (new_page != page) { + if (vaddr) + kunmap_local(vaddr); + page = new_page; + vaddr = kmap_local_page_try_from_panic(pages[page]); + } + drm_panic_write_pixel(vaddr, offset, color, cpp); + } + } + if (vaddr) + kunmap_local(vaddr); +} + /* * drm_panic_fill - Fill a rectangle with a color * @sb: destination scanout buffer @@ -225,6 +343,10 @@ static void drm_panic_fill(struct drm_scanout_buffer *sb, struct drm_rect *clip, if (sb->set_pixel) return drm_panic_fill_pixel(sb, clip, color); + if (sb->pages) + return drm_panic_fill_page(sb->pages, sb->pitch[0], sb->format->cpp[0], + clip, color); + map = sb->map[0]; iosys_map_incr(&map, clip->y1 * sb->pitch[0] + clip->x1 * sb->format->cpp[0]); @@ -714,16 +836,24 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) if (!drm_panic_trylock(plane->dev, flags)) return; + ret = plane->helper_private->get_scanout_buffer(plane, &sb); + + if (ret || !drm_panic_is_format_supported(sb.format)) + goto unlock; + + /* One of these should be set, or it can't draw pixels */ + if (!sb.set_pixel && !sb.pages && iosys_map_is_null(&sb.map[0])) + goto unlock; + drm_panic_set_description(description); - ret = plane->helper_private->get_scanout_buffer(plane, &sb); + draw_panic_dispatch(&sb); + if (plane->helper_private->panic_flush) + plane->helper_private->panic_flush(plane); - if (!ret && drm_panic_is_format_supported(sb.format)) { - draw_panic_dispatch(&sb); - if (plane->helper_private->panic_flush) - plane->helper_private->panic_flush(plane); - } drm_panic_clear_description(); + +unlock: drm_panic_unlock(plane->dev, flags); } diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h index f4e1fa9ae607a..a00bf3cbf62f1 100644 --- a/include/drm/drm_panic.h +++ b/include/drm/drm_panic.h @@ -39,6 +39,16 @@ struct drm_scanout_buffer { */ struct iosys_map map[DRM_FORMAT_MAX_PLANES]; + /** + * @pages: Optional, if the scanout buffer is not mapped, set this field + * to the array of pages of the scanout buffer. The panic code will use + * kmap_local_page_try_from_panic() to map one page at a time to write + * all the pixels. This array shouldn't be allocated from the + * get_scanoutbuffer() callback. + * The scanout buffer should be in linear format. + */ + struct page **pages; + /** * @width: Width of the scanout buffer, in pixels. */ @@ -57,7 +67,7 @@ struct drm_scanout_buffer { /** * @set_pixel: Optional function, to set a pixel color on the * framebuffer. It allows to handle special tiling format inside the - * driver. + * driver. It takes precedence over the @map and @pages fields. */ void (*set_pixel)(struct drm_scanout_buffer *sb, unsigned int x, unsigned int y, u32 color);