Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2765098pxj; Sun, 23 May 2021 10:05:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzg8vq5I6tzy3qIBuXCfIFcg+VUnVK6fYpmy0p8AWVHUyM4xBcBZJZEb76zUJh6m8N2KGLa X-Received: by 2002:a6b:fb0f:: with SMTP id h15mr10444180iog.24.1621789549635; Sun, 23 May 2021 10:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621789549; cv=none; d=google.com; s=arc-20160816; b=yd+RLM6srnlc3GcCv//CNvgz9ud1V5u+bSeeVMjb7WWjEks7YKNCRZmB3x9uqbwHZw HhxBU6uKUtaAEOjC+cY5f4xp+JRRl1tZ20YW9M42d1xqPE2u7/l6/xnUVUQi+jYOncSZ Bggw6VHbNAF/+AIxHPCMhVnAL9DPIW/LazJN43aCgc2wy8HbEj+cGcTcrJK+MN5QNL/v tPU6pcG7JU47vEwaQwruZSEm+J27Xa+H5bRVwaqcUsGTEio006xRU6oz4Koz/LoG7oQC 4eqcejNYa0Bf2wKuUuRAmiszi+i5wT9aCt9Z8gWtbKrmJmxgHquXKvg4Qw98amwRpzKQ YfwQ== 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=zIP1lLRNb9jU3OHF5SjD3NfRFFf0nVWtlxGY16Qd0sY=; b=ojHbtx8oTl/sO79hChW5R60A3Hb3GnzKd9Ls+rwFdlx4w/ZPvc0v/gU1XM3+OXHMH6 Ut39GN3J1ztgoHEZGhqMdyd8/frU0+7t1+BLKHsSkW7QKi//Duurc4Jrs8wGcFIrbS5X gfmuTms3nvBYU4HnbD45PU2GJ84nLvQNs913zgpDYOEaLjqhbcQrce/GW2rAUSaRzQvJ /R7pUG5khCokl+S9Qqo6WA1ob5EeEzu4/jO8gkaC4TY156GSvC7aV7KIIxZghZc26JbW 9SA00gBbYkuR4wU582QHeIu31CSfF7rlV32RJLkjvu3ftYgPMQpc8gs9vHbn/2MKOi48 EldQ== 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 c13si12964541ilq.55.2021.05.23.10.05.33; Sun, 23 May 2021 10:05:49 -0700 (PDT) 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 S231924AbhEWRGN (ORCPT + 99 others); Sun, 23 May 2021 13:06:13 -0400 Received: from aposti.net ([89.234.176.197]:50404 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231829AbhEWRGN (ORCPT ); Sun, 23 May 2021 13:06:13 -0400 From: Paul Cercueil To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: Christoph Hellwig , list@opendingux.net, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, Paul Cercueil Subject: [PATCH v5 2/3] drm: Add and export function drm_fb_cma_sync_non_coherent Date: Sun, 23 May 2021 18:04:14 +0100 Message-Id: <20210523170415.90410-3-paul@crapouillou.net> In-Reply-To: <20210523170415.90410-1-paul@crapouillou.net> References: <20210523170415.90410-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. v3: - Only sync data if using GEM objects backed by non-coherent memory. - Use a drm_device pointer instead of device pointer in prototype v5: - Rename to drm_fb_cma_sync_non_coherent - Invert loops for better cache locality - Only sync BOs that have the non-coherent flag - Move to drm_fb_cma_helper.c to avoid circular dependency Signed-off-by: Paul Cercueil --- drivers/gpu/drm/drm_fb_cma_helper.c | 46 +++++++++++++++++++++++++++++ include/drm/drm_fb_cma_helper.h | 4 +++ 2 files changed, 50 insertions(+) diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index cb2349ad338d..69c57273b184 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -9,12 +9,14 @@ * Copyright (C) 2012 Red Hat */ +#include #include #include #include #include #include #include +#include #include /** @@ -97,3 +99,47 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, return paddr; } EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_addr); + +/** + * drm_fb_cma_sync_non_coherent - Sync GEM object to non-coherent backing + * memory + * @drm: 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_fb_cma_sync_non_coherent(struct drm_device *drm, + 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; + const struct drm_gem_cma_object *cma_obj; + unsigned int offset, i; + struct drm_rect clip; + dma_addr_t daddr; + size_t nb_bytes; + + for (i = 0; i < finfo->num_planes; i++) { + cma_obj = drm_fb_cma_get_gem_obj(state->fb, i); + if (!cma_obj->map_noncoherent) + continue; + + daddr = drm_fb_cma_get_gem_addr(state->fb, state, i); + drm_atomic_helper_damage_iter_init(&iter, old_state, state); + + drm_atomic_for_each_plane_damage(&iter, &clip) { + /* Ignore x1/x2 values, invalidate complete lines */ + offset = clip.y1 * state->fb->pitches[i]; + + nb_bytes = (clip.y2 - clip.y1) * state->fb->pitches[i]; + dma_sync_single_for_device(drm->dev, daddr + offset, + nb_bytes, DMA_TO_DEVICE); + } + } +} +EXPORT_SYMBOL_GPL(drm_fb_cma_sync_non_coherent); diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_helper.h index 795aea1d0a25..3a177632b17e 100644 --- a/include/drm/drm_fb_cma_helper.h +++ b/include/drm/drm_fb_cma_helper.h @@ -14,5 +14,9 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, struct drm_plane_state *state, unsigned int plane); +void drm_fb_cma_sync_non_coherent(struct drm_device *drm, + struct drm_plane_state *old_state, + struct drm_plane_state *state); + #endif -- 2.30.2