Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1571710pxb; Mon, 8 Mar 2021 00:26:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxH8g6ymre4rM9MmnL67IuOrwVO1Dmw6vpKdrcOIyDjgpIXpZz4cHdPw8Hd+hZvOF1p24wJ X-Received: by 2002:a17:906:a86:: with SMTP id y6mr14328534ejf.354.1615191998244; Mon, 08 Mar 2021 00:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615191998; cv=none; d=google.com; s=arc-20160816; b=liI6Fsc/E49n9G+cKT5fqfHBD7KE0FQKp5GeeEwp8dOWRqwOCPt30dtPW7rLYhe7dI CLl2lhJFKBut294pvidNL14nbaQluX8TWOirgtVZ0XFHSdljMbFIYGUgX/Sc48L8OgNW X94l0vtd+EDlKE5R6B7auZZXaSnvKcTli7hxqLU525SE55oSeLqrilz+c5ScLgUf7zd3 uDZ2twhvf0AbB19Um8y6/9Y/bYjFzyepKidSX1S0RNg14GV4D0VbSRHc4A2AnwkPVGon pWmbepAnDK0+abFkbA9LbzDX8pJKNva/aD11T3BiKWUu/a1c7CX72OwUwEUQtMgIxTyT F95g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=J412Zc0/RKmN1Q04FvElUAvf/yMotmckX5Tj9sU8raI=; b=Q3lLTQnRJIDXeS51GLxCEjG5MzFIRnZEjknuwuifuJqoUx7gIQ156H54lgRblesJII u6KPh8Fu6rZa7tB7UG2gya/XgkQEFrjUV23pMYrTdpwhKMjFAunRQiEiDppAgqWtdc/a z+DEWMg1AdjxZMotdt2Wk3w6h5EcmpqEEq8Kl1Ng9AUlcWUYdbHswSUSi09gvkL0lzX/ MEBEKAWDAVKrwTB5m0xT/iRrJNwK1A4UF+Vo2HsUyCYi0jUoXVRMGkCqjRsCW/TsykFZ 9QmHGmLc3cscbZWcQU+dBFhb/PNaV4pg1VhXU6kknEVOBYdgSHGJmCf+ydmLILzDxjtj ZVUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hk1si6522181ejb.36.2021.03.08.00.26.16; Mon, 08 Mar 2021 00:26:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232916AbhCGU3h (ORCPT + 99 others); Sun, 7 Mar 2021 15:29:37 -0500 Received: from aposti.net ([89.234.176.197]:49668 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232877AbhCGU31 (ORCPT ); Sun, 7 Mar 2021 15:29:27 -0500 From: Paul Cercueil To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: Sam Ravnborg , od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 4/5] drm: Add and export function drm_gem_cma_sync_data Date: Sun, 7 Mar 2021 20:28:34 +0000 Message-Id: <20210307202835.253907-5-paul@crapouillou.net> In-Reply-To: <20210307202835.253907-1-paul@crapouillou.net> References: <20210307202835.253907-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function can be used by drivers that use damage clips and have CMA GEM objects backed by non-coherent memory. Calling this function in a plane's .atomic_update ensures that all the data in the backing memory have been written to RAM. Signed-off-by: Paul Cercueil --- drivers/gpu/drm/drm_gem_cma_helper.c | 43 ++++++++++++++++++++++++++++ include/drm/drm_gem_cma_helper.h | 5 ++++ 2 files changed, 48 insertions(+) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index e39b0464e19d..fdae54a18670 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -18,9 +18,14 @@ #include #include +#include #include #include +#include +#include +#include #include +#include #include /** @@ -684,3 +689,41 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, return obj; } EXPORT_SYMBOL(drm_gem_cma_prime_import_sg_table_vmap); + +/** + * drm_gem_cma_sync_data - Sync GEM object to non-coherent backing memory + * @dev: DRM device + * @old_state: Old plane state + * @state: New plane state + * + * This function can be used by drivers that use damage clips and have + * CMA GEM objects backed by non-coherent memory. Calling this function + * in a plane's .atomic_update ensures that all the data in the backing + * memory have been written to RAM. + */ +void drm_gem_cma_sync_data(struct device *dev, + struct drm_plane_state *old_state, + struct drm_plane_state *state) +{ + const struct drm_format_info *finfo = state->fb->format; + struct drm_atomic_helper_damage_iter iter; + unsigned int offset, i; + struct drm_rect clip; + dma_addr_t daddr; + + drm_atomic_helper_damage_iter_init(&iter, old_state, state); + + drm_atomic_for_each_plane_damage(&iter, &clip) { + for (i = 0; i < finfo->num_planes; i++) { + daddr = drm_fb_cma_get_gem_addr(state->fb, state, i); + + /* Ignore x1/x2 values, invalidate complete lines */ + offset = clip.y1 * state->fb->pitches[i]; + + dma_sync_single_for_device(dev, daddr + offset, + (clip.y2 - clip.y1) * state->fb->pitches[i], + DMA_TO_DEVICE); + } + } +} +EXPORT_SYMBOL_GPL(drm_gem_cma_sync_data); diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h index 6a3f7e1312cc..cdd3fb456916 100644 --- a/include/drm/drm_gem_cma_helper.h +++ b/include/drm/drm_gem_cma_helper.h @@ -7,6 +7,7 @@ #include struct drm_mode_create_dumb; +struct drm_plane_state; /** * struct drm_gem_cma_object - GEM object backed by CMA memory allocations @@ -190,4 +191,8 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *drm, struct dma_buf_attachment *attach, struct sg_table *sgt); +void drm_gem_cma_sync_data(struct device *dev, + struct drm_plane_state *old_state, + struct drm_plane_state *state); + #endif /* __DRM_GEM_CMA_HELPER_H__ */ -- 2.30.1