summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Deal with I2C over DP AUX DEFER/NACK statusdisplay-portKeith Packard2009-05-072-14/+35
|
* Hold reference to video binding table until all rects are painted.Keith Packard2009-05-011-1/+3
| | | | | | | | | The optimization of unreferencing the binding table when the relocation is posted causes the object to be dereferenced for each box in the clip list, causing general chaos in the buffer manager. It's easier to just hold a reference to the object until all of the boxes are painted and then drop it. Signed-off-by: Keith Packard <keithp@keithp.com>
* 3D_STATE_VERTEX_BUFFERS takes four 32-bit values, not three.Keith Packard2009-05-011-2/+4
| | | | | | | The spec says this command takes an extra (mbz) 32-bit value, so let's provide it with one. Signed-off-by: Keith Packard <keithp@keithp.com>
* Don't bother to enable VF statistics during 965 video playbackKeith Packard2009-05-011-2/+1
| | | | | | This was used while bringing up the driver to debug vertext fetches. Signed-off-by: Keith Packard <keithp@keithp.com>
* Leave allocator running until lower-level CloseScreens are doneKeith Packard2009-05-011-2/+3
| | | | | | | The lower level close screen functions will free allocated objects, causing a crash if the allocator isn't still available. Signed-off-by: Keith Packard <keithp@keithp.com>
* intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4)Keith Packard2009-05-011-1/+1
| | | | | | | | | | intel_batch_start_atomic takes an argument in 32-bit units, and so it must multiply that by 4 before passing it to intel_batch_require_space, which takes an argument in bytes. We should figure out what units we want to use and use the same everywhere... Signed-off-by: Keith Packard <keithp@keithp.com>
* Merge branch 'master' into display-portKeith Packard2009-04-3031-334/+52
|\
| * Allow cursors to roam past 2048x2048 limit.Keith Packard2009-04-301-4/+4
| | | | | | | | | | | | | | There's no reason to clip cursor positions to an artificial limit; the hardware cursor limits always mirror the hardware display limits. Signed-off-by: Keith Packard <keithp@keithp.com>
| * Add doltlibtool to DISTCLEANFILESCarl Worth2009-04-281-1/+1
| | | | | | | | Otherwise make distcheck fails.
| * NEWS: Add notes for 2.7.99.1 snapshot2.7.99.1Carl Worth2009-04-281-0/+39
| |
| * Remove a handful of pointless commentsKristian Høgsberg2009-04-2829-329/+8
| | | | | | | | | | CVS keywords, comments about how the source was once reformatted, and the ad-hoc changelog comment in in i830_driver.c
* | Merge commit 'origin/master' into display-portKeith Packard2009-04-3053-4949/+435
|\ \ | |/
| * Remove checks for xf86RotateFreeShadow, introduced in server 1.4.Eric Anholt2009-04-272-30/+0
| |
| * unifdef LIBPCIACCESS and XSERVER_LIBPCIACCESS.Eric Anholt2009-04-2718-462/+13
| | | | | | | | Depending on new server means these are always present.
| * Rely on BO pixmaps being present in acceleration paths.Eric Anholt2009-04-272-26/+15
| |
| * Remove XF86DRM_MODE.Eric Anholt2009-04-275-30/+2
| | | | | | | | We now depend on server 1.6 and current libdrm, so no need to ifdef it.
| * Replace I830Sync's irq emit/wait code with bufmgr use.Eric Anholt2009-04-274-32/+30
| | | | | | | | | | | | | | This pre-GEM code was all sorts of broken -- see intel_bufmgr_fake.c for the hoops that must be jumped to use that kernel interface successfully. Yet we continued to use it even with KMS/DRI2/UXA, which may account for some hangs.
| * Remove I830_XV ifdef.Eric Anholt2009-04-274-25/+1
| | | | | | | | The developers of the driver don't ever run or test without XV. Don't do it.
| * Replace i830WaitSync with just I830Sync(), as nearly all callers had it wrong.Eric Anholt2009-04-276-41/+10
| | | | | | | | | | | | People were trying to BEGIN_BATCH()/ADVANCE_BATCH() then i830WaitSync on the results, which wouldn't necessarily wait and lead to various painful bugs, since only EXA called MarkSync and only for certain rendering operations.
| * Now that video destination pixmaps are always in BOs, no more MarkSync.Eric Anholt2009-04-272-10/+4
| |
| * Remove can_resize, which is now always true (except when a bug interfered)Eric Anholt2009-04-274-25/+3
| |
| * unifdef I830_USE_UXA.Eric Anholt2009-04-276-58/+11
| | | | | | | | | | We only have on acceleration architecture now, and you can always build it if you're building the driver.
| * Remove EXA support.Eric Anholt2009-04-2710-556/+17
| | | | | | | | | | | | UXA has completely replaced EXA at this point. UXA is the same rendering core as EXA, but relying on kernel memory management or a fake bufmgr instead of trying to manage memory in the X Server.
| * Remove XAA support.Eric Anholt2009-04-278-1085/+13
| | | | | | | | | | | | | | While EXA/UXA aren't completely good replacements (see bugzilla for performance and stability problems), we are pretty sure at this point that it's the right way to go and that having multiple acceleration architectures is getting in the way of producing a stable codebase.
| * Remove DRI1 support.Eric Anholt2009-04-279-2087/+25
| | | | | | | | | | | | | | | | | | This was blocked on wide distribution of X Server 1.6 (now in the current or next version of major distributions) and solutions for a couple of significant architectural problems (vblank sync and frontbuffer rendering, which we now have code or good plans for). This includes disabling XVMC which is DRI1-only currently.
| * Remove pre-server-1.5 support.Eric Anholt2009-04-279-176/+1
| |
| * Fix assert at startup with DRI initialiation failure.Eric Anholt2009-04-272-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In this path, we'd make it to allocator_init -> init_bufmgr without GEM and without FbBase being initialized, leading to assertion failure to catch this mistake. Comedy ensued when trying to move just the MapMem up, leading to the rest of the commit. Some day (like tomorrow after I rebase intel-cleanup) I'll clean this path up. Tested with 2 X Servers on 2.6.28 (one gets DRI2, one fails successfully), 2 UMS X Servers on 2.6.30rc2 (each gets DRI2), and 2 KMS X Servers on 2.6.30rc2 (success all around).
| * Don't clear the framebuffer if it isn't currently bound.Eric Anholt2009-04-271-1/+1
| | | | | | | | | | This segfault can be triggered in non-KMS memory init before the EnterVT, and will happen anyway at EnterVT time.
| * Don't initialize DRI2 if the fd we get is not master-capable.Eric Anholt2009-04-271-1/+15
| |
| * Fix drmSetMaster/DropMaster error messages.Eric Anholt2009-04-271-4/+11
| |
| * format == 0 means "use default" in I830DRI2CreateBufferPierre Willenbrock2009-04-271-1/+1
| | | | | | | | Reviewed-by: Ian Romanick <idr@freedesktop.org>
| * Don't try to do anything for I830Sync when VT switched.Eric Anholt2009-04-271-1/+1
| | | | | | | | Fixes a crash with fake bufmgr and UXA.
| * Free front buffer bo when X exitShuang He2009-04-242-2/+10
| | | | | | | | | | | | | | It's needed when KMS or DRI2 is enabled, or there will be memory leak. Also fixes a segfault at startup with fake bufmgr. Signed-off-by: Eric Anholt <eric@anholt.net>
| * Fix UXA to build with Sun compilers (use __func__ instead of __FUNCTION__)Alan Coopersmith2009-04-242-1/+11
| | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| * DRI2: If the SDK supports it, use the DRI2GetBuffersWithFormat interfacesIan Romanick2009-04-241-1/+133
| | | | | | | | | | | | | | | | | | | | If DRI2INFOREC_VERSION is defined in the server's dri2.h and has a value greater than 1, compile to use the CreateBuffer and DestroyBuffer interfaces. The format parameter parameter to CreateBuffer is assumed to be the bits-per-pixel of the buffer. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kristian Høgsberg <krh@redhat.com>
| * SDVO: switch bus once for i2c transferZhenyu Wang2009-04-241-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Before sdvo try to get edid by i2c bus, it must do switch control bus to ddc active state from sdvo only state. However if current state has been ddc active state, redundant switch operation in our driver will cause error- "Unable to write to SDVOCTRL_E for SDVOB Slave 0x70". The patch will do switch control bus only one time during whole edid transmission. It has fixed bug #19937 Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Tested-by: Ma Ling <ling.ma@intel.com> Signed-off-by: Ma Ling <ling.ma@intel.com>
| * Disable FBC on IGD for UMSShaohua Li2009-04-241-0/+2
| | | | | | | | | | | | | | It appears the new chip doesn't support FBC currently. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
| * Revert "fix overflow warning on videoRam"Eric Anholt2009-04-221-1/+1
| | | | | | | | | | This reverts commit 08ebde4715b87867184d42b60762cd774e151f5c, which was apparently untested and broke KMS.
| * Remember allocated offscreenImages memory for freeing it in CloseScreen()Zdenek Kabelac2009-04-213-1/+5
| | | | | | | | | | | | Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com> [anholt: renamed the member to match the variable name] Signed-off-by: Eric Anholt <eric@anholt.net>
| * free allocated name inside sdvo_destroyZdenek Kabelac2009-04-211-0/+1
| | | | | | | | | | Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
| * Unreference allocated bos in i965 render error pathsZdenek Kabelac2009-04-211-1/+4
| | | | | | | | | | Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
| * Fix leak of some 965 render state on VT switch.Zdenek Kabelac2009-04-211-15/+8
| | | | | | | | | | | | Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com> [anholt: fixed up unneeded != NULL checks] Signed-off-by: Eric Anholt <eric@anholt.net>
| * Fix crash with XV with large virtual displayAlbert Damen2009-04-211-0/+1
| | | | | | | | | | | | | | | | If a virtual display with width > 2048 is used, the first time an XV buffer is needed will result in a BadAlloc error message, but the next time X would crash. Signed-off-by: Eric Anholt <eric@anholt.net>
| * Remove dead xoffset/yoffset from pre-randr.Eric Anholt2009-04-212-8/+1
| |
| * Remove dead monitor detect debugger.Eric Anholt2009-04-211-36/+0
| | | | | | | | watch xrandr works fine.
| * Replace a bunch of #ifdef debug flushing/syncing with a single function.Eric Anholt2009-04-215-44/+30
| | | | | | | | | | This removes it from a callsite where it would have just resulted in a fatalerror.
| * Staticize a bunch of functions and variables in the driver.Eric Anholt2009-04-2115-49/+37
| | | | | | | | | | | | | | | | This cleans up findstatic.pl output for the i830+ code, which resulted in removing some code. The only odd part of this commit is the if (0) i830_sdvo_dump() in i830_sdvo.c -- it tells the compiler that the code is used, without using it since we want the code around while debugging. It's also in a likely place to ask for the dump, so I think it's OK.
| * Use a static inline to replace if (0) to an unused stub function.Eric Anholt2009-04-212-12/+9
| |
| * Remove unused i830_output_type_namesEric Anholt2009-04-212-11/+0
| |
| * Remove dead mono cursor load code.Eric Anholt2009-04-212-14/+0
| |