Browse Source

bump drm, mesa. add mesa/etnaviv workaround for blit size assert

master
mntmn 1 year ago
parent
commit
e7eae9ff85
4 changed files with 21 additions and 15 deletions
  1. +1
    -1
      drm
  2. +1
    -1
      mesa
  3. +19
    -0
      mesa_etnaviv_blitinfo_assert.patch
  4. +0
    -13
      mesa_imx_drm_winsys.patch

+ 1
- 1
drm

@@ -1 +1 @@
Subproject commit 4ec31fc31a4be909c8204164c844b4a18f098af7
Subproject commit e642f480b816f21448fc616f6122df5e8a6070fa

+ 1
- 1
mesa

@@ -1 +1 @@
Subproject commit 9007c0ed26858cb1a40d17e1f5b477d6ed3d2db7
Subproject commit ea53f76d7b96cb32bde493a7c7548bf9c8c794f3

+ 19
- 0
mesa_etnaviv_blitinfo_assert.patch View File

@@ -0,0 +1,19 @@
diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c
index fc4f65dbee..d148127903 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_rs.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c
@@ -596,10 +596,10 @@ etna_try_rs_blit(struct pipe_context *pctx,
/* we may be given coordinates up to the padded width to avoid
* any alignment issues with different tiling formats */
- assert((blit_info->src.box.x + blit_info->src.box.width) * msaa_xscale <= src_lev->padded_width);
- assert((blit_info->src.box.y + blit_info->src.box.height) * msaa_yscale <= src_lev->padded_height);
- assert(blit_info->dst.box.x + blit_info->dst.box.width <= dst_lev->padded_width);
- assert(blit_info->dst.box.y + blit_info->dst.box.height <= dst_lev->padded_height);
+ //assert((blit_info->src.box.x + blit_info->src.box.width) * msaa_xscale <= src_lev->padded_width);
+ //assert((blit_info->src.box.y + blit_info->src.box.height) * msaa_yscale <= src_lev->padded_height);
+ //assert(blit_info->dst.box.x + blit_info->dst.box.width <= dst_lev->padded_width);
+ //assert(blit_info->dst.box.y + blit_info->dst.box.height <= dst_lev->padded_height);
unsigned src_offset = src_lev->offset +
blit_info->src.box.z * src_lev->layer_stride +

+ 0
- 13
mesa_imx_drm_winsys.patch View File

@@ -1,13 +0,0 @@
diff --git a/src/gallium/winsys/imx/drm/imx_drm_winsys.c b/src/gallium/winsys/imx/drm/imx_drm_winsys.c
index 4bd212503..0368f0bec 100644
--- a/src/gallium/winsys/imx/drm/imx_drm_winsys.c
+++ b/src/gallium/winsys/imx/drm/imx_drm_winsys.c
@@ -37,7 +37,7 @@ struct pipe_screen *imx_drm_screen_create(int fd)
struct renderonly ro = {
.create_for_resource = renderonly_create_kms_dumb_buffer_for_resource,
.kms_fd = fd,
- .gpu_fd = loader_open_render_node("etnaviv")
+ .gpu_fd = open("/dev/dri/renderD128",O_RDWR|O_CLOEXEC)
};
if (ro.gpu_fd < 0)

Loading…
Cancel
Save