Commit graph

144 commits

Author SHA1 Message Date
Jeffy Chen
c3b4a820e1 Support installing khrplatform.h again
Currently the KHR header is depended by mesa's EGL/GLES/GL headers, and
would be provided in mesa-common-dev.

So for the usage of mixing mesa's GL with mali's EGL/GLES, we have to
leave it to mesa's version and let mali uses it's own.

But for people who doesn't want mesa, let's add an option to allow
installing it in mali.

Change-Id: Id6e88e2d7f3c4f6092a3cf1f1078a6a7f284f823
Suggested-by: Gleb Mazovetskiy <glex.spb@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-30 04:44:34 +08:00
Jeffy Chen
2d3dce5e7e Honor the includedir option
Stop using the hard-coded 'include' dirname.

Change-Id: I0ff7dceb81bcbf84e7863dffdf933c41647f6d25
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-30 04:40:01 +08:00
Jeffy Chen
6141ad6e6f gbm_wrapper: Load mali library before searching the symbols
The RTLD_NEXT would not work if the gbm library was loaded with
RTLD_LOCAL.

Change-Id: I4256b52271a92e03dbcb490b1e7fabeb32be6401
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-27 17:07:33 +08:00
Jeffy Chen
728b7bf14f gbm_wrapper: Only filter out unsupported flags
No functional changes.

Change-Id: I359ab9f5eeaae010d070c11184b15cba9bd85109
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-27 17:07:33 +08:00
huangds
14dc585521 Support DRM_FORMAT_YUV420 for aarch64 bifrost-g52-r25p0-dummy
Change-Id: Icd9961e83cf404b2bb95cc9e1119b250e5a81b3f
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-27 17:07:08 +08:00
Jeffy Chen
43b24f4a2c gbm_wrapper: Only allow bypassing linear or invalid modifier
Ignoring all modifiers might confuse the caller.

Change-Id: I27450f32bf7cb6653d1fdf8c8e491ded1642776c
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-12-31 01:38:37 +08:00
Jeffy Chen
64c6c30728 meson: Use install_subdir to install headers
No functional changes.

Change-Id: Iff46805d7613b91f84e354c2b1872aa4cf3b1c91
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-12-24 11:23:34 +08:00
Jeffy Chen
2f6f3a0e24 meson: Print building options
No functional changes.

Change-Id: I31d31ddd5442589f6c4a1c2e1143c0e3c6f56ff8
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-12-10 15:04:09 +08:00
Jeffy Chen
53201e4131 overlay: Fix rk3288 libmali selecting
Change-Id: I8dd7bde9fffd7b5245e6f571b7867319d6d96a3f
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-18 16:00:38 +08:00
Li Huang
17dd6012f3 Add Bifrost G52 r25p0-01eac0 for aarch64 x11
Change-Id: Ia5a6fa7e75615e4299df6415b5ff36f83912eae8
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-12 17:42:06 +08:00
huangds
0d808a5ed2 Add Bifrost G52 r25p0-01eac0 for aarch64 dummy
Change-Id: Icbd83e2bcff7fcba3634b06b00b71fd2c3e1d75b
Signed-off-by: huangds <hds@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-11 15:05:06 +08:00
Jeffy Chen
2e36060922 Support dummy platform
Currently we are supporting these platforms:
x11 gbm wayland only-cl dummy

Change-Id: I82e01c068730e83dccc10c23e2c9ea528aeac920
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-11 15:04:41 +08:00
huangds
83c74156e8 Add Bifrost G52 r25p0-01eac0 for aarch64 wayland only
Other platforms are not ready yet.

Change-Id: I743834824761948a48e531d7f685dd5e07a8a1b1
Signed-off-by: huangds <hds@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-11 10:38:20 +08:00
Jeffy Chen
1f02950df0 debian/rules: Clean install dirs as well
Change-Id: I194cb6556182ed0e5289869f1a02a2c0d5f9dd57
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-11-10 05:59:05 +08:00
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