Bug 1094199 - Merge request since the mesa-10.2 rebase
Summary: Merge request since the mesa-10.2 rebase
Keywords:
Status: CLOSED RAWHIDE
Alias: None
Product: Fedora
Classification: Fedora
Component: mesa
Version: rawhide
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Igor Gnatenko
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2014-05-05 09:41 UTC by Nicolas Chauvet (kwizart)
Modified: 2014-05-05 22:41 UTC (History)
5 users (show)

Fixed In Version:
Clone Of:
: 1094588 (view as bug list)
Environment:
Last Closed: 2014-05-05 11:57:44 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)

Description Nicolas Chauvet (kwizart) 2014-05-05 09:41:28 UTC
Description of problem:
I'm tracking the mesa-10.2 branch since a little time and I would like few patches to be merged into the fedora mesa.spec

Version-Release number of selected component (if applicable):
current mesa.spec in devel

You can consider merging the following patches from:
http://people.fedoraproject.org/cgit/kwizart/public_git/mesa.git


commit 5fd1e8b49f9f247b4246d7f5b380d7de97e39403
Author: Nicolas Chauvet <kwizart>
Date:   Sun Feb 9 11:14:05 2014 +0100

    Enable omx on x86 and arm

commit 7aa0856ccbde509dad94c41d4204d2e606499cc2
Author: Nicolas Chauvet <kwizart>
Date:   Mon Feb 3 16:21:09 2014 +0100

    Split _with_xa from _with_vmware

commit 732482a4c124ebc4bf9a58accd77eb26c8593c34
Author: Nicolas Chauvet <kwizart>
Date:   Mon Feb 3 16:22:48 2014 +0100

    Add _with_xa when arch is arm and _with_freedreeno
    
    According to the build instructions for freedreeno
    https://github.com/freedreno/freedreno/wiki/Git-Trees-%26-Branches#build-instructions
    the driver requires the xa state tracker to be enabled

Comment 1 Igor Gnatenko 2014-05-05 10:11:42 UTC
Ok! I'll take a look for you changes. Tonight.

Comment 3 Nicolas Chauvet (kwizart) 2014-05-05 11:18:12 UTC
Thx

I've fixed some patches because the split between the merge-able and wip version isn't clean yet.

koji scratch build with  patches on top of the rebased mesa.spec to 10.2
http://koji.fedoraproject.org/koji/taskinfo?taskID=6813538

Fixed hash for: "Enable omx on x86 and arm"
9487c811f49d605f8d448e238e4d04f8e0b1cc04

Added 27fb68daf5a0adc382fe8d85e057b40166ca35e4
Enable gallium-egl (needed by freedreeno)

That been said I don't understand why this last (gallium-egl) was not enabled previously. gallium-pipe seems to be automatically enabled when freedreno is built with xa support. I will try to sort that out...

Comment 4 Igor Gnatenko 2014-05-05 11:42:36 UTC
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/mesa-10.2-0.rc1.20140505.fc21.arm
error: Installed (but unpackaged) file(s) found:
   /usr/lib/gallium-pipe/pipe_msm.so
   /usr/lib/gallium-pipe/pipe_nouveau.so
   /usr/lib/gallium-pipe/pipe_r300.so
   /usr/lib/gallium-pipe/pipe_r600.so
   /usr/lib/gallium-pipe/pipe_radeonsi.so
   /usr/lib/gallium-pipe/pipe_swrast.so
    Installed (but unpackaged) file(s) found:
   /usr/lib/gallium-pipe/pipe_msm.so
   /usr/lib/gallium-pipe/pipe_nouveau.so
   /usr/lib/gallium-pipe/pipe_r300.so
   /usr/lib/gallium-pipe/pipe_r600.so
   /usr/lib/gallium-pipe/pipe_radeonsi.so
   /usr/lib/gallium-pipe/pipe_swrast.so

Comment 5 Nicolas Chauvet (kwizart) 2014-05-05 11:43:33 UTC
You can either merge 27fb68daf5a0adc382fe8d85e057b40166ca35e4
or the quickfix is probably to revert "enable xa on freedreno".

Comment 7 Nicolas Chauvet (kwizart) 2014-05-05 13:02:05 UTC
Thx for applying the patch. That been said Something is requesting enable_gallium_loader=yes and maybe it shouldn't. I will track this upstream.


Upstream bug report:
https://bugs.freedesktop.org/show_bug.cgi?id=78298

Comment 8 Rob Clark 2014-05-05 13:57:46 UTC
(In reply to Nicolas Chauvet (kwizart) from comment #7)
> Thx for applying the patch. That been said Something is requesting
> enable_gallium_loader=yes and maybe it shouldn't. I will track this upstream.
> 
> 
> Upstream bug report:
> https://bugs.freedesktop.org/show_bug.cgi?id=78298

Hey, just a heads up.  This is something that has changed vs older mesa.  It used to be that libxatracker statically linked vmwgfx pipe driver.  This has been refactored to make libxatracker usable to other drivers.  Now it dynamically loads the pipe driver.  So the correct solution would not be to remove enable_gallium_loader=yes.  But instead build and install gallium loader (both for x86 and for arm)

Comment 9 Loïc Yhuel 2014-05-05 22:41:56 UTC
I think some files aren't packaged in the the right rpm :
 - /usr/lib64/egl/egl_gallium.so isn't a devel symlink, it's a shared library : it needs to be in mesa-libEGL, not mesa-libEGL-devel
 - On VMware, libxatracker.so will need /usr/lib64/gallium-pipe/pipe_vmwgfx.so (see http://lists.freedesktop.org/archives/mesa-dev/2014-May/058984.html), so this file (and probably other gallium-pipe plugins) shouldn't be in mesa-libOpenCL, but perhaps in mesa-dri-drivers (as done on arm)


Note You need to log in before you can comment on or make changes to this bug.