Auto sync2gitlab import of mesa-21.3.4-1.el8.src.rpm
This commit is contained in:
parent
0aa6aa4f8c
commit
711f6bc26a
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/mesa-21.3.4.tar.xz
|
58
0001-iris-implement-inter-context-busy-tracking.patch
Normal file
58
0001-iris-implement-inter-context-busy-tracking.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
From 07dc3d4238e57901ccf98e0b506d9aad2c86b9d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
|
||||||
|
Date: Mon, 10 Jan 2022 17:18:05 -0800
|
||||||
|
Subject: [PATCH] iris: implement inter-context busy-tracking
|
||||||
|
|
||||||
|
Previously, no buffers were ever marked as EXEC_OBJECT_ASYNC so the
|
||||||
|
Kernel would ensure dependency tracking for us. After we implemented
|
||||||
|
explicit busy tracking in commit 89a34cb8450a, only the external
|
||||||
|
objects kept relying on the Kernel's implicit tracking and Iris did
|
||||||
|
inter-batch busy tracking, meaning we lost inter-screen and
|
||||||
|
inter-context synchronization. This seemed fine to me since, as far as
|
||||||
|
I understood, it is the duty of the application to synchronize itself
|
||||||
|
against multiple screens and contexts.
|
||||||
|
|
||||||
|
The problem here is that applications were actually relying on the old
|
||||||
|
behavior where the Kernel guarantees synchronization, so 89a34cb8450a
|
||||||
|
can be seen as a regression. This commit addresses the inter-context
|
||||||
|
synchronization case.
|
||||||
|
|
||||||
|
Cc: mesa-stable
|
||||||
|
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731
|
||||||
|
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5812
|
||||||
|
Fixes: 89a34cb8450a ("iris: switch to explicit busy tracking")
|
||||||
|
Tested-by: Konstantin Kharlamov <hi-angel@yandex.ru>
|
||||||
|
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
|
||||||
|
---
|
||||||
|
src/gallium/drivers/iris/iris_batch.c | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
|
||||||
|
index b7bde60aae7..1b0c5896d4f 100644
|
||||||
|
--- a/src/gallium/drivers/iris/iris_batch.c
|
||||||
|
+++ b/src/gallium/drivers/iris/iris_batch.c
|
||||||
|
@@ -835,6 +835,12 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write)
|
||||||
|
move_syncobj_to_batch(batch, &deps->write_syncobjs[other_batch_idx],
|
||||||
|
I915_EXEC_FENCE_WAIT);
|
||||||
|
|
||||||
|
+ /* If it's being written by our screen, wait on it too. This is relevant
|
||||||
|
+ * when there are multiple contexts on the same screen. */
|
||||||
|
+ if (deps->write_syncobjs[batch_idx])
|
||||||
|
+ move_syncobj_to_batch(batch, &deps->write_syncobjs[batch_idx],
|
||||||
|
+ I915_EXEC_FENCE_WAIT);
|
||||||
|
+
|
||||||
|
struct iris_syncobj *batch_syncobj = iris_batch_get_signal_syncobj(batch);
|
||||||
|
|
||||||
|
if (write) {
|
||||||
|
@@ -847,6 +853,8 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write)
|
||||||
|
|
||||||
|
move_syncobj_to_batch(batch, &deps->read_syncobjs[other_batch_idx],
|
||||||
|
I915_EXEC_FENCE_WAIT);
|
||||||
|
+ move_syncobj_to_batch(batch, &deps->read_syncobjs[batch_idx],
|
||||||
|
+ I915_EXEC_FENCE_WAIT);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/* If we're reading, replace the other read from our batch index. */
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
23
Makefile
Normal file
23
Makefile
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
VERSION ?= 21.3.4
|
||||||
|
SANITIZE ?= 1
|
||||||
|
|
||||||
|
DIRNAME = mesa-${VERSION}
|
||||||
|
|
||||||
|
all: archive
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf $(DIRNAME)/
|
||||||
|
rm -f mesa-${VERSION}.tar.xz
|
||||||
|
|
||||||
|
clone: clean
|
||||||
|
curl -O https://archive.mesa3d.org/mesa-${VERSION}.tar.xz
|
||||||
|
tar xf mesa-${VERSION}.tar.xz
|
||||||
|
|
||||||
|
sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
|
||||||
|
ifdef SANITIZE
|
||||||
|
cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||||
|
cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
archive: clone sanitize
|
||||||
|
tar caf ${DIRNAME}.tar.xz ${DIRNAME}
|
117
Mesa-MLAA-License-Clarification-Email.txt
Normal file
117
Mesa-MLAA-License-Clarification-Email.txt
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
|
||||||
|
Subject: RE: Question about Mesa MLAA license
|
||||||
|
From: Jorge Jimenez <iryoku@gmail.com>
|
||||||
|
Date: 01/08/2013 12:50 PM
|
||||||
|
To: Tom Callaway <tcallawa@redhat.com>
|
||||||
|
CC: "jorge@iryoku.com" <jorge@iryoku.com>
|
||||||
|
|
||||||
|
Yes to both questions.
|
||||||
|
|
||||||
|
Thanks,
|
||||||
|
Jorge
|
||||||
|
|
||||||
|
From: Tom Callaway <tcallawa@redhat.com>
|
||||||
|
Sent: January 8, 2013 6:49 PM
|
||||||
|
To: Jorge Jimenez <iryoku@gmail.com>
|
||||||
|
CC: jorge@iryoku.com
|
||||||
|
Subject: Re: Question about Mesa MLAA license
|
||||||
|
|
||||||
|
On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
|
||||||
|
> Hi Tom,
|
||||||
|
>
|
||||||
|
> What we meant with that is that we made an exception for clause 2.
|
||||||
|
> Instead of clause 2, in the case of the Mesa project, you have to name
|
||||||
|
> the technique Jimenez's MLAA in the config options of Mesa. We did that
|
||||||
|
> just to allow them to solve license issues. This exception should be for
|
||||||
|
> the Mesa project, and any project using Mesa, like Fedora.
|
||||||
|
>
|
||||||
|
> We want to widespread usage of our MLAA, so we want to avoid any kind of
|
||||||
|
> license complications. Hope current one is good for Fedora, if not
|
||||||
|
> please tell, and we'll see what we can do!
|
||||||
|
|
||||||
|
Okay, a few more questions:
|
||||||
|
|
||||||
|
* If Fedora decides to simply reproduce the quoted statement:
|
||||||
|
"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
|
||||||
|
Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
|
||||||
|
|
||||||
|
Specifically, if this is done as part of documentation included with
|
||||||
|
Mesa, is that sufficient to meet clause 2 even if the Mesa config option
|
||||||
|
is not set as described in your exception?
|
||||||
|
|
||||||
|
* Currently, the Mesa config option for MLAA says: "Morphological
|
||||||
|
anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
|
||||||
|
quality". Is this in compliance with your exception?
|
||||||
|
|
||||||
|
Thanks again,
|
||||||
|
|
||||||
|
~tom
|
||||||
|
|
||||||
|
==
|
||||||
|
Fedora Project
|
||||||
|
|
||||||
|
Subject: RE: Question about Mesa MLAA license
|
||||||
|
From: Jorge Jimenez <iryoku@gmail.com>
|
||||||
|
Date: 01/08/2013 12:39 PM
|
||||||
|
To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
|
||||||
|
|
||||||
|
Hi Tom,
|
||||||
|
|
||||||
|
What we meant with that is that we made an exception for clause 2.
|
||||||
|
Instead of clause 2, in the case of the Mesa project, you have to name
|
||||||
|
the technique Jimenez's MLAA in the config options of Mesa. We did that
|
||||||
|
just to allow them to solve license issues. This exception should be for
|
||||||
|
the Mesa project, and any project using Mesa, like Fedora.
|
||||||
|
|
||||||
|
We want to widespread usage of our MLAA, so we want to avoid any kind of
|
||||||
|
license complications. Hope current one is good for Fedora, if not
|
||||||
|
please tell, and we'll see what we can do!
|
||||||
|
|
||||||
|
Cheers,
|
||||||
|
Jorge
|
||||||
|
|
||||||
|
From: Tom Callaway <tcallawa@redhat.com>
|
||||||
|
Sent: January 8, 2013 6:30 PM
|
||||||
|
To: jorge@iryoku.com
|
||||||
|
Subject: Question about Mesa MLAA license
|
||||||
|
|
||||||
|
Jorge,
|
||||||
|
|
||||||
|
Thanks for all of your fantastic graphics work! I have been auditing
|
||||||
|
Fedora (a popular distribution of Linux) for license compliance and I
|
||||||
|
came across your MLAA code in Mesa.
|
||||||
|
|
||||||
|
The license says:
|
||||||
|
|
||||||
|
* 2. Redistributions in binary form must reproduce the following
|
||||||
|
statement:
|
||||||
|
*
|
||||||
|
* "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
|
||||||
|
* Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
|
||||||
|
*
|
||||||
|
* Only for use in the Mesa project, this point 2 is filled by naming the
|
||||||
|
* technique Jimenez's MLAA in the Mesa config options.
|
||||||
|
|
||||||
|
That wording is unclear. When you say "Only for use in the Mesa
|
||||||
|
project...", it seems like you could either be saying:
|
||||||
|
|
||||||
|
- This code may only be used as part of Mesa.
|
||||||
|
|
||||||
|
OR
|
||||||
|
|
||||||
|
- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
|
||||||
|
MLAA" in the Mesa config options.
|
||||||
|
|
||||||
|
*****
|
||||||
|
|
||||||
|
If the first item is true, then we may have to remove the MLAA code from
|
||||||
|
Fedora's copy of Mesa. However, looking at the license on your SMAA
|
||||||
|
code, I do not believe it to be the case. Please let me know either way!
|
||||||
|
|
||||||
|
Thanks in advance,
|
||||||
|
|
||||||
|
Tom Callaway
|
||||||
|
Fedora Legal
|
||||||
|
|
||||||
|
==
|
||||||
|
Fedora Project
|
13
lavapipe-disable-env-var.patch
Normal file
13
lavapipe-disable-env-var.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c
|
||||||
|
--- mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma 2021-11-18 06:16:20.000000000 +1000
|
||||||
|
+++ mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c 2021-11-18 07:03:17.652283186 +1000
|
||||||
|
@@ -213,6 +213,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_Creat
|
||||||
|
if (pAllocator == NULL)
|
||||||
|
pAllocator = vk_default_allocator();
|
||||||
|
|
||||||
|
+ if (!getenv("RH_SW_VULKAN"))
|
||||||
|
+ return VK_ERROR_INITIALIZATION_FAILED;
|
||||||
|
+
|
||||||
|
instance = vk_zalloc(pAllocator, sizeof(*instance), 8,
|
||||||
|
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
|
||||||
|
if (!instance)
|
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
SHA512 (mesa-21.3.4.tar.xz) = e244890f7f0d1d9f23e3e5f577a4614636e7e31e1261e397921890c2eb761b3ba17567d8ec095dddac93cc280729870aa117cb01b15a8c8fdd9ed633f0871b76
|
20
vl_decoder.c
Normal file
20
vl_decoder.c
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#include "vl_decoder.h"
|
||||||
|
bool
|
||||||
|
vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
|
||||||
|
enum pipe_video_entrypoint entrypoint)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct pipe_video_codec *
|
||||||
|
vl_create_decoder(struct pipe_context *pipe,
|
||||||
|
const struct pipe_video_codec *templat)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
7
vl_mpeg12_decoder.c
Normal file
7
vl_mpeg12_decoder.c
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#include "vl_mpeg12_decoder.h"
|
||||||
|
struct pipe_video_codec *
|
||||||
|
vl_create_mpeg12_decoder(struct pipe_context *context,
|
||||||
|
const struct pipe_video_codec *templat)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user