Commit graph

330 commits

Author SHA1 Message Date
Jeffy Chen
527ba89224 debian/control: Update build deps
Change-Id: I9dfa630ad440660588ab1ed1ad9e313903a6476e
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-10 05:46:20 +08:00
Jeffy Chen
1fecc2ff11 debian: Drop arch subfix from package name
Change-Id: I72a2fc21c8427fcb6a1947e089c035c6cd6cc1c0
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-10 05:01:42 +08:00
Jeffy Chen
239b315714 debian/rules: Fix cross build error
Build for host gnu type.

Change-Id: Ifa7f72c069f68857c1a0044c61cba42f0f8a9ac9
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-10-20 08:32:32 +08:00
Jeffy Chen
e012a2bbb8 debian/control: Add missing build deps
These are required by shlibs stage.

Change-Id: I31a2b4fdffbe27504e8ab312bea5b616abf76439
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-10-20 08:28:37 +08:00
Jeffy Chen
07daee4e8a meson: Fix support for OpenCL ICD implementation
The OpenCL ICD implementation should work with OpenCL ICD loader.

So we shouldn't try to install non-ICD OpenCL implementation in this
case.

Change-Id: Idfb4e6058952215075e2cc253c0d5bb43cac6761
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-09-27 17:58:48 +08:00
Li Huang
77feb33853 rk3399/rk3288/rk3288w: arm32 && arm64: Update on Midgard DDK r18p0-01rel0; rk_so_ver is 4.
1、Fixup wrong size on alloc_drm_buffer.
2. Fixup worng page calculate on gbm_map_drm_buffer

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Change-Id: Ia7624f0249ac239ebb69e7ff434a6a27088ca5fd
2020-09-15 10:35:45 +08:00
Jeffy Chen
b91d4b9572 update_debian.sh: Detect OpenCL support
Also update debian files using the newest update_debian.sh.

Change-Id: I022fce91075e08b62cff28925ae528db71c2e080
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-08-28 12:29:12 +08:00
Jeffy Chen
7359b29cb9 gbm: Compat to mesa3d 20.1.5 APIs
Use gbm wrapper library to provide missing functions.

Change-Id: I62c9838f91adfd2f54df5eb75b256c361c7ce9a0
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-08-13 17:43:00 +08:00
Jeffy Chen
23dbb929bd meson: Require meson >= 0.49.0
Fix this warning:
WARNING: Project targeting '>=0.47.0' but tried to use feature introduced in '0.49.0': / with string arguments

Change-Id: Ic1af5d59d1cbfb11b69c078f7b7754a8ad7cf64b
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-08-13 16:18:24 +08:00
Jeffy Chen
d7695f4218 meson: Only define MESA_EGL_NO_X11_HEADERS in egl.pc
Change-Id: Ice8738a592b85a504355611c4c6096d694b0afcd
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-08-13 09:45:06 +08:00
Li Huang
e2ba144401 rk3399/rk3288/rk3288w: arm32 && arm64: Update on Midgard DDK r18p0-01rel0; rk_so_ver is 3.
1.Add EGL_EXT_image_dma_buf_import for wayland
2.Fixup glPolygonOffset report error: GL_INVALID_FRAMEBUFFER_OPERATION

Change-Id: I72ce7be0892c104ed6813c82ed1bcb9879dd148d
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-08-06 20:28:34 +08:00
Jeffy Chen
8d83987ce5 debian: Drop cmake and use meson
Also with these changes:
1/ Bump version to 1.9.0
2/ Remove -dev package
3/ Use ld.so.conf
4/ Add more packages

Run ./update_debian.sh to re-generate files when libraries changed.

Change-Id: I47d65f63df9b26dd3bd9ea5fd50738b909bf8fe5
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-31 17:54:46 +08:00
Jeffy Chen
f127d14e87 Support meson build system
meson build -Darch=aarch64 -Dgpu=bifrost-g31 -Dversion=rxp0 -Dplatform=only-cl

Change-Id: I60bb14e16a9cbc9589b85279680c845f53ed0572
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-31 17:00:25 +08:00
Jeffy Chen
e74864b9bc Add missing soname libmali.so.1 to all libs
It's required for linking.

Run ./normalize.sh

Change-Id: I5d979d088e3b39c408794d903750ec60b409250f
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-31 17:00:25 +08:00
Jeffy Chen
f226c36d73 HACK: Replace out-dated deps
libffi.so.6 -> libffi.so
libcrypto.so.1.0.0 -> libcrypto.so

By ./normalize.sh

NOTE: It's not safe, only affect:
libmali-utgard-400-r7p0-r3p0-wayland.so(px3se)

Change-Id: I6b726c631b0c64fc29b13819e408801052bb54f9
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-31 14:05:46 +08:00
Jeffy Chen
9853e61f05 Rename libraries
libmali-<gpu>-<ver>[-subver][-platform].so

