mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-25 10:27:05 +08:00
d81c03f05e
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
157 lines
6.1 KiB
Diff
157 lines
6.1 KiB
Diff
From 7ef11bf91aaee2b30697617dc5c0289803ff3fb3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>
|
|
Date: Fri, 6 Dec 2024 12:39:09 -0300
|
|
Subject: [PATCH] drm/v3d: Fix miscellaneous documentation errors
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 4ee06e3b6120 upstream.
|
|
This commit fixes several miscellaneous documentation errors. Mostly,
|
|
delete/update comments that are outdated or are leftovers from past code
|
|
changes. Apart from that, remove double-spaces in several comments.
|
|
|
|
Signed-off-by: Maíra Canal <mcanal@igalia.com>
|
|
Acked-by: Iago Toral Quiroga <itoral@igalia.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20241206153908.62429-1-mcanal@igalia.com
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_bo.c | 4 ----
|
|
drivers/gpu/drm/v3d/v3d_mmu.c | 8 ++++----
|
|
drivers/gpu/drm/v3d/v3d_performance_counters.h | 12 +++++-------
|
|
drivers/gpu/drm/v3d/v3d_sched.c | 12 ++++++------
|
|
drivers/gpu/drm/v3d/v3d_submit.c | 9 +++++----
|
|
5 files changed, 20 insertions(+), 25 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_bo.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
|
|
@@ -13,10 +13,6 @@
|
|
* Display engines requiring physically contiguous allocations should
|
|
* look into Mesa's "renderonly" support (as used by the Mesa pl111
|
|
* driver) for an example of how to integrate with V3D.
|
|
- *
|
|
- * Long term, we should support evicting pages from the MMU when under
|
|
- * memory pressure (thus the v3d_bo_get_pages() refcounting), but
|
|
- * that's not a high priority since our systems tend to not have swap.
|
|
*/
|
|
|
|
#include <linux/dma-buf.h>
|
|
--- a/drivers/gpu/drm/v3d/v3d_mmu.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_mmu.c
|
|
@@ -4,7 +4,7 @@
|
|
/**
|
|
* DOC: Broadcom V3D MMU
|
|
*
|
|
- * The V3D 3.x hardware (compared to VC4) now includes an MMU. It has
|
|
+ * The V3D 3.x hardware (compared to VC4) now includes an MMU. It has
|
|
* a single level of page tables for the V3D's 4GB address space to
|
|
* map to AXI bus addresses, thus it could need up to 4MB of
|
|
* physically contiguous memory to store the PTEs.
|
|
@@ -15,14 +15,14 @@
|
|
*
|
|
* To protect clients from each other, we should use the GMP to
|
|
* quickly mask out (at 128kb granularity) what pages are available to
|
|
- * each client. This is not yet implemented.
|
|
+ * each client. This is not yet implemented.
|
|
*/
|
|
|
|
#include "v3d_drv.h"
|
|
#include "v3d_regs.h"
|
|
|
|
-/* Note: All PTEs for the 1MB superpage must be filled with the
|
|
- * superpage bit set.
|
|
+/* Note: All PTEs for the 64KB bigpage or 1MB superpage must be filled
|
|
+ * with the bigpage/superpage bit set.
|
|
*/
|
|
#define V3D_PTE_SUPERPAGE BIT(31)
|
|
#define V3D_PTE_BIGPAGE BIT(30)
|
|
--- a/drivers/gpu/drm/v3d/v3d_performance_counters.h
|
|
+++ b/drivers/gpu/drm/v3d/v3d_performance_counters.h
|
|
@@ -2,11 +2,12 @@
|
|
/*
|
|
* Copyright (C) 2024 Raspberry Pi
|
|
*/
|
|
+
|
|
#ifndef V3D_PERFORMANCE_COUNTERS_H
|
|
#define V3D_PERFORMANCE_COUNTERS_H
|
|
|
|
-/* Holds a description of a given performance counter. The index of performance
|
|
- * counter is given by the array on v3d_performance_counter.h
|
|
+/* Holds a description of a given performance counter. The index of
|
|
+ * performance counter is given by the array on `v3d_performance_counter.c`.
|
|
*/
|
|
struct v3d_perf_counter_desc {
|
|
/* Category of the counter */
|
|
@@ -20,15 +21,12 @@ struct v3d_perf_counter_desc {
|
|
};
|
|
|
|
struct v3d_perfmon_info {
|
|
- /*
|
|
- * Different revisions of V3D have different total number of
|
|
+ /* Different revisions of V3D have different total number of
|
|
* performance counters.
|
|
*/
|
|
unsigned int max_counters;
|
|
|
|
- /*
|
|
- * Array of counters valid for the platform.
|
|
- */
|
|
+ /* Array of counters valid for the platform. */
|
|
const struct v3d_perf_counter_desc *counters;
|
|
};
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_sched.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
|
|
@@ -5,16 +5,16 @@
|
|
* DOC: Broadcom V3D scheduling
|
|
*
|
|
* The shared DRM GPU scheduler is used to coordinate submitting jobs
|
|
- * to the hardware. Each DRM fd (roughly a client process) gets its
|
|
- * own scheduler entity, which will process jobs in order. The GPU
|
|
- * scheduler will round-robin between clients to submit the next job.
|
|
+ * to the hardware. Each DRM fd (roughly a client process) gets its
|
|
+ * own scheduler entity, which will process jobs in order. The GPU
|
|
+ * scheduler will schedule the clients with a FIFO scheduling algorithm.
|
|
*
|
|
* For simplicity, and in order to keep latency low for interactive
|
|
* jobs when bulk background jobs are queued up, we submit a new job
|
|
* to the HW only when it has completed the last one, instead of
|
|
- * filling up the CT[01]Q FIFOs with jobs. Similarly, we use
|
|
- * drm_sched_job_add_dependency() to manage the dependency between bin and
|
|
- * render, instead of having the clients submit jobs using the HW's
|
|
+ * filling up the CT[01]Q FIFOs with jobs. Similarly, we use
|
|
+ * `drm_sched_job_add_dependency()` to manage the dependency between bin
|
|
+ * and render, instead of having the clients submit jobs using the HW's
|
|
* semaphores to interlock between them.
|
|
*/
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_submit.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_submit.c
|
|
@@ -52,10 +52,11 @@ v3d_clock_up_put(struct v3d_dev *v3d)
|
|
}
|
|
|
|
/* Takes the reservation lock on all the BOs being referenced, so that
|
|
- * at queue submit time we can update the reservations.
|
|
+ * we can attach fences and update the reservations after pushing the job
|
|
+ * to the queue.
|
|
*
|
|
* We don't lock the RCL the tile alloc/state BOs, or overflow memory
|
|
- * (all of which are on exec->unref_list). They're entirely private
|
|
+ * (all of which are on render->unref_list). They're entirely private
|
|
* to v3d, so we don't attach dma-buf fences to them.
|
|
*/
|
|
static int
|
|
@@ -96,11 +97,11 @@ fail:
|
|
* @bo_count: Number of GEM handles passed in
|
|
*
|
|
* The command validator needs to reference BOs by their index within
|
|
- * the submitted job's BO list. This does the validation of the job's
|
|
+ * the submitted job's BO list. This does the validation of the job's
|
|
* BO list and reference counting for the lifetime of the job.
|
|
*
|
|
* Note that this function doesn't need to unreference the BOs on
|
|
- * failure, because that will happen at v3d_exec_cleanup() time.
|
|
+ * failure, because that will happen at `v3d_job_free()`.
|
|
*/
|
|
static int
|
|
v3d_lookup_bos(struct drm_device *dev,
|