This is a combination of patches from Jan, Emil, and myself. The general idea is that we can remove the r600g driver dependency on the amdgpu drm when OpenCL isn't being built.
I've elected to add a configure-time dependency on libdrm_amdgpu if CL is enabled at this point. The libamd_common library currently has too many things that depend on the amdgpu drm headers to separate out, and long-term we may want to just pull out the ac_ functions that r600/cl needs into a very small/compact object/library as has been suggested by others. Patch 1 is from Jan, unmodified. Patch 2 is mine: It puts a configure-time dependency on libdrm_amdgpu if building r600g + clover Patch 3 is a modified v3 version of patch 4 from Emil's series Patch 4 is just patch 1/5 of emil's series with a R-b tag I've build tested the following combinations: r600g without opencl without libdrm_amdgpu: build succeeds r600g with opencl without libdrm_amdgpu: configure: error: r600 with OpenCL requires libdrm_amdgpu >= 2.4.81 r600g without opencl with libdrm_amdgpu: build succeeds r600g with opencl with libdrm_amdgpu: build succeeds I've tested the r600g build after deleting libdrm_amdgpu (headers and .pc file), but the machine that I've got at home to test the built artifacts with is currently turned off, so this series has just been compile tested. I had previously tested Jan's automake patch on a live r600 machine both with/without CL enabled, so I'm not too worried. I hope to do a test run on my BARTS tonight, but if Jan's got time he can test it independently before then. --Aaron _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