For example,
./parse_name.sh lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-without-cl-wayland.so
name=libmali-bifrost-g31-rxp0-without-cl-wayland
gpu=bifrost-g31
version=rxp0
subversion=without-cl
platform=wayland

Change-Id: I6d332bc5fe45665754cc7b9713617f038c216d55
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-30 17:25:25 +08:00
Jeffy Chen
58441ade30 Remove some unused libs
Remove fbdev backend libs and duplicated libs.

Change-Id: I3d2cece86024ee6d05934cccc531179eb0cbdbeb
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-07-24 16:50:44 +08:00
Li Huang
6ac12eee15 Mali 400(rk3128): Fixup wrong picth scale on YUYV (EGL_YUV422I_KHR)
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I4ed300a3dad0887f9f3a634b114a9e214a60e832
2020-07-16 18:33:59 +08:00
Li Huang
947e839a43 rk3326: Update Wayland & Gbm
1.Updata header file
	2.Fixup glPolygonOffset report error: GL_INVALID_FRAMEBUFFER_OPERATION
	3.and so on

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I41a9a32ad333b53b213eba13742ac7be9a1c6b36
2020-07-10 15:05:53 +08:00
Caesar Wang
a0350e7bde overlay: upgrade rk3288 to r18
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ib5f09f481ae85e37e12c65bcfcbff8b885ea1549
2020-07-01 09:56:18 +08:00
Caesar Wang
4abcff4a8f libmali: upgrade rk3288/rk3399 to r18 for debian
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Iae407887d514f89c7372cbc85fb95b1a47713164
2020-07-01 09:53:12 +08:00
Li Huang
7fca6310ec Mali450: ver 2.0
Remove dependency on libffi.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ia037ad9e3e6d9aa6f4972739d135a26f880d4b5b
2020-06-17 11:23:17 +08:00
Zhen Chen
a39bc45a9b rk3288w: arm32: libs of libmali for various backends, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
All the backends are :
	wayland_gbm,
	x11_gbm,
	fbdev,
	gbm,
	x11_fbdev

Change-Id: I97a8de9827ada0ce398eb191f4e1bd6b7167d5fd
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-21 11:38:54 +08:00
Zhen Chen
d4116b6145 rk3288: arm32: libs of libmali for various backends, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
All the backends are :
	wayland_gbm,
	x11_gbm,
	fbdev,
	gbm,
	x11_fbdev

Change-Id: Id84148a6078e3b915ae7b912357c6330ba330c9f
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-21 09:45:28 +08:00
Zhen Chen
d9cb851e4e rk3399: arm64: libs of libmali for various backends, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
All the backends are :
	wayland_gbm,
	x11_gbm,
	fbdev,
	gbm,
	x11_fbdev

Change-Id: I0dd0eb559cd8eb9dade0e38991e9933ea3dc7c55
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 18:01:53 +08:00
Zhen Chen
ef6fa3f7f4 rk3399: arm32: libmali: build for x11_fbdev , on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
Change-Id: I87e97c94bec8bc80930d6c499afa7d8764e8d4b9
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 14:43:35 +08:00
Zhen Chen
1a17e4a7d6 rk3399: arm32: libmali: build for gbm, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
Change-Id: Ibd043f24c437e913e33bbaa3c7a8ae15640bdc44
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 14:22:50 +08:00
Zhen Chen
ae012c13e2 rk3399: arm32: libmali: build for fbdev, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
Change-Id: I2512423a209aa7986c739e4e84dc0e3925c5bb04
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 11:57:23 +08:00
Zhen Chen
fc5acf2359 rk3399: arm32: libmali: build for x11_gbm, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
Change-Id: I10d7eb1d860bc3218c286793e11deba989b3d180
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 11:37:52 +08:00
Zhen Chen
29f63e2759 rk3399: arm32: libmali: build for wayland_gbm, on Midgard DDK r18p0-01rel0; rk_so_ver is 2.
Change-Id: I86e1c59ec64469c198a80259be8964732b1b0043
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 11:00:48 +08:00
Zhen Chen
bc18e1a531 rk3399: arm64: libmali: build for wayland_gbm, on Midgard DDK r18p0-01rel0; rk_so_ver is 1.
Change-Id: I10e913ea1b8dea20195dac761a59d496848ee502
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-05-20 10:13:28 +08:00
Zhen Chen
b26f208c2b rk3399: arm64: libmali: build for x11_gbm, on Midgard DDK r18p0-01rel0; rk_so_ver is 1
"strings ./lib/aarch64-linux-gnu/libmali-midgard-t86x-r18p0.so | grep rk_so" would return
"arm_release_ver of this libmali is 'r18p0-01rel0', rk_so_ver is '1'."

Change-Id: Ic7fe7912f5ef4bce096cc97b8b7b929854c43a52
2020-05-20 10:13:27 +08:00
Jeffy Chen
83f8b828ef Rename khrplatform.h to mali_khrplatform.h
The mesa upstream decided to install khrplatform.h within GL(dev), which
would conflit with ours:
dpkg: error processing archive /var/cache/apt/archives/mesa-common-dev_18.3.6-2+deb10u1_arm64.deb (--unpack):
trying to overwrite '/usr/include/KHR/khrplatform.h', which is also in package libmali-rk-dev:arm64 1.7-1

