summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
Commit message (Collapse)AuthorAgeFilesLines
* i965/drm: Unwrap the unnecessary drm_bacon_reloc_target_info struct.Kenneth Graunke2017-04-101-26/+19
| | | | | | | This used to have another field, but now it's just a BO pointer. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Switch from uthash to Mesa's hash table.Kenneth Graunke2017-04-103-1103/+53
| | | | | | | | | | | | No performance data has been gathered about this choice. I just don't want that many hash tables. Chris points out that this is not performance critical - we should not be recreating that many handles from scratch. In the past we used a linear list, which became unreasonable in stress tests that used hundreds of thousands of BOs. In real usage, it shouldn't matter that much. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop bo_gem::kflags.Kenneth Graunke2017-04-101-4/+1
| | | | | | | It's always zero now. Reviewed-by: Kenneth Graunke <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop has_exec_async related API.Kenneth Graunke2017-04-102-66/+0
| | | | | | | | Mesa doesn't use this yet. We'll almost certainly want to, but we can add the functionality back after we clean up the messy drm code. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop softpin support for now.Kenneth Graunke2017-04-102-143/+8
| | | | | | | | We may want this eventually, but simplify for now. We can add it back later when we actually intend to use it. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop userptr support for now.Kenneth Graunke2017-04-102-204/+1
| | | | | | | | | | We'll want userptr support for GL_AMD_pinned_memory support someday, and possibly some other upload optimizations. Chris says "not in this form" though. Drop it and simplify for now - we can add it back later when we're ready to hook it up fully. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Delete engine checks.Kenneth Graunke2017-04-101-35/+0
| | | | | | | | This is basically handholding to prevent a bogus caller from trying to execbuffer on a bogus engine. i965 already does this correctly. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop intel_chipset.h in favor of using gen_device_info.Kenneth Graunke2017-04-105-576/+63
| | | | | | | | | | | | This moves the PCI ID detection to intel_screen.c and makes drm_bacon_bufmgr_gem_init() take a devinfo pointer. We also drop the HAS_LLC query stuff - devinfo has that info already, without kernel queries, and it makes no sense to have two has_llc flags set by different mechanisms. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop deprecated drm_bacon_bo::offset.Kenneth Graunke2017-04-103-10/+1
| | | | | | | This field was the wrong size, so we replaced it with offset64. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop has_wait_timeout.Kenneth Graunke2017-04-101-16/+0
| | | | | | | | The wait-ioctl was introduced in kernel v3.6 (20120930) and that is our current minimum requirement for screen creation. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Assume aperture size query will work.Kenneth Graunke2017-04-101-15/+2
| | | | | | | This query has been available since 2.6.28. We require 3.6. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Combine drm_bacon_bufmgr_gem and drm_bacon_bufmgr classes.Kenneth Graunke2017-04-103-405/+328
| | | | | | | | | The distinction was required when the bufmgr was virtualised, now there is only one class, we no longer need the distraction of pretending it is a subclass. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Move _drm_bacon_context to intel_bufmgr_gem.c.Kenneth Graunke2017-04-102-5/+5
| | | | | | | | | | This moves us one step closer to killing off intel_bufmgr_priv.h. We might want to nuke it altogether, since it's basically just a uint32_t handle, but for now, let's focus on removing files. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop cliprects and dr4 from execbuf variants.Kenneth Graunke2017-04-104-25/+12
| | | | | | | Legacy DRI1 leftovers. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Devirtualize the bufmgr.Kenneth Graunke2017-04-105-646/+243
| | | | | | | | | libdrm_bacon used to have a GEM-based bufmgr and a legacy fake bufmgr, but that's long since dead (and we never imported it to i965). So, drop the extra layer of function pointers. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Check INTEL_DEBUG & DEBUG_BUFMGR directly.Kenneth Graunke2017-04-105-19/+3
| | | | | | | | Eliminates some API around this, and more importantly, the last field in one bufmgr class. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Use Mesa's macros.h instead of duplicating them.Kenneth Graunke2017-04-103-16/+3
| | | | | | | | | | | Replace the duplicated macros imported from libdrm: ARRAY_SIZE, MAX2, ALIGN, STATIC_ASSERT and remove unused ROUND_UP_TO and ROUND_UP_TO_MB. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Use ALIGN, not ROUND_UP_TO.Kenneth Graunke2017-04-101-2/+2
| | | | | | | | ROUND_UP_TO handles a NPOT alignment, but all the alignments we use are power of two anyway, so there's no need. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Delete execbuf1 support.Kenneth Graunke2017-04-101-181/+2
| | | | | | | execbuf2 has been around since v2.6.33. We require v3.6. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Remove Gen2-3 fence accounting.Kenneth Graunke2017-04-103-234/+13
| | | | | | | | | | | Since gen4, we do not use fence registers for any GPU access and so never have to account for the fence during batch construction. All the related fence functions are unused. Based on Kristian Høgsberg's patch; commit message by Chris Wilson. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Remove some unused functions and macros.Kenneth Graunke2017-04-105-266/+0
| | | | | | | | | | | Mesa doesn't use these functions or macros, so we can delete them, and save work refactoring and cleaning them up. We'll delete a lot more later, too. Based on a patch by Kristian Høgsberg. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Switch to util/list.h instead of libdrm_lists.h.Kenneth Graunke2017-04-103-169/+45
| | | | | | | Both are kernel style lists, so this is trivial. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Port to Mesa's atomic header.Kenneth Graunke2017-04-103-130/+26
| | | | | | | | | | Drop xf86atomic.h in favor of Mesa's util/u_atomic.h. We replace the atomic_t wrapper struct with a bare integer, switch to the 'p_atomic' naming conventions, and move over the one extra helper. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Use our internal libdrm (drm_bacon) rather than the real one.Kenneth Graunke2017-04-1060-436/+442
| | | | | | Now we can actually test our changes. Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: s/drm_intel/drm_bacon/gKenneth Graunke2017-04-104-606/+606
| | | | | | | | | | | | | | | | Using drm_intel_* as a prefix is hazardous - we don't want to conflict with the actual libdrm_intel symbols. In particular, I think we could get into trouble during the final megadrivers linking. So, rename everything to an different yet arbitrary prefix. bacon and intel are the same number of characters, so we don't have to reindent the world. It's also an homage to Ian's "Bacon Trail" platform. I was going to use "drm_relic" to poke fun at libdrm being ancient, and so we could explain the name with a "historical reasons" pun, but it sounds too much like ralloc. Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Drop libpciaccess dependencies.Kenneth Graunke2017-04-102-49/+0
| | | | | | | | | | | | | | | | | | | | i965 doesn't use drm_intel_get_aperture_sizes(), so we can delete support for it. This avoids a build dependency on libpciaccess. Chris also notes: "There's a really old bug that hopefully has been closed already (although as far as I can tell, it has never been fixed) about how using libpciaccess from libdrm_intel breaks the world (since libpciaccess uses a singleton that is torn down at the first request rather than upon the last user)." This bug should go away in two commits when we switch over to our internal copy of libdrm_intel. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84325 Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: Make libdrm_lists.h compile by defining typeof.Kenneth Graunke2017-04-101-0/+4
| | | | | | | typeof doesn't seem to exist, so this won't compile (but we don't yet try). Define it to __typeof__. This code is going to die soon anyway. Acked-by: Jason Ekstrand <[email protected]>
* i965/drm: remove legacy defines, aub functions, and decoder prototypesKenneth Graunke2017-04-102-176/+0
| | | | | | | | | We never imported any of this code, so drop the prototypes, unused enums, and defines. Based on patches by Emil Velikov. Acked-by: Jason Ekstrand <[email protected]>
* i965: Import libdrm_intel.Kenneth Graunke2017-04-109-0/+6724
| | | | | | | | | | | | | | This imports commit 19c4cfc54918d361f2535aec16650e9f0be667cd of libdrm/intel/*.[ch], minus a few files that we're never going to use (and would immediately delete), plus a few necessary dependencies. We rename intel_bufmgr.h to brw_bufmgr.h to avoid #include conflicts. We also fix UTF-8 symbol problems in intel_bufmgr_gem.c comments because vim keeps trying to fix that every time I edit the file, and we may as well fix it right away. Acked-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965: Make sure we don't use CPU maps for the scanout buffer.Kenneth Graunke2017-04-101-1/+13
| | | | | | | | | | | | | | | | | | | | Using an incoherent CPU map on the active scanout buffer is really sketchy - we may need extra flushing via GEM_SW_FINISH, or using drmModeDirtyFB() and kernel commit a6a7cc4b7db6d (4.10+). Chris suggests "never ever do that", which seems like a wise plan! intel_miptree_map_raw() uses CPU maps on linear buffers. Having a linear scanout buffer should be really rare, and mapping the front buffer should be similarly rare. Together, it should basically never happen. But, in case it does somehow...make sure that mapping the scanout buffer always goes through an uncached GTT map. v2: Add a giant comment written by Chris Wilson. Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Chris Wilson <[email protected]>
* i965: Stop calling drm_intel_bufmgr_gem_enable_fenced_relocs().Kenneth Graunke2017-04-101-2/+0
| | | | | | | This does nothing on Gen4+, which is the only hardware we support. Reviewed-by: Chris Wilson <[email protected]> Acked-by: Jason Ekstrand <[email protected]>
* i965: Fix GLX_MESA_query_renderer video memory on 32-bit.Kenneth Graunke2017-04-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | On modern systems with 4GB apertures, the size in bytes is 4294967296, or (1ull << 32). The kernel gives us the aperture size as a __u64, which works out great. Unfortunately, libdrm "helpfully" returns the data as a size_t, which on 32-bit systems means it truncates the aperture size to 0 bytes. We've happily reported this value as 0 MB of video memory via GLX_MESA_query_renderer since it was originally exposed. This patch bypasses libdrm and calls the ioctl ourselves so we can use a proper uint64_t, avoiding the 32-bit integer overflow. We now report a proper video memory size on 32-bit systems. Chris points out that the aperture size (CPU mappable size limit) isn't really the right thing to be checking. But libdrm_intel uses it to fail execbuffer, so it is an actual limit for now. Once that's fixed we can probably move to something else. In the meantime, fix the obvious typecasting bug. Reviewed-by: Jason Ekstrand <[email protected]>
* swrast: take ownership rather than adding reference for new renderbuffersTimothy Arceri2017-04-101-2/+4
| | | | | | | | | This avoids locking in the reference calls and fixes a leak after the RefCount initialisation was change from 0 to 1. Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation) Reviewed-by: Emil Velikov <[email protected]>
* radeon: take ownership rather than adding reference for new renderbuffersTimothy Arceri2017-04-101-5/+5
| | | | | | | | | This avoids locking in the reference calls and fixes a leak after the RefCount initialisation was change from 0 to 1. Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation) Reviewed-by: Emil Velikov <[email protected]>
* nouveau: take ownership rather than adding reference for new renderbuffersTimothy Arceri2017-04-101-5/+5
| | | | | | | | | This avoids locking in the reference calls and fixes a leak after the RefCount initialisation was change from 0 to 1. Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation) Reviewed-by: Emil Velikov <[email protected]>
* i965: take ownership rather than adding reference for new renderbuffersTimothy Arceri2017-04-101-6/+7
| | | | | | | | | This avoids locking in the reference calls and fixes a leak after the RefCount initialisation was change from 0 to 1. Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation) Reviewed-by: Emil Velikov <[email protected]>
* i915: take ownership rather than adding reference for new renderbuffersTimothy Arceri2017-04-101-4/+5
| | | | | | | | | This avoids locking in the reference calls and fixes a leak after the RefCount initialisation was change from 0 to 1. Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation) Reviewed-by: Emil Velikov <[email protected]>
* i965/blorp: Bump the batch space estimateJason Ekstrand2017-04-061-1/+1
| | | | | | | | | | | | | | Commit f938354362655a378d474c5f79c52cea9852ab91 recently increased the alignment on vertex buffer data from 32 to 64. This caused us to consume a bit more batch than we were before and we now go over the estimate by a small amount on certain blits on gen8+. This commit bumps then gen8 batch estimate by a bit to compensate. Haswell and older still seems to be well within the limit. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100582 Reviewed-by: Iago Toral Quiroga <[email protected]> Acked-by: Kenneth Graunke <[email protected]> Cc: "13.0 17.0" <[email protected]>
* intel/gen_decoder: return -1 for unknown command formatsJordan Justen2017-04-061-4/+4
| | | | | | | | | | | | | | | | | Decoding with aubinator encountered a command of 0xffffffff. With the previous code, it caused aubinator to jump 255 + 2 dwords to start decoding again. Instead we can attempt to detect the known instruction formats. If the format is not recognized, then we can advance just 1 dword. v2: * Update aubinator_error_decode * Actually convert the length variable returned into a *signed* integer in aubinator.c, intel_batchbuffer.c and aubinator_error_decode.c. Signed-off-by: Jordan Justen <[email protected]> Acked-by: Lionel Landwerlin <[email protected]>
* i965/blorp: Align vertex buffers to 64BJason Ekstrand2017-04-041-1/+13
| | | | | Reviewed-by: Kenneth Graunke <[email protected]> Cc: "13.0 17.0" <[email protected]>
* drirc: Set glsl_zero_init for Kerbal Space Program.Francisco Jerez2017-04-041-0/+8
| | | | | | | | | | | This fixes the stripes of garbage rendered on the floor of the vehicle assembly building among other rendering issues. The reason for the misrendering seems to be that some of the GLSL shaders used by the application use variables before initializing them, incorrectly assuming that they will be implicitly set to zero by the implementation. Acked-by: Matt Turner <[email protected]>
* aubinator/gen_decoder/i965: decode instructions from dword 0Lionel Landwerlin2017-04-031-4/+4
| | | | | | | | | Some packets like 3DSTATE_VF_STATISTICS, 3DSTATE_DRAWING_RECTANGLE, 3DPRIMITIVE, PIPELINE_SELECT, etc... have configurable fields in dword0, we probably want to print those. Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Matt Turner <[email protected]>
* i965: Stop using legacy dri_bufmgr_* and intel_* names.Kenneth Graunke2017-03-3010-14/+18
| | | | | | | | Eric renamed these from dri_bufmgr_* and intel_bufmgr_* to drm_intel_* in libdrm commit 4b9826408f65976a1a13387beda748b65e03ec52, circa 2008, but we've been using the legacy names this whole time. Reviewed-by: Jason Ekstrand <[email protected]>
* i965: Combine intel_batchbuffer_reloc and intel_batchbuffer_reloc64Kenneth Graunke2017-03-303-53/+19
| | | | | | | | | | | These two functions do the exact same thing. One returns a uint64_t, and the other takes the same uint64_t and truncates it to a uint32_t. We only need the uint64_t variant - the caller can truncate if it wants. This patch gives us one function, intel_batchbuffer_reloc, that does the 64-bit thing. Reviewed-by: Jason Ekstrand <[email protected]>
* i965: Use WARN_ONCE instead of open coding it.Kenneth Graunke2017-03-301-9/+4
| | | | Reviewed-by: Jason Ekstrand <[email protected]>
* r200: remove BindProgramMarek Olšák2017-03-292-16/+5
| | | | | | Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
* i915: remove BindProgramMarek Olšák2017-03-291-25/+0
| | | | | | | | | The same thing is done in i915_update_program called by i915InvalidateState. Why do it twice. Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
* mesa: don't use _NEW_TEXTURE mainly in mesa/mainMarek Olšák2017-03-291-1/+2
| | | | | | | | v2: add missing %s Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
* i965: Delete tile resource mode codeAnuj Phogat2017-03-275-267/+35
| | | | | | | | | | | Yf/Ys tiling never got used in i965 due to not delivering the expected performance benefits. So, this patch is deleting this dead code in favor of adding it later in ISL when we actually find it useful. ISL can then share this code between vulkan and GL. Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
* i965: Delete fast copy blit codeAnuj Phogat2017-03-272-185/+48
| | | | | | | | | | | | | | | Fast copy blit was primarily added to support Yf/Ys detiling. But, Yf/Ys tiling never got used in i965 due to not delivering the expected performance benefits. Also, replacing legacy blits with fast copy blit didn't help the benchmarking numbers. This is probably due to a h/w restriction that says "start pixel for Fast Copy blit should be on an OWord boundary". This restriction causes many blit operations to skip fast copy blit and use legacy blits. So, this patch is deleting this dead code in favor of adding it later when we actually find it useful. Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>