summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/targets
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mesa/src/gallium/targets')
-rw-r--r--lib/mesa/src/gallium/targets/d3dadapter9/drm.c11
-rw-r--r--lib/mesa/src/gallium/targets/dri/Makefile.am3
-rw-r--r--lib/mesa/src/gallium/targets/dri/Makefile.in90
-rw-r--r--lib/mesa/src/gallium/targets/dri/target.c3
-rw-r--r--lib/mesa/src/gallium/targets/pipe-loader/Makefile.am2
-rw-r--r--lib/mesa/src/gallium/targets/pipe-loader/Makefile.in4
-rw-r--r--lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c2
-rw-r--r--lib/mesa/src/gallium/targets/xa/Makefile.in4
8 files changed, 60 insertions, 59 deletions
diff --git a/lib/mesa/src/gallium/targets/d3dadapter9/drm.c b/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
index 85b3e1063..e08778b81 100644
--- a/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
+++ b/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
@@ -149,8 +149,8 @@ read_descriptor( struct d3dadapter9_context *ctx,
&drvid->SubSysId, &drvid->Revision);
snprintf(drvid->DeviceName, sizeof(drvid->DeviceName),
"Gallium 0.4 with %s", ctx->hal->get_vendor(ctx->hal));
- strncpy(drvid->Description, ctx->hal->get_name(ctx->hal),
- sizeof(drvid->Description));
+ snprintf(drvid->Description, sizeof(drvid->Description),
+ "%s", ctx->hal->get_name(ctx->hal));
if (override_vendorid > 0) {
found = FALSE;
@@ -163,8 +163,8 @@ read_descriptor( struct d3dadapter9_context *ctx,
fallback_cards[i].device_id);
drvid->VendorId = fallback_cards[i].vendor_id;
drvid->DeviceId = fallback_cards[i].device_id;
- strncpy(drvid->Description, fallback_cards[i].name,
- sizeof(drvid->Description));
+ snprintf(drvid->Description, sizeof(drvid->Description),
+ "%s", fallback_cards[i].name);
found = TRUE;
break;
}
@@ -279,9 +279,6 @@ drm_create_adapter( int fd,
DBG("You have set a non standard throttling value in combination with thread_submit."
"We advise to use a throttling value of -2/0");
}
- if (ctx->base.thread_submit && !different_device)
- DBG("You have set thread_submit but do not use a different device than the server."
- "You should not expect any benefit.");
if (driCheckOption(&userInitOptions, "override_vendorid", DRI_INT)) {
override_vendorid = driQueryOptioni(&userInitOptions, "override_vendorid");
diff --git a/lib/mesa/src/gallium/targets/dri/Makefile.am b/lib/mesa/src/gallium/targets/dri/Makefile.am
index a857b5129..f53be532b 100644
--- a/lib/mesa/src/gallium/targets/dri/Makefile.am
+++ b/lib/mesa/src/gallium/targets/dri/Makefile.am
@@ -78,12 +78,11 @@ include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc
include $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc
include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc
include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
include $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/imx/Automake.inc
include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
diff --git a/lib/mesa/src/gallium/targets/dri/Makefile.in b/lib/mesa/src/gallium/targets/dri/Makefile.in
index cb78bdc6b..8be462601 100644
--- a/lib/mesa/src/gallium/targets/dri/Makefile.in
+++ b/lib/mesa/src/gallium/targets/dri/Makefile.in
@@ -57,10 +57,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc \
$(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc \
$(top_srcdir)/src/gallium/drivers/i915/Automake.inc \
- $(top_srcdir)/src/gallium/drivers/imx/Automake.inc \
+ $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc \
$(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc \
$(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc \
- $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc \
$(top_srcdir)/src/gallium/drivers/r300/Automake.inc \
$(top_srcdir)/src/gallium/drivers/r600/Automake.inc \
$(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc \
@@ -142,6 +141,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@HAVE_GALLIUM_FREEDRENO_TRUE@am__append_27 = \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(FREEDRENO_LIBS) \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(LIBDRM_LIBS)
@@ -175,11 +176,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@HAVE_GALLIUM_VC4_TRUE@ $(top_builddir)/src/gallium/drivers/vc4/libvc4.la \
@HAVE_GALLIUM_VC4_TRUE@ $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la
-@HAVE_GALLIUM_PL111_TRUE@am__append_39 = pl111
-@HAVE_GALLIUM_PL111_TRUE@am__append_40 = -DGALLIUM_PL111
-@HAVE_GALLIUM_PL111_TRUE@am__append_41 = \
-@HAVE_GALLIUM_PL111_TRUE@ $(top_builddir)/src/gallium/winsys/pl111/drm/libpl111drm.la \
-@HAVE_GALLIUM_PL111_TRUE@ $(LIBDRM_LIBS)
+@HAVE_GALLIUM_KMSRO_TRUE@am__append_39 = pl111 hx8357d
+@HAVE_GALLIUM_KMSRO_TRUE@am__append_40 = -DGALLIUM_KMSRO
+@HAVE_GALLIUM_KMSRO_TRUE@am__append_41 = \
+@HAVE_GALLIUM_KMSRO_TRUE@ $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \
+@HAVE_GALLIUM_KMSRO_TRUE@ $(LIBDRM_LIBS)
@HAVE_GALLIUM_VIRGL_TRUE@am__append_42 = virtio_gpu
@HAVE_GALLIUM_VIRGL_TRUE@am__append_43 = -DGALLIUM_VIRGL
@@ -197,39 +198,33 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@HAVE_GALLIUM_ETNAVIV_TRUE@ $(ETNAVIV_LIBS) \
@HAVE_GALLIUM_ETNAVIV_TRUE@ $(LIBDRM_LIBS)
-@HAVE_GALLIUM_IMX_TRUE@am__append_48 = imx-drm
-@HAVE_GALLIUM_IMX_TRUE@am__append_49 = -DGALLIUM_IMX
-@HAVE_GALLIUM_IMX_TRUE@am__append_50 = \
-@HAVE_GALLIUM_IMX_TRUE@ $(top_builddir)/src/gallium/winsys/imx/drm/libimxdrm.la \
-@HAVE_GALLIUM_IMX_TRUE@ $(LIBDRM_LIBS)
-
-@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_51 = swrast
-@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_52 = -DGALLIUM_SOFTPIPE
-@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_53 = \
+@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_48 = swrast
+@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_49 = -DGALLIUM_SOFTPIPE
+@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_50 = \
@HAVE_GALLIUM_SOFTPIPE_TRUE@ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-@HAVE_DRISW_KMS_TRUE@@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_54 = kms_swrast
-@HAVE_GALLIUM_LLVMPIPE_TRUE@am__append_55 = -DGALLIUM_LLVMPIPE
-@HAVE_GALLIUM_LLVMPIPE_TRUE@am__append_56 = \
+@HAVE_DRISW_KMS_TRUE@@HAVE_GALLIUM_SOFTPIPE_TRUE@am__append_51 = kms_swrast
+@HAVE_GALLIUM_LLVMPIPE_TRUE@am__append_52 = -DGALLIUM_LLVMPIPE
+@HAVE_GALLIUM_LLVMPIPE_TRUE@am__append_53 = \
@HAVE_GALLIUM_LLVMPIPE_TRUE@ $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-@HAVE_GALLIUM_SWR_TRUE@am__append_57 = swrast
-@HAVE_GALLIUM_SWR_TRUE@am__append_58 = -DGALLIUM_SWR
-@HAVE_GALLIUM_SWR_TRUE@am__append_59 = \
+@HAVE_GALLIUM_SWR_TRUE@am__append_54 = swrast
+@HAVE_GALLIUM_SWR_TRUE@am__append_55 = -DGALLIUM_SWR
+@HAVE_GALLIUM_SWR_TRUE@am__append_56 = \
@HAVE_GALLIUM_SWR_TRUE@ $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__append_60 = target.c
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__append_61 = \
+@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__append_57 = target.c
+@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__append_58 = \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(TARGET_LIB_DEPS) \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-@HAVE_GALLIUM_STATIC_TARGETS_FALSE@am__append_62 = \
+@HAVE_GALLIUM_STATIC_TARGETS_FALSE@am__append_59 = \
@HAVE_GALLIUM_STATIC_TARGETS_FALSE@ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-@HAVE_GALLIUM_LLVM_TRUE@am__append_63 = $(LLVM_LIBS)
-@HAVE_GALLIUM_LLVM_TRUE@am__append_64 = $(LLVM_LDFLAGS)
+@HAVE_GALLIUM_LLVM_TRUE@am__append_60 = $(LLVM_LIBS)
+@HAVE_GALLIUM_LLVM_TRUE@am__append_61 = $(LLVM_LDFLAGS)
subdir = src/gallium/targets/dri
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -316,12 +311,14 @@ am__DEPENDENCIES_6 = \
@HAVE_GALLIUM_SVGA_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_GALLIUM_FREEDRENO_TRUE@am__DEPENDENCIES_13 = $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_GALLIUM_TEGRA_TRUE@am__DEPENDENCIES_14 = $(top_builddir)/src/gallium/winsys/tegra/drm/libtegradrm.la \
@HAVE_GALLIUM_TEGRA_TRUE@ $(top_builddir)/src/gallium/drivers/tegra/libtegra.la \
@HAVE_GALLIUM_TEGRA_TRUE@ $(am__DEPENDENCIES_1)
-@HAVE_GALLIUM_PL111_TRUE@am__DEPENDENCIES_15 = $(top_builddir)/src/gallium/winsys/pl111/drm/libpl111drm.la \
-@HAVE_GALLIUM_PL111_TRUE@ $(am__DEPENDENCIES_1)
+@HAVE_GALLIUM_KMSRO_TRUE@am__DEPENDENCIES_15 = $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \
+@HAVE_GALLIUM_KMSRO_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_GALLIUM_VIRGL_TRUE@am__DEPENDENCIES_16 = $(top_builddir)/src/gallium/drivers/virgl/libvirgl.la \
@HAVE_GALLIUM_VIRGL_TRUE@ $(top_builddir)/src/gallium/winsys/virgl/drm/libvirgldrm.la \
@HAVE_GALLIUM_VIRGL_TRUE@ $(top_builddir)/src/gallium/winsys/virgl/vtest/libvirglvtest.la \
@@ -330,22 +327,20 @@ am__DEPENDENCIES_6 = \
@HAVE_GALLIUM_ETNAVIV_TRUE@ $(top_builddir)/src/gallium/drivers/etnaviv/libetnaviv.la \
@HAVE_GALLIUM_ETNAVIV_TRUE@ $(am__DEPENDENCIES_1) \
@HAVE_GALLIUM_ETNAVIV_TRUE@ $(am__DEPENDENCIES_1)
-@HAVE_GALLIUM_IMX_TRUE@am__DEPENDENCIES_18 = $(top_builddir)/src/gallium/winsys/imx/drm/libimxdrm.la \
-@HAVE_GALLIUM_IMX_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_19 = $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+am__DEPENDENCIES_18 = $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
$(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
$(am__DEPENDENCIES_13) $(am__DEPENDENCIES_14) $(am__append_33) \
$(am__append_34) $(am__append_37) $(am__append_38) \
$(am__DEPENDENCIES_15) $(am__DEPENDENCIES_16) \
- $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_18) $(am__append_53) \
- $(am__append_56) $(am__append_59)
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__DEPENDENCIES_20 = $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
+ $(am__DEPENDENCIES_17) $(am__append_50) $(am__append_53) \
+ $(am__append_56)
+@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__DEPENDENCIES_19 = $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(am__DEPENDENCIES_6) \
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(am__DEPENDENCIES_19) \
+@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(am__DEPENDENCIES_18) \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(TARGET_RADEON_WINSYS) \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(TARGET_RADEON_COMMON)
-@HAVE_GALLIUM_LLVM_TRUE@am__DEPENDENCIES_21 = $(am__DEPENDENCIES_1)
+@HAVE_GALLIUM_LLVM_TRUE@am__DEPENDENCIES_20 = $(am__DEPENDENCIES_1)
gallium_dri_la_DEPENDENCIES = \
$(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
@@ -356,7 +351,7 @@ gallium_dri_la_DEPENDENCIES = \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
- $(am__DEPENDENCIES_20) $(am__append_62) $(am__DEPENDENCIES_21)
+ $(am__DEPENDENCIES_19) $(am__append_59) $(am__DEPENDENCIES_20)
am__gallium_dri_la_SOURCES_DIST = target.c
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__objects_1 = \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ gallium_dri_la-target.lo
@@ -832,10 +827,10 @@ AM_CPPFLAGS = \
dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = gallium_dri.la
nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
-gallium_dri_la_SOURCES = $(am__append_60)
+gallium_dri_la_SOURCES = $(am__append_57)
gallium_dri_la_LDFLAGS = -shared -shrext .so -module -no-undefined \
-avoid-version $(GC_SECTIONS) $(LD_NO_UNDEFINED) \
- $(am__append_5) $(am__append_6) $(am__append_64)
+ $(am__append_5) $(am__append_6) $(am__append_61)
gallium_dri_la_LIBADD = $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
@@ -844,8 +839,8 @@ gallium_dri_la_LIBADD = $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
$(LIBDRM_LIBS) $(SELINUX_LIBS) $(EXPAT_LIBS) \
- $(GALLIUM_COMMON_LIB_DEPS) $(am__append_61) $(am__append_62) \
- $(am__append_63)
+ $(GALLIUM_COMMON_LIB_DEPS) $(am__append_58) $(am__append_59) \
+ $(am__append_60)
EXTRA_gallium_dri_la_DEPENDENCIES = \
dri.sym \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
@@ -861,20 +856,19 @@ TARGET_DRIVERS = $(am__append_7) $(am__append_10) $(am__append_13) \
$(am__append_25) $(am__append_28) $(am__append_31) \
$(am__append_35) $(am__append_39) $(am__append_42) \
$(am__append_45) $(am__append_48) $(am__append_51) \
- $(am__append_54) $(am__append_57)
+ $(am__append_54)
TARGET_CPPFLAGS = $(am__append_8) $(am__append_11) $(am__append_14) \
$(am__append_17) $(am__append_20) $(am__append_23) \
$(am__append_26) $(am__append_29) $(am__append_32) \
$(am__append_36) $(am__append_40) $(am__append_43) \
$(am__append_46) $(am__append_49) $(am__append_52) \
- $(am__append_55) $(am__append_58)
+ $(am__append_55)
TARGET_LIB_DEPS = $(am__append_9) $(am__append_12) $(am__append_15) \
$(am__append_18) $(am__append_21) $(am__append_24) \
$(am__append_27) $(am__append_30) $(am__append_33) \
$(am__append_34) $(am__append_37) $(am__append_38) \
$(am__append_41) $(am__append_44) $(am__append_47) \
- $(am__append_50) $(am__append_53) $(am__append_56) \
- $(am__append_59)
+ $(am__append_50) $(am__append_53) $(am__append_56)
@HAVE_GALLIUM_R300_TRUE@TARGET_RADEON_WINSYS = \
@HAVE_GALLIUM_R300_TRUE@ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
@@ -896,7 +890,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/gallium/Automake.inc $(top_srcdir)/src/gallium/drivers/i915/Automake.inc $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc $(top_srcdir)/src/gallium/drivers/r300/Automake.inc $(top_srcdir)/src/gallium/drivers/r600/Automake.inc $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc $(top_srcdir)/src/gallium/drivers/svga/Automake.inc $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc $(top_srcdir)/src/gallium/drivers/imx/Automake.inc $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/swr/Automake.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/gallium/Automake.inc $(top_srcdir)/src/gallium/drivers/i915/Automake.inc $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc $(top_srcdir)/src/gallium/drivers/r300/Automake.inc $(top_srcdir)/src/gallium/drivers/r600/Automake.inc $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc $(top_srcdir)/src/gallium/drivers/svga/Automake.inc $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/swr/Automake.inc $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -917,7 +911,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/src/gallium/Automake.inc $(top_srcdir)/src/gallium/drivers/i915/Automake.inc $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc $(top_srcdir)/src/gallium/drivers/r300/Automake.inc $(top_srcdir)/src/gallium/drivers/r600/Automake.inc $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc $(top_srcdir)/src/gallium/drivers/svga/Automake.inc $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc $(top_srcdir)/src/gallium/drivers/imx/Automake.inc $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/swr/Automake.inc:
+$(top_srcdir)/src/gallium/Automake.inc $(top_srcdir)/src/gallium/drivers/i915/Automake.inc $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc $(top_srcdir)/src/gallium/drivers/r300/Automake.inc $(top_srcdir)/src/gallium/drivers/r600/Automake.inc $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc $(top_srcdir)/src/gallium/drivers/svga/Automake.inc $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc $(top_srcdir)/src/gallium/drivers/swr/Automake.inc:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
diff --git a/lib/mesa/src/gallium/targets/dri/target.c b/lib/mesa/src/gallium/targets/dri/target.c
index 835d125f2..6b0ea785c 100644
--- a/lib/mesa/src/gallium/targets/dri/target.c
+++ b/lib/mesa/src/gallium/targets/dri/target.c
@@ -77,7 +77,8 @@ DEFINE_LOADER_DRM_ENTRYPOINT(v3d)
#if defined(GALLIUM_VC4)
DEFINE_LOADER_DRM_ENTRYPOINT(vc4)
-#if defined(GALLIUM_PL111)
+#if defined(GALLIUM_KMSRO)
+DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d)
DEFINE_LOADER_DRM_ENTRYPOINT(pl111)
#endif
#endif
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.am b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.am
index fa16e8535..db515e309 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.am
+++ b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.am
@@ -157,6 +157,8 @@ pipe_msm_la_LIBADD = \
$(PIPE_LIBS) \
$(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
$(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
$(LIBDRM_LIBS) \
$(FREEDRENO_LIBS)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
index 41ed18cb0..e453cb662 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
+++ b/lib/mesa/src/gallium/targets/pipe-loader/Makefile.in
@@ -204,6 +204,8 @@ am__v_lt_1 =
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(am__DEPENDENCIES_6) \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(am__DEPENDENCIES_1)
am__pipe_msm_la_SOURCES_DIST = pipe_msm.c
@HAVE_GALLIUM_FREEDRENO_TRUE@am_pipe_msm_la_OBJECTS = pipe_msm.lo
@@ -821,6 +823,8 @@ AM_LDFLAGS = -module -no-undefined -avoid-version $(GC_SECTIONS) \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(PIPE_LIBS) \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(LIBDRM_LIBS) \
@HAVE_GALLIUM_FREEDRENO_TRUE@ $(FREEDRENO_LIBS)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
index 886fbdfc7..683332579 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
@@ -8,7 +8,7 @@ create_screen(int fd, const struct pipe_screen_config *config)
{
struct pipe_screen *screen;
- screen = fd_drm_screen_create(fd);
+ screen = fd_drm_screen_create(fd, NULL);
if (!screen)
return NULL;
diff --git a/lib/mesa/src/gallium/targets/xa/Makefile.in b/lib/mesa/src/gallium/targets/xa/Makefile.in
index f5bfbcb12..8c47d0faf 100644
--- a/lib/mesa/src/gallium/targets/xa/Makefile.in
+++ b/lib/mesa/src/gallium/targets/xa/Makefile.in
@@ -130,6 +130,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__append_17 = \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(FREEDRENO_LIBS) \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(LIBDRM_LIBS)
@@ -219,6 +221,8 @@ am__DEPENDENCIES_6 = \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@@HAVE_GALLIUM_SVGA_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__DEPENDENCIES_10 = $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_drm.la \
+@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(top_builddir)/src/freedreno/libfreedreno_ir3.la \
@HAVE_GALLIUM_FREEDRENO_TRUE@@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@am__DEPENDENCIES_11 = \
@HAVE_GALLIUM_STATIC_TARGETS_TRUE@ $(am__DEPENDENCIES_7) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 17:42:43 +0000