[beignet] 01/03: Documentation improvements: Make pocl link actually point to pocl Add more details of LLVM mismatch issues

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 591ab3fec04ffb3f909a3b7f89edb9fe647cde3e
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Jan 14 10:25:42 2017 +0000

    Documentation improvements:
    Make pocl link actually point to pocl
    Add more details of LLVM mismatch issues
---
 debian/beignet-opencl-icd.README.Debian |  4 ++++
 debian/changelog                        |  2 ++
 debian/patches/update-docs.patch        | 12 ++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/beignet-opencl-icd.README.Debian b/debian/beignet-opencl-icd.README.Debian
index 34e0f19..c727121 100644
--- a/debian/beignet-opencl-icd.README.Debian
+++ b/debian/beignet-opencl-icd.README.Debian
@@ -10,6 +10,10 @@ for Debian stable, these can be found in -backports
 In particular, if you have Haswell hardware and installed this package
 from jessie-backports, you probably also need a jessie-backports kernel.
 
+If you installed this from -backports and are using OpenCL and graphics
+in the same program (e.g. Blender), you may also need to install
+libgl1-mesa-dri from -backports to avoid a crash.
+
 Discrete GPUs often disable the integrated GPU, preventing this package
 from working.  It may or may not be possible to re-enable it
 (https://nouveau.freedesktop.org/wiki/Optimus/).
diff --git a/debian/changelog b/debian/changelog
index e7ccb8c..89fc9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ beignet (1.2.1-2) UNRELEASED; urgency=medium
   * Fix invalid-iterator crash when compiling large kernels.
   * Switch to LLVM 3.9.
   * Fail, don't assert, on failed context creation.  (Closes: #848792)
+  * Better document #848368 workarounds.
+  * Fix pocl link in documentation.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Tue, 03 Jan 2017 21:52:36 +0000
 
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index d32c8a4..a61783b 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -100,7 +100,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  
 +As these GPUs are not necessarily backwards compatible, Beignet will not attempt to use processors it does not recognise.  Hence, processors introduced after this release of Beignet (even within a supported family) may require a newer version of beignet-opencl-icd (and possibly the kernel, linux-image-amd64 or linux-image-i686-pae): for Debian stable, this [may be available](https://packages.debian.org/search?keywords=beignet-opencl-icd&searchon=names&exact=1&suite=all&section=all) in [ [...]
 +
-+Not all processor models have an integrated GPU (Beignet does _not_ support running OpenCL on the CPU itself - see [pocl-opencl-icd](https://packages.debian.org/search?keywords=beignet-opencl-icd&searchon=names&exact=1&suite=all&section=all) for that).  Systems that also have a discrete GPU may disable the integrated GPU: check _xrandr --listproviders_ or see [here](https://nouveau.freedesktop.org/wiki/Optimus/).
++Not all processor models have an integrated GPU (Beignet does _not_ support running OpenCL on the CPU itself - see [pocl-opencl-icd](https://packages.debian.org/search?keywords=pocl-opencl-icd&searchon=names&exact=1&suite=all&section=all) for that).  Systems that also have a discrete GPU may disable the integrated GPU: check _xrandr --listproviders_ or see [here](https://nouveau.freedesktop.org/wiki/Optimus/).
 +
 +Attempting to run Beignet on unsupported hardware should return CL_DEVICE_NOT_FOUND; if it does anything else (especially crashing) please [report a bug](#howtocontribute).
 +
@@ -143,12 +143,12 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +  [was recently re-added](https://cgit.freedesktop.org/beignet/commit/?id=a892148ee12cbaa021b680c4d770e53fab511366)
 +  to upstream Beignet, but might not be fully working yet.
 +
-+* Crash when the same program uses both Beignet and OpenGL (mesa).
++* Crash when the same program (e.g. Blender) uses both OpenCL and graphics.
 +  
-+  This has been reported to happen if Beignet and Mesa use different LLVM versions,
-+  but I don't know the details: if you see this, please report a bug.
-+  Because of this, the Debian packages use matching versions: if you installed this
-+  package from -backports, try also installing mesa from -backports.
++  This [can happen](https://bugs.debian.org/848368) if Beignet and Mesa use different
++  LLVM versions.
++  To avoid this, the Debian packages use matching versions: if you installed this
++  package from -backports, try also installing libgl1-mesa-dri from -backports.
 +
 +* clCreateBuffer with CL_MEM_ALLOC_HOST_PTR doesn't work.
 +  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git