summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/drm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'i965g-restart'Keith Whitwell2009-12-2216-1/+1684
|\ | | | | | | | | Conflicts: configure.ac
| * Merge commit 'origin/master' into i965g-restartKeith Whitwell2009-12-2128-9/+3376
| |\ | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri
| * | ws/i965: respect DEBUG_WINSYS flagKeith Whitwell2009-12-211-29/+40
| | |
| * | i965g: pass backbuffer tiling information to driverKeith Whitwell2009-11-302-9/+9
| | | | | | | | | | | | The gem winsys gets this information, needs to pass it on.
| * | ws/i965: more debug outputKeith Whitwell2009-11-302-12/+44
| | |
| * | ws/i965: rename and change sense of I965_SEND_CMD to BRW_NO_HWKeith Whitwell2009-11-302-3/+1
| | |
| * | brw: add dumping to gem winsysKeith Whitwell2009-11-304-101/+146
| | |
| * | i965g: link xorg state tracker with -ldrm_intelDave Airlie2009-11-281-1/+1
| | |
| * | i965g: Fixup buffer creation functionJakob Bornecrantz2009-11-061-2/+12
| | | | | | | | | | | | First tri!
| * | i965g: trivial/clear can now send stuff to hardwareJakob Bornecrantz2009-11-063-4/+21
| | | | | | | | | | | | | | | Added a flag if we should send commands to hardware as what we send isn't all that correct.
| * | i965g: Winsys whitespaceJakob Bornecrantz2009-11-062-37/+37
| | |
| * | i965g: Build winsys againJakob Bornecrantz2009-11-062-57/+53
| | |
| * | i965g: clean up winsys dumping code a littleKeith Whitwell2009-11-051-59/+82
| | |
| * | i965g: pass relocation information in an array with bo_subdataKeith Whitwell2009-11-051-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easier to dump as we get all of the information about the upload in a single hit. Opens the window to simplification in the driver if these relocation arrays can be maintained statically rather than being recreated whenever we check for a new upload. Still needs some cleanup to avoid uglyness introduced with the delta values.
| * | i965g: propogate map-buffer-range semantics down to winsysKeith Whitwell2009-11-051-2/+17
| | |
| * | i965g: make the winsys responsible for all buffer->offset handlingKeith Whitwell2009-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The winsys now inserts the presumed offset into referring buffers from inside of bo_emit_reloc(). Remove the many locally coded places where this was happening in the driver and eliminate the worry of getting it wrong. No longer need to expose offset values to the driver at all, so no need to worry about what to do in the driver when they change. Just use zero values wherever we had offsets previously -- the relocations will fix it all up for us.
| * | brw: push more dumping into the winsysKeith Whitwell2009-11-051-29/+82
| | |
| * | i965g: disassemble more than one instruction at a timeKeith Whitwell2009-11-051-14/+8
| | |
| * | i965g: call dissassembler for appropriate data uploadsKeith Whitwell2009-11-051-4/+7
| | |
| * | i965g: add lots of error checks and early returnsKeith Whitwell2009-11-051-28/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any allocation that may fail should be checked, and propogate the error upwards. At the highest level we will flush batch and retry. This is an alternate strategy to what the original DRI driver did of attempting to flush batch from the lowest levels (eg inside BEGIN_BATCH). The trouble with that strategy was that flushes could occur at unexpected times, and additionally there was a need for a wierd notification mechanism to propogate the 'lost context' state back up to higher levels. Propogating the errors directly gives us a lot of flexibility how to deal with these states, at the expense of a lot more checking in the code. Will add some sanity checks later to make sure that out-of-memory conditions are properly escalated and not lost halfway up the stack.
| * | i965g: hook up dumpers in dumping winsysKeith Whitwell2009-11-051-0/+61
| | |
| * | i965g: add data type tags to aid dumping/decodingKeith Whitwell2009-11-051-33/+62
| | |
| * | i965g: Builds with sconsJakob Bornecrantz2009-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But there are some missing symbols, "nm -u i965_dri.so" [SNIP] U brw_surface_bo U brw_surface_pitch U brw_texture_blanket_winsys_buffer U brw_texture_get_winsys_buffer U brw_update_dirty_counts [SNIP]
| * | i965g: Do not create a symlink for i965_dri.soJakob Bornecrantz2009-11-051-1/+0
| | |
| * | i915g: Do not create a symlink for i965_dri.soJakob Bornecrantz2009-11-051-1/+0
| | |
| * | i965g: consolidate some includesKeith Whitwell2009-11-041-2/+3
| | |
| * | ws/i965: allow NULL buffer in winsys::bo_unreferenceKeith Whitwell2009-11-041-0/+6
| | | | | | | | | | | | Special case to avoid clutter in the driver
| * | i965g: hook up flush-frontbufferKeith Whitwell2009-11-041-13/+24
| | |
| * | i965g: add missing buffer functionsKeith Whitwell2009-11-041-0/+4
| | |
| * | ws/i965: add load-time driver registrationKeith Whitwell2009-11-041-0/+7
| | | | | | | | | | | | Otherwise xlib state-tracker doesn't know about us.
| * | ws/i965: add butt-ugly linker hackKeith Whitwell2009-11-041-0/+15
| | | | | | | | | | | | | | | Need more linker magic to keep the glX symbols externally visible even though they started off in a .a file.
| * | i965g: add standalone xlib debug winsysKeith Whitwell2009-11-042-0/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | Create a dummy winsys that just debug-prints on calls into the winsys functions. Will use this to get to the point where we are generating sane-looking debug dumps and diassembly. Also fix various warnings generated with the new compiler flags set in this config.
| * | i965g: convert read/write domain pairs into single usage valueKeith Whitwell2009-11-041-4/+38
| | | | | | | | | | | | | | | | | | Easier to understand what's going on in the driver sources, convert stereotype usage values back to GEM read/write domain flags in the winsys.
| * | i965g: driver and winsys compileKeith Whitwell2009-11-017-511/+262
| | | | | | | | | | | | | | | A milestone of sorts. Still a long way from something working -- the old one compiled too, at least some of the time...
| * | ws/i965: renames from i915, hook up makefilesKeith Whitwell2009-10-2412-237/+236
| | |
| * | ws/i965: pull in the rest of the i915 winsys tree.Keith Whitwell2009-10-237-0/+299
| | | | | | | | | | | | | | | | | | The intel_xorg file looks like it's got quite a bit of code that could be lifted up into the xorg state tracker -- should really just have a list of pci ids and a pointer to a screen create func.
| * | ws/i965: clone the i915 winsysKeith Whitwell2009-10-237-0/+799
| | | | | | | | | | | | | | | | | | I'll want to rework this, not sure trying to share this code is a very good idea at least until the interfaces from the two drivers calm down.
* | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-216-33/+143
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
| * \ \ Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-151-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| | * | | i915g: Silence unused value warning in intel_drm_get_device_id.Vinson Lee2009-12-121-0/+1
| | | | |
| * | | | vmwgfx: Update vmwgfx_drm.h to the on upstreamJakob Bornecrantz2009-12-142-27/+30
| | | | |
| * | | | vmware/xorg: Use new stream ioctlJakob Bornecrantz2009-12-144-10/+107
| | | | |
| * | | | vmwgfx/core: Check for 3D via the get param ioctlJakob Bornecrantz2009-12-122-3/+12
| | | | |
* | | | | Revert "r300g: flush CS if a buffer being deleted is referenced by it"Corbin Simpson2009-12-183-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by just about everybody. I'm going back to actually reading patches before ACKing and pushing them. This reverts commit 417ce06306962a9355cbb35cefcdea1951b0ce85. Conflicts: src/gallium/winsys/drm/radeon/core/radeon_buffer.c
* | | | | Merge branch 'pipe-format-simplify'Michal Krol2009-12-182-3/+5
|\ \ \ \ \
| * | | | | Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-172-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding.
| * | | | | Merge branch 'master' into pipe-format-simplifyMichal Krol2009-12-1721-125/+1721
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
| * | | | | | Move pf_get_block() to u_format auxiliary module.Michal Krol2009-12-032-3/+6
| | | | | | |
* | | | | | | r300g: store own copy of flush_cb and flush data.Dave Airlie2009-12-183-2/+8
| |/ / / / / |/| | | | | | | | | | | | | | | | | don't go sneaking around inside the libdrm copy.
* | | | | | r300g: flush CS if a buffer being deleted is referenced by itMarek Olšák2009-12-153-0/+8
| | | | | |