summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-05xf86drmMode.h: inline -> __inline for use with gcc -std=c89 -pedanticDaniel Kurtz
Unfortunately, there are some users of libdrm installed headers that like to be built with -std=c89 -pedantic, which does not like "inline". However, __inline works. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-04-05xf86drm: Fix ioctl struct clearing in drmAgpEnableConnor Behan
This one is a bit harder to notice. Signed-off-by: Connor Behan <connor.behan@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-04-05drm: use correct printf modifiersEmil Velikov
The valies are unsigned long, thus we should use %lu. v2: Drop old printf statement. (Jan) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05drm: replace HASH_DEBUG with DEBUGEmil Velikov
... and remove the useless SL_DEBUG and RANDOM_DEBUG v2: Rebase on earlier changes. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05tests/random: return non-zero on test failureEmil Velikov
... and wire it up to make check v2: s/rand - state->check/rand != state->check/. (Jan) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05tests/random: extract test out of xf86drmRandom.cEmil Velikov
With follow up commits we can clear it up and wire to make check v2: - Use xf86drmRandom.h for common struct.(Jan) - Add test to .gitignore. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05tests/hash: return non-zero on failureEmil Velikov
... and wire up to `make check' now that it's useful. v2: Really return non-zero on failure. v3: Initialise ret. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu> (v2)
2015-04-05tests/hash: style fixesEmil Velikov
v2: Rebase on earlier changes. Keep count initialisation as is. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05tests/hash: misc compilation fixesEmil Velikov
Get the test from completely broken to working like a charm. - Use the same variable type for both HashInsert and HashLookup. - Use correct storage type for the HashLookup return value. - Remove useless backward iteration of HashLookup(i). v2: - Use void * instead of unsigned long. - Change value to key << 16 | key. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-05tests/hash: extract test out of xf86drmHash.cEmil Velikov
This way with follow up commits we can fix it and wire it up to make check v2: - Use xf86drmHash.h for common structs.(Jan) - Add test to .gitignore. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
2015-04-04tests/drmsl: Extract tests out of xf86drmSL.cJan Vesely
v2: merge tests creation and xf86drmSL cleanup rename tests/drmsltest -> tests/drmsl move the test out of libudev test block v3: run test even on noudev builds Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-04-04drmSL: Fix neighbor lookupJan Vesely
Commit e4a519635f75bde38aeb5b09f2ff4efbf73453e9: Tidy up compile warnings by cleaning up types. removed call to SLLocate which gutted the function of all functionality. This patch restores the original behavior, with an additional fix that zeros the update array in case SLLocate bails early. v2: zero the update array instead of checking the return value. SLLocate returns NULL both on failure and if the element is greater than everything in the list v3: Improve commit message Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-26android: remove explicit include to libpciaccessEmil Velikov
Both android-x86 and android-ia versions of libpciacccess correctly "export" the include. If anyone else is wrapping up their own version they should do so as well. Remove this fixed location hack from the build. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
2015-03-20tests/exynos: Fix missing static keywordJan Vesely
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
2015-03-20Remove drmSetDebugMsgFunction and related infrastructureJan Vesely
Not used anywhere Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20Fix unused function warningsJan Vesely
v2: Remove the handler function instead of commenting out split debugmsg function removal to a separate patch Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20tests: add rockchip to modetest, kmstest, vbltest and proptestDaniel Kurtz
There is a rockchip drm kms driver. Add "rockchip" to the static lists of driver names in the the standard set of tests. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> [Emil Velikov: Resolve trivial conflicts.] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20proptest: install it with --enable-install-test-programsDaniel Kurtz
--enable-install-test-programs allows tests to be installed in $bindir. This is disabled by default, but very useful when cross compiling. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20autotools: remove ${srcdir} from the includesEmil Velikov
Already handled by the build system. v2: s/compiler/build system/ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: get rid of LIBDRM_TOPChih-Wei Huang
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
2015-03-20android: simplify the including rule of subdirsChih-Wei Huang
Use android build system functions to include Android.mk of subdirs. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> [Emil Velikov: Resolve trivial conflicts.] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: add the missing tag "optional" to libkmsEmil Velikov
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: remove LOCAL_COPY_HEADERS* variablesEmil Velikov
With earlier changes we've implicitly add the relevant directories to the includes list, via LOCAL_EXPORT_C_INCLUDES_DIRS. v2: Update the top Android.mk as well. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: remove ${srcdir} from the includesEmil Velikov
Already handled by the build system. v2: s/compiler/build system/. Spotted by Chih-Wei. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: simplify LOCAL_C_INCLUDESEmil Velikov
Each of the libdrm_${hw} modules pull libdrm for linking as such: libdrm's LOCAL_EXPORT_C_INCLUDE_DIRS are added to the includes list. The former of which is already set to ${top} and ${top}/include/drm. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20android: correcly set LOCAL_EXPORT_C_INCLUDE_DIRSEmil Velikov
- Don't add ${hw}/${hw}, but ${hw} to the includes path. The former does not exist. - Set the variable for libkms. Inspired by the work of from Chih-Wei from the Android-x86 project. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-20RELEASING: Fix annouce typoDamien Lespiau
That's the only typo :set spell found. v2: Fix typo in commit message (Ilia Mirkin) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-20RELEASING: Fix the step numberingDamien Lespiau
v2: Really fix the numbering (Emil Velikov) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-20RELEASING: Fix releasing instructions to match the latest release.shDamien Lespiau
It seems that the tests don't need DRM master anymore? at least make distcheck passes when X is running. release.sh is also invoked with just the path to the libdrm git checkout and we don't want to pass additional arguments that will be treated as additional modules we want to release. Also, make a note that release.sh will run make distcheck for you, so we don't strickly need to run it beforehand. Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-19intel: Merge latest i915_drm.hNeil Roberts
The main incentive to do this is to get I915_PARAM_REVISION. v2: Rebase on top of some changes that were made to the header without copying the whole file from the kernel source. Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Neil Roberts <neil@linux.intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-19build: Bump version number to 2.4.60 before releaseDamien Lespiau
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-18intel: Export total subslice and EU countsJeff McGee
Update kernel interface with new I915_GETPARAM ioctl entries for subslice total and EU total. Add a wrapping function for each parameter. Userspace drivers need these values when constructing GPGPU commands. This kernel query method is intended to replace the PCI ID-based tables that userspace drivers currently maintain. The kernel driver can employ fuse register reads as needed to ensure the most accurate determination of GT config attributes. This first became important with Cherryview in which the config could differ between devices with the same PCI ID. The kernel detection of these values is device-specific. Userspace drivers should continue to maintain ID-based tables for older devices which return ENODEV when using this query. v2: remove unnecessary include of <stdbool.h> and increment the I915_GETPARAM indices to match updated kernel patch. For: VIZ-4636 Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-17configure.ac: error out if building freedreno_kgsl without freedrenoEmil Velikov
The former is a subset of the latter. Error out early so the user is aware that they are doing something very wrong. Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com>
2015-03-17configure.ac: fix help string copy/pastaEmil Velikov
The message "enabled on x86" was meant for the intel libdrm. Take the opportunity to mention how libkms is autodetected. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-17configure.ac: fix host_cpu/atomics detectionEmil Velikov
Previous code was busted, as it wasn't checking directly for what it was meant to, and at the end changing the user's selection if host_cpu heuristics were involved. Simplify things by adding a macro that does the long message printing for us, and check for only what we need. This fixes commit 36cff14bb03(configure: omap, freedreno and tegra require atomics) which incorrectly assumed that the code was working fine, and effectively made impossible to enable freedreno due to it's host_cpu detection. Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-17autogen.sh: handle out-of-tree invokationEmil Velikov
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-17configure: Stop using AM_MAINTAINER_MODEEmil Velikov
AM_MAINTAINER_MODE can be used to disable generation of rebuild rules. This is not something we want to condone/support, considering it can cause greater problems than the perceived benefits. Additionally the Automake manual leans towards avoiding the use of AM_MAINTAINER_MODE. http://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-16exynos: fimg2d: follow-up fix for G2D_COEFF_MODE_GB_COLORTobias Jakobi
Also add the register field formatting info provided by Inki Dae <inki.dae@samsung.com>. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Suggested-by: Inki Dae <inki.dae@samsung.com>
2015-03-16exynos: add fimg2d header to common includesTobias Jakobi
The reason for this change is to let userspace use the header. Currently 'make install' does not install it. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
2015-03-16exynos: add exynos prefix to fimg2d headerTobias Jakobi
Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
2015-03-16exynos: use structure initialization instead of memsetTobias Jakobi
Keeps the code cleaner, since the structs have to be initialized once anyway. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com> [evelikov: squash trivial conflict] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Conflicts: tests/exynos/exynos_fimg2d_test.c
2015-03-16exynos: honor the repeat mode in g2d_copy_with_scaleTobias Jakobi
This is useful when the default repeat mode, which is 'repeat' produces artifacts at the borders of the copied image. Choose the 'pad' mode to make use of the color of the destination image. In my usage case the destination is the framebuffer, which is solid filled with a background color. Scaling with 'pad' mode would then just do the right thing and also produces nice borders on the output. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
2015-03-16exynos: add g2d_scale_and_blendTobias Jakobi
This is a combination of g2d_copy_with_scale and g2d_scale. It is a pretty common operation to scale one buffer and then blend it on top of another, so provide a direct way to that operation. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
2015-03-16tests/exynos: fimg2d: add a checkerboard testTobias Jakobi
This makes it easier to spot memory corruptions which don't become visible when using a plain buffer filled with a solid color (so corruptions that are just a permutation of the bytes in the buffer). Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Reviewed-by: Inki Dae <inki.dae@samsung.com> Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
2015-03-16modetest: include into the build when libkms is not selected.Emil Velikov
With commit d7c0a08bc57(modetest: Allocate dumb buffers with the correct bpp) we moved away from the libkms dependency. As such we are safe with including the Makefile/subdir, even as we opt out of building the library. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
2015-03-15Add static qualifier to local functionsJan Vesely
v2: Don't bother marking dead functions static (handler, xf86VDrvMsgVerb, drmSetDebugMsgFunction) Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-14Fix unused, and unused-but-set variables warningsJan Vesely
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>
2015-03-14dristat: Handle DRM_CONSISTENTJan Vesely
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>
2015-03-14Fix type-limits, pointer-arith and sign-compare warningsJan Vesely
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>
2015-03-14tests: String literals are const char *Jan Vesely
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>