[beignet] 03/09: Drop patch applied upstream, refresh others.

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Sat Oct 28 07:34:13 UTC 2017 

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

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

commit 746551188fa7d57bf892132d5010963f3cec524f
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Fri Oct 27 07:35:05 2017 +0100

    Drop patch applied upstream, refresh others.
---
 debian/changelog                            |  7 ++++
 debian/patches/docs-broken-links.patch      |  4 +-
 debian/patches/reduce-notfound-output.patch |  6 +--
 debian/patches/series                       |  1 -
 debian/patches/ship-test-tool.patch         |  4 +-
 debian/patches/support-kfreebsd.patch       |  2 +-
 debian/patches/update-docs.patch            | 22 +++++------
 debian/patches/zerooffset.patch             | 61 -----------------------------
 8 files changed, 26 insertions(+), 81 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9674708..7eaf37f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beignet (1.3.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop patch applied upstream, refresh others.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Fri, 27 Oct 2017 07:31:21 +0100
+
 beignet (1.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/docs-broken-links.patch b/debian/patches/docs-broken-links.patch
index a3a120a..dd3514f 100644
--- a/debian/patches/docs-broken-links.patch
+++ b/debian/patches/docs-broken-links.patch
@@ -21,7 +21,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  * Run as root without X.
  * Enable the drm render nodes by passing drm.rnodes=1 to the kernel boot args, then you can run beignet with non-root and without X.
  
-@@ -296,15 +297,15 @@ Please specify your hardware when report
+@@ -288,15 +289,15 @@ Please specify your hardware when report
  
  Documents for OpenCL application developers
  -------------------------------------------
@@ -38,7 +38,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  - [[OpenGL Buffer Sharing|Beignet/howto/gl-buffer-sharing-howto]]
 -- [[Video Motion Estimation|Beignet/howto/video-motion-estimation-howto]]
 -- [[Stand Alone Unit Test|Beignet/howto/stand-alone-utest-howto]]
--- [[Android build|Beignet/android-build-howto]]
+-- [[Android build|Beignet/howto/android-build-howto]]
 +- [[Video Motion Estimation|howto/video-motion-estimation-howto]]
 +- [[Stand Alone Unit Test|howto/stand-alone-utest-howto]]
 +- [[Android build|howto/android-build-howto]]
diff --git a/debian/patches/reduce-notfound-output.patch b/debian/patches/reduce-notfound-output.patch
index 4247ed8..93924c9 100644
--- a/debian/patches/reduce-notfound-output.patch
+++ b/debian/patches/reduce-notfound-output.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
 --- a/src/cl_device_id.c
 +++ b/src/cl_device_id.c
-@@ -753,10 +753,10 @@ kbl_gt4_break:
+@@ -797,10 +797,10 @@ glk12eu_break:
      case PCI_CHIP_SANDYBRIDGE_BRIDGE_S:
      case PCI_CHIP_SANDYBRIDGE_S_GT:
        // Intel(R) HD Graphics SandyBridge not supported yet
@@ -23,7 +23,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    if (ret == NULL)
 --- a/src/intel/intel_driver.c
 +++ b/src/intel/intel_driver.c
-@@ -254,7 +254,6 @@ if(!intel_driver_is_active(intel)) {
+@@ -263,7 +263,6 @@ if(!intel_driver_is_active(intel)) {
  }
  
  if(!intel_driver_is_active(intel)) {
@@ -31,7 +31,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    return CL_DEVICE_NOT_FOUND;
  }
  
-@@ -315,7 +314,6 @@ drm_client_t client;
+@@ -324,7 +323,6 @@ drm_client_t client;
  // usually dev_name = "/dev/dri/card%d"
  dev_fd = open(dev_name, O_RDWR);
  if (dev_fd == -1) {
diff --git a/debian/patches/series b/debian/patches/series
index c8bccbc..2541e89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ docs-broken-links.patch
 cl_accelerator_intel.patch
 add-appstream-metadata.patch
 static-llvm.patch
-zerooffset.patch
diff --git a/debian/patches/ship-test-tool.patch b/debian/patches/ship-test-tool.patch
index b76c917..3dfad1b 100644
--- a/debian/patches/ship-test-tool.patch
+++ b/debian/patches/ship-test-tool.patch
@@ -50,7 +50,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
        GET_DEVICE_STR_INFO(profile, PROFILE);
 --- a/utests/CMakeLists.txt
 +++ b/utests/CMakeLists.txt
-@@ -338,9 +338,7 @@ else(GEN_PCI_ID)
+@@ -341,9 +341,7 @@ else(GEN_PCI_ID)
    DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl)
  endif(GEN_PCI_ID)
  
@@ -60,7 +60,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
  
  add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated
      COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p
-@@ -389,6 +387,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
+@@ -392,6 +390,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
  endif (NOT_BUILD_STAND_ALONE_UTEST)
  
  ADD_DEPENDENCIES (utests utest_generator)
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index 0c757c4..1375050 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -22,7 +22,7 @@ Author: Koop Mast, Rebecca Palmer
  
  #ifndef CL_VERSION_1_2
  #define CL_DEVICE_BUILT_IN_KERNELS 0x103F
-@@ -771,11 +776,24 @@ kbl_gt4_break:
+@@ -815,11 +820,24 @@ glk12eu_break:
    #define toMB(size) (size)&(UINT64_MAX<<20)
    /* Get the global_mem_size and max_mem_alloc size from
     * driver, system ram and hardware*/
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index 670d15a..9c7ec2d 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
 --- a/src/cl_device_id.c
 +++ b/src/cl_device_id.c
-@@ -863,7 +863,7 @@ cl_self_test(cl_device_id device, cl_sel
+@@ -907,7 +907,7 @@ cl_self_test(cl_device_id device, cl_sel
                      } else {
                        ret = SELF_TEST_SLM_FAIL;
                        printf("Beignet: self-test failed: (3, 7, 5) + (5, 7, 3) returned (%i, %i, %i)\n"
@@ -62,19 +62,19 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 -firstly as below:
 -
 -`> . setenv.sh`
+-
+-Then in `utests/`:
 +In Debian beignet, the testing tool is in the _beignet-dev_ package, and is run with:
  
--Then in `utests/`:
+-`> ./utest_run`
 +`> /usr/lib/\`dpkg-architecture -qDEB_HOST_MULTIARCH\`/beignet/utest_run`
  
--`> ./utest_run`
+-will run all the unit tests one after the others
 +(this name and path may change in future releases - please do not rely on it).  It will test the first OpenCL GPU device it finds (which does _not_ have to be a Beignet device).  If you want to test a different device, uninstall all other ICDs.  To see more options, pass `-h`.
  
--will run all the unit tests one after the others
+-`> ./utest_run some_unit_test`
 +If you compiled Beignet yourself, you will find this tool in `utests`, and will need to set some environment variables to use it (see `setenv.sh`).
  
--`> ./utest_run some_unit_test`
--
 -will only run `some_unit_test` test.
  
  On all supported target platform, the pass rate should be 100%. If it is not, you may
@@ -131,11 +131,10 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    
    `export OCL_IGNORE_SELF_TEST=1`
    
-@@ -223,6 +226,16 @@ Known Issues
- * cl\_khr\_gl\_sharing.
+@@ -224,6 +227,16 @@ Known Issues
    This extension is partially implemented(the most commonly used part), and we will implement
    other parts based on requirement.
-+
+ 
 +* clCreateBuffer with CL_MEM_ALLOC_HOST_PTR doesn't work.
 +  
 +  This feature is unreliable on older versions of Linux, including jessie's 3.16.
@@ -145,10 +144,11 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +  
 +  Debian uses the Khronos cl_ext.h, which does not yet include this extension.  It is available
 +  by including first cl_ext.h then cl_intel.h.
- 
++
  Project repository
  ------------------
-@@ -269,9 +289,9 @@ The official mail list is as below:
+ Right now, we host our project on fdo at:
+@@ -269,9 +282,9 @@ The official mail list is as below:
  [http://lists.freedesktop.org/mailman/listinfo/beignet](http://lists.freedesktop.org/mailman/listinfo/beignet)  
  The official bugzilla is at:
  [https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet](https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet)  
diff --git a/debian/patches/zerooffset.patch b/debian/patches/zerooffset.patch
deleted file mode 100644
index c63b47e..0000000
--- a/debian/patches/zerooffset.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Check that we can reserve the zero-offset
-
-commit ff57cee0519d ("ocl20/runtime: take the first 64KB page table
-entries") tries to allocate a bo at 0 offset, but failed to take into
-account that something may already be allocated there that it is not
-allowed to evict (particularly when not using full-ppgtt separation).
-Failure to do so causes all execution to subsequentally fail with
-"drm_intel_gem_bo_context_exec() failed: Device or resource busy"
-
-This is needed when using older (Ivy Bridge/Haswell) hardware with
-current Linux/libdrm
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98647
-Bug-Debian: https://bugs.debian.org/860805
-Origin: upstream 8b04f0be372da8eabdc93d6ae1b81a3c83cba284
-Author: Yang Rong, Chris Wilson
-
-diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c
-index b8a1b52..3caf737 100644
---- a/src/intel/intel_driver.c
-+++ b/src/intel/intel_driver.c
-@@ -137,19 +137,28 @@ return 1;
- static int
- intel_driver_context_init(intel_driver_t *driver)
- {
--driver->ctx = drm_intel_gem_context_create(driver->bufmgr);
--if (!driver->ctx)
--  return 0;
--driver->null_bo = NULL;
-+  driver->ctx = drm_intel_gem_context_create(driver->bufmgr);
-+  if (!driver->ctx)
-+    return 0;
-+  driver->null_bo = NULL;
- #ifdef HAS_BO_SET_SOFTPIN
--drm_intel_bo *bo = dri_bo_alloc(driver->bufmgr, "null_bo", 64*1024, 4096);
--drm_intel_bo_set_softpin_offset(bo, 0);
--// don't reuse it, that would make two bo trying to bind to same address,
--// which is un-reasonable.
--drm_intel_bo_disable_reuse(bo);
--driver->null_bo = bo;
-+  drm_intel_bo *bo = dri_bo_alloc(driver->bufmgr, "null_bo", 64*1024, 4096);
-+  drm_intel_bo_set_softpin_offset(bo, 0);
-+  // don't reuse it, that would make two bo trying to bind to same address,
-+  // which is un-reasonable.
-+  drm_intel_bo_disable_reuse(bo);
-+
-+  drm_intel_bo_map(bo, 1);
-+  *(uint32_t *)bo->virtual = MI_BATCH_BUFFER_END;
-+  drm_intel_bo_unmap(bo);
-+
-+  if (drm_intel_gem_bo_context_exec(bo, driver->ctx, 0, 0) == 0) {
-+    driver->null_bo = bo;
-+  } else {
-+    drm_intel_bo_unreference(bo);
-+  }
- #endif
--return 1;
-+    return 1;
- }
- 
- static void

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

More information about the Pkg-opencl-commits mailing list