Skip to content

Commit 35f7d78

Browse files
committed
update rpi4 kernel to 5.4, fix graphic flicking issue
1 parent d5906cd commit 35f7d78

File tree

10 files changed

+22127
-15
lines changed

10 files changed

+22127
-15
lines changed

baseboard-rpi3/media-libs/mesa/mesa-9999.ebuild

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ KEYWORDS="~*"
4040

4141
INTEL_CARDS="intel"
4242
RADEON_CARDS="amdgpu radeon"
43-
VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno llvmpipe mach64 mga nouveau r128 radeonsi savage sis softpipe tdfx via virgl vmware vc4"
43+
VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno llvmpipe mach64 mga nouveau r128 radeonsi savage sis softpipe tdfx via virgl vmware vc4 v3d"
4444
for card in ${VIDEO_CARDS}; do
4545
IUSE_VIDEO_CARDS+=" video_cards_${card}"
4646
done
@@ -152,6 +152,7 @@ src_configure() {
152152

153153
gallium_enable video_cards_virgl virgl
154154
gallium_enable video_cards_vc4 vc4
155+
gallium_enable video_cards_v3d v3d
155156
fi
156157

157158
if use vulkan; then
@@ -224,7 +225,7 @@ src_install() {
224225
insinto "/usr/$(get_libdir)/dri/"
225226
insopts -m0755
226227
# install the gallium drivers we use
227-
local gallium_drivers_files=( nouveau_dri.so r300_dri.so r600_dri.so msm_dri.so swrast_dri.so vc4_dri.so )
228+
local gallium_drivers_files=( nouveau_dri.so r300_dri.so r600_dri.so msm_dri.so swrast_dri.so vc4_dri.so v3d_dri.so )
228229
for x in ${gallium_drivers_files[@]}; do
229230
if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
230231
doins "${S}/$(get_libdir)/gallium/${x}"

baseboard-rpi3/media-libs/minigbm/files/01_add_more_formats.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -877,16 +877,16 @@ index 0000000..fa0a945
877877
+ stride = drv_stride_from_format(format, width, 0);
878878
+ //stride = ALIGN(stride, 64);
879879
+ drv_bo_from_format(bo, stride, height, format);
880-
+ bo_create.size = bo->total_size;
881-
+ bo->format_modifiers[0] = modifier;
880+
+ bo_create.size = bo->meta.total_size;
881+
+ bo->meta.format_modifiers[0] = modifier;
882882
+
883883
+ ret = drmIoctl(bo->drv->fd, DRM_IOCTL_V3D_CREATE_BO, &bo_create);
884884
+ if (ret) {
885-
+ drv_log("DRM_IOCTL_V3D_CREATE_BO failed (size=%zu)\n", bo->total_size);
885+
+ drv_log("DRM_IOCTL_V3D_CREATE_BO failed (size=%zu)\n", bo->meta.total_size);
886886
+ return -errno;
887887
+ }
888888
+
889-
+ for (plane = 0; plane < bo->num_planes; plane++)
889+
+ for (plane = 0; plane < bo->meta.num_planes; plane++)
890890
+ bo->handles[plane].u32 = bo_create.handle;
891891
+ return 0;
892892
+}
@@ -912,8 +912,8 @@ index 0000000..fa0a945
912912
+ drv_log("DRM_V3D_MMAP_BO failed\n");
913913
+ return MAP_FAILED;
914914
+ }
915-
+ vma->length = bo->total_size;
916-
+ return mmap(NULL, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
915+
+ vma->length = bo->meta.total_size;
916+
+ return mmap(NULL, bo->meta.total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
917917
+ bo_map.offset);
918918
+}
919919
+
@@ -1282,7 +1282,7 @@ index 7af16c2..184afac 100644
12821282
+ bo->meta.tiling = modifier == DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED ? VC4_TILING_T : VC4_TILING_NONE;
12831283
+ ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
12841284
+ if (ret) {
1285-
+ drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n", bo->meta.total_size);
1285+
+ drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu), ret:%d\n", bo->meta.total_size, ret);
12861286
+ return -errno;
12871287
+ }
12881288
+

baseboard-rpi3/media-libs/minigbm/minigbm-0.0.1-r311.ebuild

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SLOT="0"
2020
KEYWORDS="*"
2121
VIDEO_CARDS="
2222
amdgpu exynos intel marvell mediatek msm
23-
radeon radeonsi rockchip tegra vc4 virgl
23+
radeon radeonsi rockchip tegra vc4 virgl v3d
2424
"
2525
IUSE="-asan"
2626
for card in ${VIDEO_CARDS}; do
@@ -62,6 +62,7 @@ src_configure() {
6262
use video_cards_tegra && append-cppflags -DDRV_TEGRA && export DRV_TEGRA=1
6363
use video_cards_vc4 && append-cppflags -DDRV_VC4 && export DRV_VC4=1
6464
use video_cards_virgl && append-cppflags -DDRV_VIRGL && export DRV_VIRGL=1
65+
use video_cards_v3d && append-cppflags -DDRV_V3D && export DRV_V3D=1
6566
cros-common.mk_src_configure
6667
}
6768

0 commit comments

Comments
 (0)