OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "v3d: show warning on creating a v3d screen on real hw"

Browse Source 
There are paths were a v3d screen can be created instead of vc4 screen,
in a real rpi4 hardware. For instance, in the CI itself.

So assuming that it was only possible with the simulator was wrong.

This reverts commit c31be1f4ba.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27047>
This commit is contained in:
Juan A. Suarez Romero
2024-01-12 23:17:07 +01:00
committed by Marge Bot
parent 4cb9c77e8e
commit 8120360358
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/winsys/v3d/drm/meson.build
View File

@@ -18,13 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
dep_v3dv3 = dependency('v3dv3', required: false)
v3d_winsys_c_args = []
if (dep_v3dv3.found())
v3d_winsys_c_args += '-DUSE_V3D_SIMULATOR'
endif
libv3dwinsys = static_library( libv3dwinsys = static_library(
'v3dwinsys', 'v3dwinsys',
files('v3d_drm_winsys.c'), files('v3d_drm_winsys.c'),
@@ -32,7 +25,6 @@ libv3dwinsys = static_library(
inc_src, inc_include, inc_src, inc_include,
inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
], ],
c_args: [v3d_winsys_c_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : idep_mesautil, dependencies : idep_mesautil,
) )

4
src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
View File

@@ -34,10 +34,6 @@
struct pipe_screen * struct pipe_screen *
v3d_drm_screen_create(int fd, const struct pipe_screen_config *config) v3d_drm_screen_create(int fd, const struct pipe_screen_config *config)
{ {
#ifndef USE_V3D_SIMULATOR
fprintf (stderr, "Do not manually force v3d driver; hardware uses vc4 to create display\n");
#endif
return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config, return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config,
NULL, v3d_screen_create); NULL, v3d_screen_create);
} }