From nobody Tue Feb 10 17:13:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651678742743350.31506206250606; Wed, 4 May 2022 08:39:02 -0700 (PDT) Received: from localhost ([::1]:58344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmH5h-00019t-Dv for importer@patchew.org; Wed, 04 May 2022 11:39:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmH48-0007Zw-FP for qemu-devel@nongnu.org; Wed, 04 May 2022 11:37:24 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmH46-0008S4-UY for qemu-devel@nongnu.org; Wed, 04 May 2022 11:37:24 -0400 Received: from [2a00:23c4:8ba4:3700:6895:4d68:6f22:ca1c] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nmH39-0004bM-8c; Wed, 04 May 2022 16:36:27 +0100 From: Mark Cave-Ayland To: deller@gmx.de, svens@stackframe.org, qemu-devel@nongnu.org Date: Wed, 4 May 2022 16:37:06 +0100 Message-Id: <20220504153708.10352-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220504153708.10352-1-mark.cave-ayland@ilande.co.uk> References: <20220504153708.10352-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:3700:6895:4d68:6f22:ca1c X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/3] artist: checkpatch and newline style fixes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1651678744477100003 Content-Type: text/plain; charset="utf-8" Ensure that subsequent patches do not cause checkpatch to fail and also tid= y up extra/missing newlines. Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell --- hw/display/artist.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 8e121bb0b4..be92113494 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -211,8 +211,9 @@ static void artist_invalidate_lines(struct vram_buffer = *buf, int start =3D starty * buf->width; int size; =20 - if (starty + height > buf->height) + if (starty + height > buf->height) { height =3D buf->height - starty; + } =20 size =3D height * buf->width; =20 @@ -321,8 +322,9 @@ static void artist_get_cursor_pos(ARTISTState *s, int *= x, int *y) } =20 lx =3D artist_get_x(s->cursor_pos); - if (lx < offset) + if (lx < offset) { offset =3D lx; + } *x =3D (lx - offset) / 2; =20 *y =3D 1146 - artist_get_y(s->cursor_pos); @@ -343,6 +345,7 @@ static void artist_get_cursor_pos(ARTISTState *s, int *= x, int *y) static void artist_invalidate_cursor(ARTISTState *s) { int x, y; + artist_get_cursor_pos(s, &x, &y); artist_invalidate_lines(&s->vram_buffer[ARTIST_BUFFER_AP], y, s->cursor_height); @@ -470,10 +473,9 @@ static void draw_line(ARTISTState *s, =20 if ((x1 >=3D buf->width && x2 >=3D buf->width) || (y1 >=3D buf->height && y2 >=3D buf->height)) { - return; + return; } =20 - if (update_start) { s->vram_start =3D (x2 << 16) | y2; } @@ -553,15 +555,15 @@ static void draw_line(ARTISTState *s, x++; } while (x <=3D x2 && (max_pix =3D=3D -1 || --max_pix > 0)); =20 - if (c1) + if (c1) { artist_invalidate_lines(buf, x1, x2 - x1); - else + } else { artist_invalidate_lines(buf, y1 > y2 ? y2 : y1, x2 - x1); + } } =20 static void draw_line_pattern_start(ARTISTState *s) { - int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->blockmove_size); @@ -574,7 +576,6 @@ static void draw_line_pattern_start(ARTISTState *s) =20 static void draw_line_pattern_next(ARTISTState *s) { - int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->blockmove_size); @@ -589,7 +590,6 @@ static void draw_line_pattern_next(ARTISTState *s) =20 static void draw_line_size(ARTISTState *s, bool update_start) { - int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->line_size); @@ -600,7 +600,6 @@ static void draw_line_size(ARTISTState *s, bool update_= start) =20 static void draw_line_xy(ARTISTState *s, bool update_start) { - int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int sizex =3D artist_get_x(s->blockmove_size); @@ -650,7 +649,6 @@ static void draw_line_xy(ARTISTState *s, bool update_st= art) =20 static void draw_line_end(ARTISTState *s, bool update_start) { - int startx =3D artist_get_x(s->vram_start); int starty =3D artist_get_y(s->vram_start); int endx =3D artist_get_x(s->line_end); @@ -835,6 +833,7 @@ static void artist_vram_write(void *opaque, hwaddr addr= , uint64_t val, unsigned size) { ARTISTState *s =3D opaque; + s->vram_char_y =3D 0; trace_artist_vram_write(size, addr, val); vram_bit_write(opaque, addr, 0, val, size); @@ -1244,7 +1243,6 @@ static void artist_update_display(void *opaque) DisplaySurface *surface =3D qemu_console_surface(s->con); int first =3D 0, last; =20 - framebuffer_update_display(surface, &s->fbsection, s->width, s->height, s->width, s->width * 4, 0, 0, artist_draw_l= ine, s, &first, &last); @@ -1258,6 +1256,7 @@ static void artist_invalidate(void *opaque) { ARTISTState *s =3D ARTIST(opaque); struct vram_buffer *buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; + memory_region_set_dirty(&buf->mr, 0, buf->size); } =20 --=20 2.20.1