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

freedreno/drm-shim: keep GEM buffers page-aligned 

Trying to run turnip under drm-shim reveals that pretended device
offsets are not sufficiently aligned, failing this assert in tu_pipeline.c:

   /* emit program binary & private memory layout
    * binary_iova should be aligned to 1 instrlen unit (128 bytes)
    */

   assert((binary_iova & 0x7f) == 0);

Round up BO size to 4096 in msm_ioctl_gem_new to avoid this (the kernel
aligns to page size).

Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11331>
This commit is contained in:
Alexander Monakov 2021-06-11 23:56:17 +03:00 committed by Marge Bot
parent a5e4fc3ff5
commit 11da35d86d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/freedreno/drm-shim/freedreno_noop.c
View File

@ -28,6 +28,8 @@
#include "drm-uapi/msm_drm.h"
#include <sys/ioctl.h>
#include "util/u_math.h"
bool drm_shim_driver_prefers_first_render_node = true;
struct msm_bo {
@ -69,13 +71,14 @@ msm_ioctl_gem_new(int fd, unsigned long request, void *arg)
struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
struct drm_msm_gem_new *create = arg;
struct msm_bo *bo = calloc(1, sizeof(*bo));
size_t size = ALIGN(create->size, 4096);
drm_shim_bo_init(&bo->base, create->size);
drm_shim_bo_init(&bo->base, size);
assert(UINT_MAX - msm.next_offset > create->size);
assert(UINT_MAX - msm.next_offset > size);
bo->offset = msm.next_offset;
msm.next_offset += create->size;
msm.next_offset += size;
create->handle = drm_shim_bo_get_handle(shim_fd, &bo->base);