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 3666DCFD34D for ; Fri, 11 Oct 2024 11:19:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A6A3510EAC5; Fri, 11 Oct 2024 11:19:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mrzTv4ZD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41BB310EAC5 for ; Fri, 11 Oct 2024 11:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728645548; x=1760181548; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=tb/AKCZTZ7StZwAXhBpsPd0RFKwWv4rBCAopOKOmgBo=; b=mrzTv4ZDhxQK1iprKdT2L8zlPEiVikuiaKgR6DW+n88yspLMUtU30Rbc OCZJdYQCBQlwx0fPJzJSLs47f+aGt1ZmM31zPEMbQpK//xOgrvkcbEA87 WwQN6sOOobfBMlvu/kl8DaRRxtIk8z8qw8qRIVEbgZN4jHTLwLg5LLyJO RDc+zZI9GtQbNESXfl2etilDKzHgWb7VJC2UtiS224ZxQiM7IQ6KIyKU7 /pxLNWWs3rlvNI6BiSUlZWye/j3Yy/TZXt7yGNxL9tJO4ew85DohKhYBO 2TMCpeaPJIQra9C7zxuBMbvzYGwLf1jaE+sUt1Qb4BvuRrvpl5bTrTcUG g==; X-CSE-ConnectionGUID: dnyIO8DKQh2hFmRccOYrcw== X-CSE-MsgGUID: f27v1YN2TB2OOmqve0Seiw== X-IronPort-AV: E=McAfee;i="6700,10204,11221"; a="31741957" X-IronPort-AV: E=Sophos;i="6.11,195,1725346800"; d="scan'208";a="31741957" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2024 04:19:08 -0700 X-CSE-ConnectionGUID: aXCBuGYqSH2Y0CjWLpogmg== X-CSE-MsgGUID: LFeuKHMfTYSej422mdVczw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,195,1725346800"; d="scan'208";a="81403646" Received: from mwiniars-desk2.ger.corp.intel.com (HELO localhost) ([10.245.246.178]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2024 04:19:03 -0700 From: Jani Nikula To: Jocelyn Falempe , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , John Ogness , Javier Martinez Canillas , "Guilherme G . Piccoli" , bluescreen_avenger@verizon.net, Caleb Connolly , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jocelyn Falempe Subject: Re: [PATCH v4 7/7] drm/log: Add integer scaling support In-Reply-To: <20241011105526.615812-8-jfalempe@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20241011105526.615812-1-jfalempe@redhat.com> <20241011105526.615812-8-jfalempe@redhat.com> Date: Fri, 11 Oct 2024 14:18:57 +0300 Message-ID: <8734l26g66.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, 11 Oct 2024, Jocelyn Falempe wrote: > Add a module parameter, to increase the font size for HiDPI screen. > Even with CONFIG_FONT_TER16x32, it can still be a bit small to read. > In this case, adding drm_log.scale=2 to your kernel command line will > double the character size. > > Signed-off-by: Jocelyn Falempe > --- > drivers/gpu/drm/drm_log.c | 27 ++++++++++++++++++--------- > 1 file changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/drm_log.c b/drivers/gpu/drm/drm_log.c > index 07d151300146..e44c10819bd0 100644 > --- a/drivers/gpu/drm/drm_log.c > +++ b/drivers/gpu/drm/drm_log.c > @@ -25,6 +25,10 @@ MODULE_AUTHOR("Jocelyn Falempe"); > MODULE_DESCRIPTION("DRM boot logger"); > MODULE_LICENSE("GPL"); > > +static uint scale = 1; Drive-by nit, please use regular types instead of sysv "uint". BR, Jani. > +module_param(scale, uint, 0444); > +MODULE_PARM_DESC(scale, "Integer scaling factor for drm_log, default is 1"); > + > /** > * DOC: overview > * > @@ -38,6 +42,8 @@ struct drm_log_scanout { > const struct font_desc *font; > u32 rows; > u32 columns; > + u32 scaled_font_h; > + u32 scaled_font_w; > u32 line; > u32 format; > u32 px_width; > @@ -67,7 +73,7 @@ static struct drm_log *console_to_drm_log(struct console *con) > > static void drm_log_blit(struct iosys_map *dst, unsigned int dst_pitch, > const u8 *src, unsigned int src_pitch, > - u32 height, u32 width, u32 scale, u32 px_width, u32 color) > + u32 height, u32 width, u32 px_width, u32 color) > { > switch (px_width) { > case 2: > @@ -87,7 +93,7 @@ static void drm_log_blit(struct iosys_map *dst, unsigned int dst_pitch, > static void drm_log_clear_line(struct drm_log_scanout *scanout, u32 line) > { > struct drm_framebuffer *fb = scanout->buffer->fb; > - unsigned long height = scanout->font->height; > + unsigned long height = scanout->scaled_font_h; > struct iosys_map map; > struct drm_rect r = DRM_RECT_INIT(0, line * height, fb->width, height); > > @@ -107,8 +113,8 @@ static void drm_log_draw_line(struct drm_log_scanout *scanout, const char *s, > size_t font_pitch = DIV_ROUND_UP(font->width, 8); > const u8 *src; > u32 px_width = fb->format->cpp[0]; > - struct drm_rect r = DRM_RECT_INIT(0, scanout->line * font->height, > - fb->width, (scanout->line + 1) * font->height); > + struct drm_rect r = DRM_RECT_INIT(0, scanout->line * scanout->scaled_font_h, > + fb->width, (scanout->line + 1) * scanout->scaled_font_h); > u32 i; > > if (drm_client_buffer_vmap_local(scanout->buffer, &map)) > @@ -118,9 +124,10 @@ static void drm_log_draw_line(struct drm_log_scanout *scanout, const char *s, > for (i = 0; i < len && i < scanout->columns; i++) { > u32 color = (i < prefix_len) ? scanout->prefix_color : scanout->front_color; > src = drm_draw_get_char_bitmap(font, s[i], font_pitch); > - drm_log_blit(&map, fb->pitches[0], src, font_pitch, font->height, font->width, > - 1, px_width, color); > - iosys_map_incr(&map, font->width * px_width); > + drm_log_blit(&map, fb->pitches[0], src, font_pitch, > + scanout->scaled_font_h, scanout->scaled_font_w, > + px_width, color); > + iosys_map_incr(&map, scanout->scaled_font_w * px_width); > } > > scanout->line++; > @@ -205,8 +212,10 @@ static int drm_log_setup_modeset(struct drm_client_dev *client, > return -ENOMEM; > } > mode_set->fb = scanout->buffer->fb; > - scanout->rows = height / scanout->font->height; > - scanout->columns = width / scanout->font->width; > + scanout->scaled_font_h = scanout->font->height * scale; > + scanout->scaled_font_w = scanout->font->width * scale; > + scanout->rows = height / scanout->scaled_font_h; > + scanout->columns = width / scanout->scaled_font_w; > scanout->front_color = drm_draw_color_from_xrgb8888(0xffffff, format); > scanout->prefix_color = drm_draw_color_from_xrgb8888(0x4e9a06, format); > return 0; -- Jani Nikula, Intel