Let's rename it to avoid that.

Done by these commands:
mv include/KHR/{,mali_}khrplatform.h
ag khrplatform.h -l|xargs sed -i "s/\<khrplatform.h/mali_khrplatform.h/g"

Change-Id: I1aec209c60481332ffecd033ed9433e91cc5fb97
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-04-28 10:15:46 +08:00
Li Huang
8867101e50 Mali 450(rk3328): Fixup wrong picth scale on YUYV (EGL_YUV422I_KHR)
cp libmali-utgard-450-r7p0-r0p0-wayland.so to libmali-utgard-450-r7p0-wayland.so

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I6ad0925e7c484d80d0fd0a766a9ba54499e8d7f8
2020-04-03 10:22:08 +08:00
Li Huang
aa12715485 Mali 450(rk3328): Fixup wrong picth scale on YUYV (EGL_YUV422I_KHR)
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I16c4c130f8184e3da7e2a4a648268fe068eda801
2020-04-02 15:36:53 +08:00
Eddie.Cai
f226e98238 Merge "libmali: overlay: rk3288: support distro" 2020-01-06 16:13:36 +08:00
Nickey Yang
a9d4329b60 libmali: overlay: rk3288: support distro
libmali on debian10 is in /usr/lib/arm-linux-gnueabihf
but in /usr/lib/ on buildroot.

Change-Id: Ie826c85ad8b0c816aafab1ac4d78a7d8f11d1bd5
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2020-01-03 16:37:16 +08:00
Li Huang
1b74a4844d Update EGL && GLES && KHR header file
EGL:
Form: https://github.com/KhronosGroup/EGL-Registry.git
commit: de3a5e867d906a04a5c37ee0d89e7f01d3598eb9

GLES:
From: https://github.com/KhronosGroup/OpenGL-Registry.git
commit: 92540bc2b20ac

KHR:
from: https://github.com/KhronosGroup/EGL-Registry.git
commit: 4744552d13f44

Change-Id: I2540563dac7c9b2c6e438c65dfc739ceb9eddbe8
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2019-12-11 11:16:17 +08:00
Jeffy Chen
67a812cfe7 Fix missing KHR header
This header was removed by mistake, let's add it back.

Change-Id: I63d5f5592b7cd7b6fdbb1077cfe4fdf2900649da
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2019-11-20 16:14:24 +08:00
Caesar Wang
946be91008 debian: update wayland for rk3399
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-10-31 15:56:43 +08:00
Caesar Wang
41a1cf8080 debian: move these into the other place
Change-Id: I68f95357e6614cd46fcbd725df344d5ae5fec3f6
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-08-19 11:23:57 +08:00
Ziyuan Xu
ed8fa75bf2 Merge "libmali: g31: add the opencl library without display feature" 2019-08-12 19:16:13 +08:00
Ziyuan Xu
979be11ecb libmali: g31: add the opencl library without display feature
Change-Id: Ia2fa1279dd48acc03b371e22694dc9b858728217
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-08-12 09:00:49 +00:00
Caesar Wang
26ad8bcf84 libmali: add GBM_FORMAT_R8
Change-Id: Ia8a8d71402c71250bbf7f1979b6d07bbda5accae
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-08-01 15:33:03 +08:00
Caesar Wang
5c5295756d debian: remove unused wayland for x11 packages
Change-Id: Ia853a17d1908cc652f7f94529900ac9e294f03bc
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-07-22 19:30:03 +08:00
Jeffy Chen
f570a257a1 Use the same suffix rules for libmali-bifrost-g31-rxp0
Use the same suffix rules as the others.

Change-Id: If5148d5c4c31a88b17ec7485f167754685b51ce9
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2019-07-19 11:34:36 +08:00
Li Huang
dea0b1b1de libmali: replace wrong midgard so
Change-Id: I6b974c16757b4693f21713bc00ea7c8fbf9354e3
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2019-07-17 14:27:47 +08:00
Caesar Wang
d90e42bcc7 debian: add build px30/rk3326 x11 libmali
Change-Id: I67cb06f497a793fdb22b7b73095f62c285c53e84
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-07-17 11:46:53 +08:00
Li Huang
87e61381ab libmali: Add x11 support for bifrost r6
Change-Id: I2f17276e0f522d302d6727eb3651b06a802a3d8a
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2019-07-17 11:31:21 +08:00
Caesar Wang
577c1b2c32 debian: add build rules to v1.7-1
Tested on rk3399 debian 64bit:

grep gbm_bo_map -r ./usr/lib/aarch64-linux-gnu/libmali.so

Change-Id: Ie0a7f1b909b93d42459df452969525d849546ecf
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-07-16 17:49:23 +08:00