aboutsummaryrefslogtreecommitdiffstats
path: root/radeon
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'freedesktop/master' into aosp/masterJohn Stultz2018-04-138-19/+66
|\ | | | | | | | | | | | | This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
| * meson,configure: include config.h automaticallyEric Engestrom2018-03-206-18/+0
| | | | | | | | | | | | | | | | | | This will prevent any more missing `#include "config.h"` bug, at the cost of having to recompile some files that didn't need to be when changing build options. Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson: use pkg-config to detect libatomic_opsEric Engestrom2018-03-091-1/+1
| | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * *-symbol-check: Don't hard-code nm executableHeiko Becker2018-02-232-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Helpful if your nm executable has a prefix based on the architecture, for example. Signed-off-by: Heiko Becker <heirecka@exherbo.org> Cc: Timo Gurr <timo.gurr@gmail.com> [Eric: v2: rebase and add Meson support] Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * Add meson build systemDylan Baker2018-01-121-0/+63
| | | | | | | | | | | | | | | | | | | | This patch adds a complete meson build system, including tests and install. It has the necessary hooks to allow it be used as a subproject for other meson based builds such as mesa. Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-and-tested-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * radeon: add fallthrough annotationEric Engestrom2017-08-011-0/+1
| | | | | | | | | | | | | | | | | | GCC 7 started warning when a switch case has neither a `break` nor a "fallthrough" comment. Let's be explicit that we meant to fall through here. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
* | Convert to Android.bpDan Willemsen2017-10-233-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information about Soong. Removes BOARD_GPU_DRIVERS, which wasn't affecting anything, since none of the HAVE_* macros are defined. Even if they were, we'd prefer to compile all of them so that a single library can support multiple boards. Test: mmma external/libdrm Change-Id: Ie01736bce6cf41e3da5040fe5341ade0634b5111
* | Build libdrm* modules with BOARD_VNDK_VERSIONJiyong Park2017-10-191-0/+1
|/ | | | | | | | | | | | | | | | | They are marked as vendor module since they all are depending on libdrm, which is a vendor lib. Also, libdrm_platform is newly introduced as the platform version of libdrm. Bug: 37342627 Bug: 63741047 Test: BOARD_VNDK_VERSION=current m -j libdrm_amdgpu libdrm_etnaviv libdrm_freedreno libdrm_intel libdrm_nouveau libdrm_radeon libdrm_rockchip libdrm_tegra libkms modetest atomictest planetest Change-Id: Ic1ff6fb616f406f1c5e005d3e6f6039758d62315 Merged-In: Ic1ff6fb616f406f1c5e005d3e6f6039758d62315
* android: introduce Android.common.mk to reduce boilerplateEmil Velikov2017-01-271-5/+2
| | | | | | | | | | | | | | | | ... across the makefiles. Currently this isn't much but that will change shortly. As an added bonus this fixes all present and future cases where we've forgotten to strip out the headers from LOCAL_SRC_FILES. In a couple of cases (the tests) we start setting LOCAL_EXPORT_C_INCLUDE_DIRS, which shouldn't be an issue. Cc: Chih-Wei Huang <cwhuang@android-x86.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org>
* android: remove LOCAL_MODULE_TAGS := optional tagEmil Velikov2017-01-271-1/+0
| | | | | | | | | | | | Seems to be the default option since ~2009 with commit 2f31293ba78 "auto import from //branches/cupcake/...@137197". Fleshed out from a larger commit in the AOSP repo/fork. Cc: Dan Willemsen <dwillemsen@google.com> Cc: Chih-Wei Huang <cwhuang@android-x86.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Herring <robh@kernel.org>
* libdrm: random typo fixesGrazvydas Ignotas2016-11-222-6/+6
| | | | | | | | | Just some trivial boring typo fixes all over the tree. READMEs and comments only. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: sync radeon_drm.h with the kernelMarek Olšák2016-09-051-0/+8
| | | | | | | the CIK tile mode definitions are moved out, userspace doesn't use them Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
* radeon: Fix typo in stderr messageAndreas Boll2016-07-231-1/+1
| | | | | Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
* automake: Don't include Android Makefiles in the release tarballAndreas Boll2016-07-231-1/+1
| | | | | | | | | | | | | | Currently only some Android Makefiles are included in the release tarball. To be more consistent one could either add the remaining files or don't ship Android Makefiles altogether. According to Emil the Android folk doesn't use our release tarballs. Thus it makes sense to remove those files from distribution which also means less work for maintenance in the future. Suggested-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: Wire up radeon-symbol-check to make checkAndreas Boll2016-07-231-0/+1
| | | | | | | This was missed in 552de225bf2740ba0cb52312c21353d71d934b8c Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
* Android: strip out header files from sources listRob Herring2016-07-061-1/+1
| | | | | | | AOSP master now errors if LOCAL_SRC_FILES contains headers, so filter out header files from the source lists. Signed-off-by: Rob Herring <robh@kernel.org>
* radeon: use SAMPLE_SPLIT=2 for better MSAA perf on EG/CMMarek Olšák2016-06-141-2/+4
| | | | Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: add libdrm to Requires.privateEmil Velikov2016-02-041-0/+1
| | | | | | | | | | | Equivalent to the amdgpu commit before. Additionally, when libdrm is installed to a 'non-default' location, users of libdrm_radeon will fail to build, as radeon_cs.h (and maybe others) won't have their dependencies (drm.h radeon_drm.h) fulfilled. Cc: Christian König <christian.koenig@amd.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
* radeon: Pass radeon_bo_open flags to the DRM_RADEON_GEM_CREATE ioctlMichel Dänzer2016-01-211-1/+1
| | | | | | | Not doing so makes it impossible for radeon_bo_open callers to set any RADEON_GEM_* flags for the newly created BO. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: Handle surface offsets exceeding 32 bits correctlyMichel Dänzer2015-11-101-8/+9
| | | | | | The slice_size and bo_size fields were getting truncated to 32 bits. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: cleanup bo/cs func tablesEmil Velikov2015-09-044-23/+24
| | | | | | | Annotate the data as static const and use C99 designated initializers. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: add new OLAND pci idAlex Deucher2015-08-101-0/+1
| | | | Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: add new bonaire pci idAlex Deucher2015-05-261-0/+1
| | | | Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
* drm: remove drm_public macroEmil Velikov2015-04-286-44/+44
| | | | | | | | | | | | | | | Some compilers (like the Oracle Studio), require that the function declaration must be annotated with the same visibility attribute as the definition. As annotating functions with drm_public is no longer required just remove the macro. Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Michel Dänzer <michel.daenzer@amd.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Thierry Reding <treding@nvidia.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* drm: remove no longer needed VISIBILITY_CFLAGSEmil Velikov2015-04-281-1/+0
| | | | | | | | | | | | | With earlier commits we've annotated the private symbols, thus we no longer require the -fvisibility=hidden CFLAGS. Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Michel Dänzer <michel.daenzer@amd.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Thierry Reding <treding@nvidia.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* drm: rename libdrm{,_macros}.hEmil Velikov2015-04-286-8/+8
| | | | | | Provide a more meaningful name, considering what it does. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: add symbols testEmil Velikov2015-04-282-1/+62
| | | | | | | Will allow us to catch when the library exports more symbols than the ones in the public headers. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: move bof.[ch] out of libdrm_radeonEmil Velikov2015-04-283-5/+10
| | | | | | | | | The functions(files) are used if one explicitly modifies radeon_cs_gem.c by setting CS_BOF_DUMP to 1. As bof.[ch] is used (copied) to other out-of-tree projects, keep them around in the distribution tarball. Cc: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* autotools: remove ${srcdir} from the includesEmil Velikov2015-03-201-1/+0
| | | | | | | | Already handled by the build system. v2: s/compiler/build system/ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* android: remove LOCAL_COPY_HEADERS* variablesEmil Velikov2015-03-201-3/+0
| | | | | | | | | 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>
* android: remove ${srcdir} from the includesEmil Velikov2015-03-201-3/+0
| | | | | | | | 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>
* android: simplify LOCAL_C_INCLUDESEmil Velikov2015-03-201-3/+1
| | | | | | | | | 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>
* android: correcly set LOCAL_EXPORT_C_INCLUDE_DIRSEmil Velikov2015-03-201-2/+1
| | | | | | | | | | - 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>
* android: remove duplicate libdrm in LOCAL_SHARED_LIBRARIESChih-Wei Huang2015-02-231-3/+0
| | | | | | | | v2: Fold libpciaccess and libdrm into a single local_shared_libraries Acked-by: Jan Vesely <jan.vesely@rutgers.edu> Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: align r600/700 fmask to 128 X blocks.Dave Airlie2015-01-191-0/+2
| | | | | | | | | | | | | | | | | | After much searching and empricial testing, and reading of things I've no justifcation for this fix, other than it really appears this is what the hw is doing or close enough. It makes sense that each entry in the FMASK corresponds to an entry in the CMASKm and the CMASK is organised into 128x128 blocks, but I can't find anything in any of the docs/info from AMD. But I've spent a lot of time on this, and this seems to be the simplest fix, in that we don't over allocate things too much, once this fix in place we can nuke the extra multiplier in mesa. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* radeon: Always multiply pitch_bytes by nsamples, not by slice_ptMichel Dänzer2014-09-291-2/+2
| | | | | | | | | | | slice_pt is tileb[0] / tile_split, which isn't directly related to the pitch. This caused pitch_bytes to be too large in some cases. [0] Tile size in bytes Reviewed-by: Marek Olšák <marek.olsak@amd.com>
* radeon: use drm_mmap/drm_munmap wrappersEmil Velikov2014-09-283-6/+3
| | | | | Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
* automake: pick up all files for distribution.Emil Velikov2014-09-281-1/+1
| | | | | | | | Autotools is already smart enough to pick the *.pc.in files but it needs some help with the Android.mk ones. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
* radeon: add Android build supportEmil Velikov2014-09-011-0/+30
| | | | | | v2 Rename the headers variable(s) to *_H_FILES. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* libdrm, freedreno, intel, nouveau, radeon: add Makefile.sourcesEmil Velikov2014-09-012-18/+23
| | | | | | | | | | | Will be used to consolidate the required sources lists as well as the install-able headers. This is turn will help us to avoid the duplication with the upcoming Android build support. v2: Rename the headers variable to *_H_FILES. v3: Rebase on top of symbol visibility patches. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* radeon: Fix surf->bankh init by default value when surf->tile_split == 0Maks Naumov2014-08-251-2/+2
| | | | | Signed-off-by: Maks Naumov <maksqwe1@ukr.net> Signed-off-by: Marek Olšák <marek.olsak@amd.com>
* radeon: add new SI pci idsAlex Deucher2014-08-211-0/+4
| | | | Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: add new CIK pci idsAlex Deucher2014-08-211-0/+3
| | | | Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: Use symbol visibility.Maarten Lankhorst2014-08-047-69/+98
| | | | | | | All the bof_* symbols are now no longer exported. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: fix typo in sample split / fixes MSAA on HawaiiMarek Olšák2014-07-281-1/+1
| | | | Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
* radeon: Remove superfluous parentheses.Thomas Klausner2014-07-151-9/+9
| | | | Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
* radeon: add Mullins pci idsSamuel Li2014-05-021-0/+17
| | | | | | Signed-off-by: Samuel Li <samuel.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
* radeon: add Mullins chip familySamuel Li2014-05-021-0/+1
| | | | | | Signed-off-by: Samuel Li <samuel.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
* radeon: fix sumo2 pci idAlex Deucher2013-12-241-1/+1
| | | | | | 0x9649 is sumo2, not sumo. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
* radeon: avoid possible divide by 0 in surface managerAlex Deucher2013-12-241-3/+3
| | | | | | | | | | | | | | Some users report hitting a divide by 0 with the tile split in certain apps. Tile_split shouldn't ever be 0 unless the surface structure was not properly initialized. I think there may be some cases where mesa uses an improperly initialized surface struct, but I haven't had time to track it down. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72425 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>