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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C26C38145 for ; Thu, 8 Sep 2022 12:55:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231971AbiIHMzD (ORCPT ); Thu, 8 Sep 2022 08:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230497AbiIHMyz (ORCPT ); Thu, 8 Sep 2022 08:54:55 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E2582ED7E for ; Thu, 8 Sep 2022 05:54:54 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C65CB1F6E6; Thu, 8 Sep 2022 12:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1662641692; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pxCPsA42d5aRC10EUmd/OSOfCOyGgvazLm4CGXkGadc=; b=THSWm4TTTsRjzn12V1zhQzMiraTVxiUoONEGE6bsMgJXnnWXKskQc5vTcMBrNTbjWxFRqv a0R3Vb2mXlpNoYXZpomM7EwtqNub/ogy8bUZkiS/vK7v1kEtxGQnKLdCJyJzWT4Bgm5zDG 0HdBCu9OqC6bpDItDQeGQBc47ads/rU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1662641692; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pxCPsA42d5aRC10EUmd/OSOfCOyGgvazLm4CGXkGadc=; b=0CS3iBKk0Va566/CXwTCmCAHEbEDLc+FOKEmsgAM1NJ2E+D0XR0WMEXZ9ft5YduTmac4xR KkcQ7lVZDOY9nmDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9645F1322C; Thu, 8 Sep 2022 12:54:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Jen4IxzmGWPpLQAAMHmgww (envelope-from ); Thu, 08 Sep 2022 12:54:52 +0000 Date: Thu, 08 Sep 2022 14:54:51 +0200 Message-ID: <87tu5iauw4.wl-tiwai@suse.de> From: Takashi Iwai To: Thomas Zimmermann Cc: Takashi Iwai , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 08/12] drm/udl: Pass rectangle directly to udl_handle_damage() In-Reply-To: References: <20220908095115.23396-1-tiwai@suse.de> <20220908095115.23396-9-tiwai@suse.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 08 Sep 2022 14:47:52 +0200, Thomas Zimmermann wrote: > > Hi > > Am 08.09.22 um 11:51 schrieb Takashi Iwai: > > Just for some code simplification. > > > > Suggested-by: Thomas Zimmermann > > Signed-off-by: Takashi Iwai > > With my comments fixed, you can add > > Acked-by: Thomas Zimmermann > > > --- > > drivers/gpu/drm/udl/udl_modeset.c | 20 +++++++++----------- > > 1 file changed, 9 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c > > index c9b837ac26a7..0142fc6a478a 100644 > > --- a/drivers/gpu/drm/udl/udl_modeset.c > > +++ b/drivers/gpu/drm/udl/udl_modeset.c > > @@ -244,14 +244,13 @@ static long udl_log_cpp(unsigned int cpp) > > static int udl_handle_damage(struct drm_framebuffer *fb, > > const struct iosys_map *map, > > - int x, int y, int width, int height) > > + struct drm_rect *clip) > > Should probably be declared const. > > > { > > struct drm_device *dev = fb->dev; > > void *vaddr = map->vaddr; /* TODO: Use mapping abstraction properly */ > > int i, ret; > > char *cmd; > > struct urb *urb; > > - struct drm_rect clip; > > int log_bpp; > > ret = udl_log_cpp(fb->format->cpp[0]); > > @@ -259,8 +258,6 @@ static int udl_handle_damage(struct drm_framebuffer *fb, > > return ret; > > log_bpp = ret; > > - drm_rect_init(&clip, x, y, width, height); > > - > > ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); > > if (ret) > > return ret; > > @@ -272,11 +269,11 @@ static int udl_handle_damage(struct drm_framebuffer *fb, > > } > > cmd = urb->transfer_buffer; > > - for (i = clip.y1; i < clip.y2; i++) { > > + for (i = clip->y1; i < clip->y2; i++) { > > const int line_offset = fb->pitches[0] * i; > > - const int byte_offset = line_offset + (clip.x1 << log_bpp); > > - const int dev_byte_offset = (fb->width * i + clip.x1) << log_bpp; > > - const int byte_width = (clip.x2 - clip.x1) << log_bpp; > > + const int byte_offset = line_offset + (clip->x1 << log_bpp); > > + const int dev_byte_offset = (fb->width * i + clip->x1) << log_bpp; > > + const int byte_width = (clip->x2 - clip->x1) << log_bpp; > > Please use drm_rect_width(clip) instead. Somehow there's already too > much code that open-codes this. > > > ret = udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, > > &cmd, byte_offset, dev_byte_offset, > > byte_width); > > @@ -329,6 +326,7 @@ udl_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, > > struct udl_device *udl = to_udl(dev); > > struct drm_display_mode *mode = &crtc_state->mode; > > struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state); > > + struct drm_rect clip; > > Better do a static init with DRM_RECT_INIT(0, 0, fb->width, > fb->height) and remove the other init call below. OK, below is the revised patch. Do you want me a full respin for v4? Takashi -- 8< -- From: Takashi Iwai Subject: [PATCH] drm/udl: Pass rectangle directly to udl_handle_damage() Just for some code simplification. Suggested-by: Thomas Zimmermann Acked-by: Thomas Zimmermann Signed-off-by: Takashi Iwai --- drivers/gpu/drm/udl/udl_modeset.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index c9b837ac26a7..d5e20bf144bc 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -244,14 +244,13 @@ static long udl_log_cpp(unsigned int cpp) static int udl_handle_damage(struct drm_framebuffer *fb, const struct iosys_map *map, - int x, int y, int width, int height) + const struct drm_rect *clip) { struct drm_device *dev = fb->dev; void *vaddr = map->vaddr; /* TODO: Use mapping abstraction properly */ int i, ret; char *cmd; struct urb *urb; - struct drm_rect clip; int log_bpp; ret = udl_log_cpp(fb->format->cpp[0]); @@ -259,8 +258,6 @@ static int udl_handle_damage(struct drm_framebuffer *fb, return ret; log_bpp = ret; - drm_rect_init(&clip, x, y, width, height); - ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); if (ret) return ret; @@ -272,11 +269,11 @@ static int udl_handle_damage(struct drm_framebuffer *fb, } cmd = urb->transfer_buffer; - for (i = clip.y1; i < clip.y2; i++) { + for (i = clip->y1; i < clip->y2; i++) { const int line_offset = fb->pitches[0] * i; - const int byte_offset = line_offset + (clip.x1 << log_bpp); - const int dev_byte_offset = (fb->width * i + clip.x1) << log_bpp; - const int byte_width = (clip.x2 - clip.x1) << log_bpp; + const int byte_offset = line_offset + (clip->x1 << log_bpp); + const int dev_byte_offset = (fb->width * i + clip->x1) << log_bpp; + const int byte_width = drm_rect_width(clip) << log_bpp; ret = udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, &cmd, byte_offset, dev_byte_offset, byte_width); @@ -329,6 +326,7 @@ udl_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, struct udl_device *udl = to_udl(dev); struct drm_display_mode *mode = &crtc_state->mode; struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state); + struct drm_rect clip = DRM_RECT_INIT(0, 0, fb->width, fb->height); char *buf; char *wrptr; int color_depth = UDL_COLOR_DEPTH_16BPP; @@ -354,7 +352,7 @@ udl_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, udl->mode_buf_len = wrptr - buf; - udl_handle_damage(fb, &shadow_plane_state->data[0], 0, 0, fb->width, fb->height); + udl_handle_damage(fb, &shadow_plane_state->data[0], &clip); /* enable display */ udl_crtc_write_mode_to_hw(crtc); @@ -396,8 +394,7 @@ udl_simple_display_pipe_update(struct drm_simple_display_pipe *pipe, return; if (drm_atomic_helper_damage_merged(old_plane_state, state, &rect)) - udl_handle_damage(fb, &shadow_plane_state->data[0], rect.x1, rect.y1, - rect.x2 - rect.x1, rect.y2 - rect.y1); + udl_handle_damage(fb, &shadow_plane_state->data[0], &rect); } static const struct drm_simple_display_pipe_funcs udl_simple_display_pipe_funcs = { -- 2.35.3