From patchwork Tue Nov 8 04:26:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1701113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=fCm3ArpX; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N5w6s2RwBz1yqS for ; Tue, 8 Nov 2022 15:27:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1osGCc-0003ox-AF; Tue, 08 Nov 2022 04:27:10 +0000 Received: from mail-pj1-f49.google.com ([209.85.216.49]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1osGCU-0003Du-JS for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 04:27:02 +0000 Received: by mail-pj1-f49.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so11945021pjs.4 for ; Mon, 07 Nov 2022 20:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=TjO2aAHhKF98qAZmnJKS1K0G+OJcNlWS4nAcAoFv1Dg=; b=fCm3ArpX5EY0CRtVnHOYbTNCLzGuGuJZZYioGraP+gY2uUMJRBx1d3KG1HoRppOvS/ hMaSUroNOFUq6SFJhEnq37vRwGXhfMRuejY+XJvSy+pEancaC3fDx9Tw8TMWTH4lcuRm 3DLyu/DShYk1XGYE4dD66Un2qhFuFcNW/GR9WUFYcpuklSqIkaTy0rgt7KF1UR/YiMOh fpFCYElD2GY9R119+WbNUZPtMqlmj1VGdOTPNVMa7tKPXdvRXwlwnswIhhCRKHhmET3U IHNNM07L9kBqK76vQ6a/7cUjXqlEIQUNOl4Ibg5U4ALNMyIYorKseujTxJuqLUbXISUs I9Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TjO2aAHhKF98qAZmnJKS1K0G+OJcNlWS4nAcAoFv1Dg=; b=hd6BiKCA+PPfCHlAvJOAJ7DhLpu0SSiI9zq2Oqb3UlYr/EZ443UUBO/k3bsM1stYOw KAQXzdwFv097fA6ketBFiyLNVjaRLeO/F8kzL/HJkOr2FiQe4QYZdb1r4xS4odnJVsjV ZycRxolU39bKo6KVmDeHTuWYkVGjnS4CVm3fdgnfX246XjNwNqMFWtfDGwbRzlqsjEoM 2sEJb2kdaPjYM8HR1k1FSjz+GU3oYCbxC8lOEjKCVYdGo5xMair5lkHo5W7C9YMgO8NR 0tqrzXoroAjlVLlI/TohPqjxQRHeun/TUymtnCgHFF+uLJ3KkfK+lNWahdUb25/7+W4Z bd+w== X-Gm-Message-State: ACrzQf1VHtivu54SOPUFy0OMw+vVAenmQ86M51CnTrBh2oVdfPJ8r0Zu 9e+pti4yktPx3ihAiOV5oPwGJ5sBlKk= X-Google-Smtp-Source: AMsMyM5fZxNRaEBR9OtjKj6OD2it4/9tge4bwHytWzdV56IjiFAs5FlBElE2IlO3cmSea58GQbIjXg== X-Received: by 2002:a17:90a:e2c6:b0:214:184f:4009 with SMTP id fr6-20020a17090ae2c600b00214184f4009mr35556323pjb.220.1667881612495; Mon, 07 Nov 2022 20:26:52 -0800 (PST) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id t8-20020a170902e84800b001785fa792f4sm5812150plg.243.2022.11.07.20.26.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 20:26:52 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][SRU][K] drm/mgag200: Optimize damage clips Date: Tue, 8 Nov 2022 12:26:32 +0800 Message-Id: <20221108042634.24176-8-acelan.kao@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108042634.24176-1-acelan.kao@canonical.com> References: <20221108042634.24176-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.49; envelope-from=acelan@gmail.com; helo=mail-pj1-f49.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jocelyn Falempe BugLink: https://launchpad.net/bugs/1995573 When there are multiple damage clips, previous code merged them into one big rectangle. As the Matrox memory is very slow, it's faster to copy each damage clip. Signed-off-by: Jocelyn Falempe Reviewed-by: Lyude Paul Reviewed-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20220504134026.283417-2-jfalempe@redhat.com (cherry picked from commit c48a363016349352dac7e66cd1e823f73bff1fc4) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/gpu/drm/mgag200/mgag200_mode.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 4ad8d62c5631..9134be52c9a7 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -865,10 +865,6 @@ mgag200_handle_damage(struct mga_device *mdev, struct drm_framebuffer *fb, dst += drm_fb_clip_offset(fb->pitches[0], fb->format, clip); drm_fb_memcpy_toio(dst, fb->pitches[0], vmap, fb, clip); - - /* Always scanout image at VRAM offset 0 */ - mgag200_set_startadd(mdev, (u32)0); - mgag200_set_offset(mdev, fb); } static void @@ -923,6 +919,10 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, mgag200_handle_damage(mdev, fb, &fullscreen, &shadow_plane_state->data[0]); + /* Always scanout image at VRAM offset 0 */ + mgag200_set_startadd(mdev, (u32)0); + mgag200_set_offset(mdev, fb); + mutex_unlock(&mdev->rmmio_lock); } @@ -979,14 +979,20 @@ mgag200_simple_display_pipe_update(struct drm_simple_display_pipe *pipe, struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state); struct drm_framebuffer *fb = state->fb; struct drm_rect damage; + struct drm_atomic_helper_damage_iter iter; if (!fb) return; mutex_lock(&mdev->rmmio_lock); - if (drm_atomic_helper_damage_merged(old_state, state, &damage)) + drm_atomic_helper_damage_iter_init(&iter, old_state, state); + drm_atomic_for_each_plane_damage(&iter, &damage) { mgag200_handle_damage(mdev, fb, &damage, &shadow_plane_state->data[0]); + } + /* Always scanout image at VRAM offset 0 */ + mgag200_set_startadd(mdev, (u32)0); + mgag200_set_offset(mdev, fb); mutex_unlock(&mdev->rmmio_lock); }