AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3d: really fix CLE MMU errors on 7.1HW Rpi5

Browse Source 
Macro values that define values for different HW generations should
use the V3DV_X helper instead of being defined under a V3D_VERSION #if
condition.

Without this change, the original V3D_CLE_READAHEAD and
V3D_CLE_BUFFER_MIN_SIZE definitions used were only working for 4.2 HW.
For the 7.1 HW (RPi5) the 4.2 definitions were applied.

The CLE MMU errors were hidden as they were reported at dmesg as
"MMU error from client PTB (1) at 0x1884200, pte invalid" instead of
client CLE. So fixes all v3d dmesg warnings for PTB MMU errors on RPi5.

With this change we really don't need different functions per HW generation,
so we rename back file v3dx_cl.c to v3d_cl.c. As before, we can use
only the packets definitions for 4.2 HW as they use the same opcode as 7.1 HW.

Fixes: 11dce2ac81 ("v3d: fix CLE MMU errors avoiding using last bytes of CL BOs.")
Fixes: e2c624e74e ("v3d: Increase alignment to 16k on CL BO on RPi5")

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29496>
This commit is contained in:
Jose Maria Casanova Crespo
2024-05-30 20:46:31 +02:00
committed by Marge Bot
parent 07d3d55783
commit f32a258503
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/v3d/meson.build
+1 -1
View File
@@ -22,6 +22,7 @@ files_libv3d = files(
'v3d_blit.c',
'v3d_bufmgr.c',
'v3d_bufmgr.h',
'v3d_cl.c',
'v3d_cl.h',
'v3d_context.c',
'v3d_context.h',
@@ -49,7 +50,6 @@ files_per_version = files(
'v3dx_rcl.c',
'v3dx_state.c',
'v3dx_tfu.c',
'v3dx_cl.c',
)
v3d_args = ['-DV3D_BUILD_NEON']
src/gallium/drivers/v3d/v3dx_cl.c → src/gallium/drivers/v3d/v3d_cl.c
+18 -13
View File
@@ -24,6 +24,11 @@
#include "util/u_math.h"
#include "util/ralloc.h"
#include "v3d_context.h"
/* We don't expect that the packets we use in this file change across across
* hw versions, so we just explicitly set the V3D_VERSION and include
* v3dx_pack here
*/
#define V3D_VERSION 42
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
@@ -32,14 +37,10 @@
* the CLE would pre-fetch the data after the end of the CL buffer, reporting
* the kernel "MMU error from client CLE".
*/
#if V3D_VERSION == 42
#define V3D_CLE_READAHEAD 256
#define V3D_CLE_BUFFER_MIN_SIZE 4096
#endif
#if V3D_VERSION >= 71
#define V3D_CLE_READAHEAD 1024
#define V3D_CLE_BUFFER_MIN_SIZE 16384
#endif
#define V3D42_CLE_READAHEAD 256u
#define V3D42_CLE_BUFFER_MIN_SIZE 4096u
#define V3D71_CLE_READAHEAD 1024u
#define V3D71_CLE_BUFFER_MIN_SIZE 16384u
void
v3d_init_cl(struct v3d_job *job, struct v3d_cl *cl)
@@ -59,10 +60,11 @@ v3d_cl_ensure_space(struct v3d_cl *cl, uint32_t space, uint32_t alignment)
cl->next = cl->base + offset;
return offset;
}
struct v3d_device_info *devinfo = &cl->job->v3d->screen->devinfo;
uint32_t cle_buffer_min_size = V3DV_X(devinfo, CLE_BUFFER_MIN_SIZE);
v3d_bo_unreference(&cl->bo);
cl->bo = v3d_bo_alloc(cl->job->v3d->screen,
align(space, V3D_CLE_BUFFER_MIN_SIZE),
align(space, cle_buffer_min_size),
"CL");
cl->base = v3d_bo_map(cl->bo);
cl->size = cl->bo->size;
@@ -84,17 +86,20 @@ v3d_cl_ensure_space_with_branch(struct v3d_cl *cl, uint32_t space)
* cl->size by the packet length before calling cl_summit to use this
* reserved space.
*/
uint32_t unusable_size = V3D_CLE_READAHEAD + cl_packet_length(BRANCH);
struct v3d_device_info *devinfo = &cl->job->v3d->screen->devinfo;
uint32_t cle_readahead = V3DV_X(devinfo, CLE_READAHEAD);
uint32_t cle_buffer_min_size = V3DV_X(devinfo, CLE_BUFFER_MIN_SIZE);
uint32_t unusable_size = cle_readahead + cl_packet_length(BRANCH);
struct v3d_bo *new_bo = v3d_bo_alloc(cl->job->v3d->screen,
align(space + unusable_size,
V3D_CLE_BUFFER_MIN_SIZE),
cle_buffer_min_size),
"CL");
assert(space + unusable_size <= new_bo->size);
/* Chain to the new BO from the old one. */
if (cl->bo) {
cl->size += cl_packet_length(BRANCH);
assert(cl->size + V3D_CLE_READAHEAD <= cl->bo->size);
assert(cl->size + cle_readahead <= cl->bo->size);
cl_emit(cl, BRANCH, branch) {
branch.address = cl_address(new_bo, 0);
}