Dave Airlie [Fri, 18 Jul 2008 04:30:57 +0000 (14:30 +1000)]
radeon: remove microcode version
Dave Airlie [Thu, 19 Jun 2008 01:38:43 +0000 (11:38 +1000)]
drm/radeon: fixup 0 vs NULL
Robert Noland [Thu, 17 Jul 2008 18:01:04 +0000 (14:01 -0400)]
[FreeBSD] drm_irq.c updates for vblank fixes.
Jesse Barnes [Thu, 17 Jul 2008 17:51:24 +0000 (13:51 -0400)]
i915: remove old broken vblank code
Remove the unused (and broken) "in vblank" code now that the core has
been fixed to use a counter while interrupts are enabled. Also make the
vblank pipe get/set ioctls into dumb stub functions, since with the new
code we can no longer let userspace control whether vblank interrupts
are enabled, or the core code will misbehave.
Jesse Barnes [Thu, 17 Jul 2008 17:48:14 +0000 (13:48 -0400)]
Avoid incorrect vblank wakeups
The current code uses the hw vblank counter exclusively, which can lead
to wakeups during the active period rather than during the vblank period
if the hw counter counts displayed frames rather than vblank periods.
This change coverts the code over to using the counter while interrupts
are enabled, fixing that issue. It also includes a couple of related
changes: one to not enable the new enable/disable behavior until the
modeset ioctl is called (to preserve old client behavior) and another to
account for lost events due to mode setting with the new counter scheme.
BSD will require similar changes to its drm_irq.c code, but they should
be straightforward.
Robert Noland [Thu, 17 Jul 2008 03:39:25 +0000 (23:39 -0400)]
FreeBSD: Fix radeon build
Owain Gordon Ainsworth [Mon, 7 Jul 2008 16:23:48 +0000 (17:23 +0100)]
BSD: change drm_locked_task*() to use the same scheme as linux.
The current code can sleep in an interrupt handler, that is bad. So
instead if we can't grab the lock, flag it and run the tasklet on
unlock.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Mon, 9 Jun 2008 12:54:53 +0000 (08:54 -0400)]
[FreeBSD] We aren't allowed to hold locks over bus_dma_tag_create or bus_dmamem_alloc.
Hong Liu [Tue, 15 Jul 2008 17:14:17 +0000 (10:14 -0700)]
This is a modified version of Hong's patch from last month, with a few
modifications to make it work correctly on my test hardware (altered the
backlight write function, made it enable the legacy backlight controller
interrupts on mobile hardware, sorted the interrupt function so we don't
get an excessive number of vblank interrupts). This lets the backlight
keys on my T61 work properly, though there's a 750msec or so delay
between the request and the brightness actually changing - this sounds
awfully like the hardware spinning waiting for a status flag to become
ready, but as far as I can tell they're all set correctly. If anyone can
figure out what's wrong here, it'd be nice to know.
Some of the functions are still stubs and just tell the hardware that
the request was successful. These can be filled in as kernel modesetting
gets integrated. I think it's worth getting this in anyway, since it's
required for backlight control to work properly on some new platforms.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Dave Airlie [Tue, 15 Jul 2008 10:27:14 +0000 (20:27 +1000)]
drm: fix missing symbol export
Dave Airlie [Tue, 15 Jul 2008 06:18:22 +0000 (16:18 +1000)]
drm: add fix for PAT on radeon with 2.6.26
Dave Airlie [Tue, 15 Jul 2008 06:18:04 +0000 (16:18 +1000)]
drm/pcigart: fix warning
martin capitanio [Tue, 8 Jul 2008 07:58:10 +0000 (17:58 +1000)]
xgi: use true/false instead of TRUE/FALSE
Ben Skeggs [Tue, 24 Jun 2008 18:39:32 +0000 (04:39 +1000)]
nouveau: interface changes for nv5x 3d
Zhenyu Wang [Wed, 2 Jul 2008 16:49:19 +0000 (00:49 +0800)]
i915: official name for GM45 chipset
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Jesse Barnes [Tue, 1 Jul 2008 23:10:01 +0000 (16:10 -0700)]
i915: only use tiled blits on 965+
When scheduled swaps occur, we need to blit between front & back buffers. I
the buffers are tiled, we need to set the appropriate XY_SRC_COPY tile bit,
only on 965 chips, since it will cause corruption on pre-965 (e.g. 945).
Bug reported by and fix tested by Tomas Janousek <tomi@nomi.cz>.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Jesse Barnes [Tue, 1 Jul 2008 23:09:02 +0000 (16:09 -0700)]
Revert "i915: only use tiled blits on 965+"
This reverts commit
727d4f1d1667e43b3558bd5f6ed6dc2cd9c29401, somehow git
deleted the symlink and replaced it with the file.
Jesse Barnes [Tue, 1 Jul 2008 19:25:16 +0000 (12:25 -0700)]
i915: only use tiled blits on 965+
When scheduled swaps occur, we need to blit between front & back buffers. If
the buffers are tiled, we need to set the appropriate XY_SRC_COPY tile bit, but
only on 965 chips, since it will cause corruption on pre-965 (e.g. 945).
Bug reported by and fix tested by Tomas Janousek <tomi@nomi.cz>.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Jie Luo [Tue, 24 Jun 2008 17:38:31 +0000 (10:38 -0700)]
i915: enable bus mastering on i915 at resume time
On 9xx chips, bus mastering needs to be enabled at resume time for much of the
chip to function. With this patch, vblank interrupts will work as expected
on resume, along with other chip functions. Fixes kernel bugzilla #10844.
Signed-off-by: Jie Luo <clotho67@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Ben Skeggs [Wed, 25 Jun 2008 06:45:41 +0000 (16:45 +1000)]
nv50: when destroying a channel make sure it's not still current on PFIFO
We won't get a PFIFO context switch when the same channel ID is recreated if
the hw still thinks the channel is already active, which causes fun issues.
Should allow X to be stopped and started without tearing down the entire
card state in lastclose().
Jesse Barnes [Tue, 24 Jun 2008 19:57:21 +0000 (12:57 -0700)]
i915: remove unused variable
Leftover dev_priv from the move of the suspend/resume code into shared-core.
Jesse Barnes [Tue, 24 Jun 2008 19:50:29 +0000 (12:50 -0700)]
i915: register definition & header file cleanup
It would be nice if one day the DRM driver was the canonical source for
register definitions and core macros. To that end, this patch cleans things up
quite a bit, removing redundant definitions (some with different names
referring to the same register) and generally tidying up the header file.
Ben Skeggs [Sun, 22 Jun 2008 16:42:15 +0000 (02:42 +1000)]
nv50: oops, keep VRAM allocations aligned at 64KiB - that's our page size..
Ben Skeggs [Sun, 22 Jun 2008 15:24:11 +0000 (01:24 +1000)]
nv50: use same dma object for fb/tt access
We depend on the VM fully now for memory protection, separate DMA objects
for VRAM and GART are unneccesary. However, until the next interface break
(soon) a client can't depend on the objects being the same and must still
call NV_OBJ_SET_DMA_* methods appropriately.
Ben Skeggs [Sun, 22 Jun 2008 15:00:42 +0000 (01:00 +1000)]
nouveau: allocate drm-use vram buffers from end of vram.
This avoids seeing garbage from engine setup etc before X gets around
to pointing the CRTCs at a new scanout buffer. Not actually a noticable
problem before G80 as PRAMIN is forced to the end of VRAM by the hardware
already.
Dave Airlie [Sun, 22 Jun 2008 08:25:22 +0000 (18:25 +1000)]
agp: use true/false instead of TRUE/FALSE
Alex Deucher [Sat, 21 Jun 2008 14:46:55 +0000 (10:46 -0400)]
RADEON: 0x1002 0x5657 is actually an RV410
See bug 14289
Dave Airlie [Fri, 20 Jun 2008 05:35:47 +0000 (15:35 +1000)]
drm: only use kernel ioctl cmd when doing a core ioctl.
Need to overhaul the mess that is driver ioctls
Dave Airlie [Fri, 20 Jun 2008 05:35:16 +0000 (15:35 +1000)]
r300: fix warning
Dave Airlie [Fri, 20 Jun 2008 02:03:41 +0000 (12:03 +1000)]
drm: fix the ioctl to not believe userspace.
believing userspace causes oopses
Zhenyu Wang [Wed, 18 Jun 2008 06:19:38 +0000 (14:19 +0800)]
i915: Add support for Intel 4 series chipsets
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Jerome Glisse [Sun, 15 Jun 2008 18:18:29 +0000 (20:18 +0200)]
radeon: *really* fix screen corruption thanks to Lukasz Krotowski
Jerome Glisse [Sun, 15 Jun 2008 17:31:02 +0000 (19:31 +0200)]
radeon: actualy try to fix the corruption
Jerome Glisse [Sun, 15 Jun 2008 16:49:47 +0000 (18:49 +0200)]
radeon: fix screen corruption introduced by last patch
Robert Noland [Fri, 13 Jun 2008 21:41:20 +0000 (17:41 -0400)]
[FreeBSD] Fix another lock leak
Reported by vehemens
Jerome Glisse [Fri, 13 Jun 2008 08:02:41 +0000 (10:02 +0200)]
radeon: bump driver date to know if lockup fix is in
Jerome Glisse [Fri, 13 Jun 2008 07:54:05 +0000 (09:54 +0200)]
radeon: r345xx fixe hard lockup
This patch should fixe hard lockup and convert them in
softlockup (ie you can ssh the box but the gpu is busted
and we are waiting in loop for it to come back to reason).
Ian Romanick [Thu, 12 Jun 2008 22:36:48 +0000 (15:36 -0700)]
xgi: Bump kernel version
This should have been bumped when the fence interface was changed the
other day. Better late than never, I suppose.
Alex Deucher [Wed, 11 Jun 2008 22:25:47 +0000 (18:25 -0400)]
RADEON: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
According to the hw guys, you should use DSTCACHE_CTLSTAT to flush
the 2D dst cache rather than RB2D_DSTCACHE_CTLSTAT.
Ian Romanick [Wed, 11 Jun 2008 05:18:14 +0000 (22:18 -0700)]
xgixp: Remove dependency on TTM fences
Ian Romanick [Mon, 12 May 2008 22:58:55 +0000 (15:58 -0700)]
xgi: Fix 64-bit kernel / 32-bit user issue.
Dave Airlie [Tue, 10 Jun 2008 06:27:50 +0000 (16:27 +1000)]
ati_pcigart: split out the page insert function
Alex Deucher [Mon, 9 Jun 2008 20:58:06 +0000 (16:58 -0400)]
RADEON: Add untested support for RS400 chips
GART setup appears to work the same as RS480 chips.
Also RC4xx chips are actually RS400 based, not RS480 based.
Alex Deucher [Mon, 9 Jun 2008 20:28:35 +0000 (16:28 -0400)]
RADEON: switch IGP gart to use radeon_write_agp_base()
Robert Noland [Mon, 9 Jun 2008 03:46:14 +0000 (23:46 -0400)]
Fix typo in i915_suspend
Reported by vehemens
Robert Noland [Wed, 4 Jun 2008 01:15:54 +0000 (21:15 -0400)]
I915 suspend/resume for FreeBSD
Dave Airlie [Sun, 8 Jun 2008 19:32:41 +0000 (05:32 +1000)]
r300/r500: add hier-z regs
Robert Noland [Wed, 4 Jun 2008 19:04:41 +0000 (15:04 -0400)]
[FreeBSD] Rework ati_pcigart.c
This is mostly just a diff reduction with the linux version.
I'm not convinced that it will make anything better.
Robert Noland [Thu, 5 Jun 2008 16:46:39 +0000 (12:46 -0400)]
[FreeBSD] We need to request busmastering support.
This seems to be the key to getting at least some radeon
cards working. Most, if not all drivers need it enabled,
so just request it once the driver has attached.
Robert Noland [Tue, 3 Jun 2008 20:21:13 +0000 (16:21 -0400)]
[FreeBSD] Incorporate vblank fixes for bsd.
Robert Noland [Tue, 3 Jun 2008 17:02:38 +0000 (13:02 -0400)]
[FreeBSD] Forgot to call mtx_destroy on all the locks at unload.
Robert Noland [Mon, 2 Jun 2008 23:35:00 +0000 (19:35 -0400)]
[FreeBSD] Remove the locks in the vblank_disable_fn
They are recursive and causing panics with witness enabled.
Robert Noland [Mon, 2 Jun 2008 17:12:59 +0000 (13:12 -0400)]
[FreeBSD] Go back to using vbl_lock and move init/destroy to load/unload.
Dennis Kasprzyk [Thu, 5 Jun 2008 15:08:44 +0000 (17:08 +0200)]
radeon: Restore software interrupt on resume.
Fixes performance drop after suspend/resume on some systems.
Michel Dänzer [Tue, 3 Jun 2008 09:28:10 +0000 (11:28 +0200)]
vblank: Don't wait or update the counter while the CRTC is supposedly disabled.
Without kernel modesetting, this requires cooperation of the userspace
modesetting driver. We may have to leave the vblank interrupt enabled otherwise
to avoid problems.
Michel Dänzer [Tue, 3 Jun 2008 09:28:10 +0000 (11:28 +0200)]
vblank: Clean up compensation for spurious wraparounds of driver counter.
Only compensate when the driver counter actually appears to have moved
backwards.
The compensation deltas need to be incremental instead of absolute; drop the
vblank_offset field and just use atomic_sub().
Michel Dänzer [Tue, 3 Jun 2008 09:28:09 +0000 (11:28 +0200)]
vblank: Special-case driver vblank counter going back by 1.
Turns out the radeon driver is affected by the same problem that prompted i915
to revert to less useful counter flipping at the end of the vblank interval. In
the long term, we can hopefully implement more reliable methods to achieve
counter flipping at the beginning of vblank, but otherwise this should be an
acceptable workaround.
Michel Dänzer [Tue, 3 Jun 2008 09:28:09 +0000 (11:28 +0200)]
vblank: Don't return current sequence number and time if interrupted by signal.
Michel Dänzer [Tue, 3 Jun 2008 09:27:39 +0000 (11:27 +0200)]
Revert "don't copy back if an error was returned."
This reverts commit
6671ad1917698b6174a1af314b63b3800d75248c.
The vblank ioctl needs to update the userspace parameters when interrupted by
a signal, which was prevented by this. Let's see if this breaks other ioctls...
Dave Airlie [Tue, 3 Jun 2008 02:42:49 +0000 (12:42 +1000)]
drm: sg alloc should write back the handle to userspace
Dave Airlie [Tue, 3 Jun 2008 02:40:54 +0000 (12:40 +1000)]
drm/ati_pcigart: use proper page mapping function
This should be pci_map_page not pci_map_single
Robert Noland [Sun, 1 Jun 2008 23:34:29 +0000 (19:34 -0400)]
[FreeBSD] Declare vblank_disable_fn callout MPSAFE.
Robert Noland [Sun, 1 Jun 2008 20:17:31 +0000 (16:17 -0400)]
[FreeBSD] Get rid of vbl_lock and re-use irq_lock.
Robert Noland [Sun, 1 Jun 2008 16:56:34 +0000 (12:56 -0400)]
[FreeBSD] Add symlink for radeon_microcode.h
Robert Noland [Sun, 1 Jun 2008 16:49:20 +0000 (12:49 -0400)]
[FreeBSD] Call drm_vblank_cleanup during irq uninstall
I needed to re-arrange some functions for this.
Also needed to call DRM_SPINUNINIT on the vbl_lock during cleanup.
Alex Deucher [Fri, 30 May 2008 22:20:01 +0000 (18:20 -0400)]
RADEON: fix typo in last commit
Dave Airlie [Fri, 30 May 2008 10:27:31 +0000 (20:27 +1000)]
r500: attempt to make AGP work by programming agp base in the MC correctly
Dave Airlie [Wed, 28 May 2008 01:12:57 +0000 (11:12 +1000)]
radeon: split microcode out into a separate header file.
Dave Airlie [Wed, 28 May 2008 00:28:13 +0000 (10:28 +1000)]
i915: fix BSD bh, DRI2 not uses anywhere else
Dave Airlie [Wed, 28 May 2008 00:02:20 +0000 (10:02 +1000)]
radeon: bump release date/version for r500 3D support
Alex Deucher [Tue, 27 May 2008 22:33:33 +0000 (18:33 -0400)]
RADEON: add get_param for number of GB pipes
Owain Ainsworth [Tue, 27 May 2008 22:12:35 +0000 (15:12 -0700)]
[BSD] Move unlock in drm_vm.c from accidental platform #ifdeffing.
Also remove an unreachable unlock.
Owain Ainsworth [Tue, 27 May 2008 22:11:25 +0000 (15:11 -0700)]
[BSD] Fix lock leak in drm_update_draw malloc failure path.
Owain Ainsworth [Tue, 27 May 2008 22:07:04 +0000 (15:07 -0700)]
[BSD] Fix lock leaks in error paths in drm_bufs.c.
Owain Ainsworth [Tue, 27 May 2008 21:59:38 +0000 (14:59 -0700)]
[BSD] Remove superfluous recursive locking in drm_add_magic.
Jie Luo [Tue, 27 May 2008 21:55:01 +0000 (14:55 -0700)]
[i915] Fix typo in (unused) START_ADDR definition.
Robert Noland [Fri, 23 May 2008 18:36:05 +0000 (14:36 -0400)]
[FreeBSD] Add vblank-rework support and get drivers building.
The i915 driver now works again.
Eric Anholt [Tue, 27 May 2008 21:12:51 +0000 (14:12 -0700)]
[FreeBSD] Convert from drm_device_t to struct drm_device for consistency.
Dave Airlie [Thu, 22 May 2008 23:39:54 +0000 (09:39 +1000)]
r500: add two more register ranges for mesa driver to setup
Dave Airlie [Thu, 15 May 2008 01:13:03 +0000 (11:13 +1000)]
drm: fix nouveau warning
Dave Airlie [Wed, 21 May 2008 10:14:45 +0000 (20:14 +1000)]
rs690/r500: vblank support.
The new display controller has the vblank interrupts in a different place.
Add support for vbl interrupts for these chips
Dave Airlie [Sat, 17 May 2008 00:22:12 +0000 (10:22 +1000)]
r500: add more register ranges for Mesa driver
Dave Airlie [Wed, 14 May 2008 12:48:12 +0000 (22:48 +1000)]
ati_pcigart: oops wrong way around not that it actually mattered
Dave Airlie [Wed, 14 May 2008 12:44:22 +0000 (22:44 +1000)]
ati_pcigart: stop working in the evenings you mess up too often
Dave Airlie [Wed, 14 May 2008 12:43:28 +0000 (22:43 +1000)]
Revert "ati_pcigart: fixup properly this version might even work"
This reverts commit
bc0836e12a9790f1cc83f8bc29bc05043c4bc840.
tree has some kref hacks in it - oops
Dave Airlie [Wed, 14 May 2008 12:42:21 +0000 (22:42 +1000)]
ati_pcigart: fixup properly this version might even work
Dave Airlie [Wed, 14 May 2008 12:35:32 +0000 (22:35 +1000)]
ati_pcigart: fill out 40-bit gart table support properly
Thanks to Alex for supplying this info.
Alex Deucher [Wed, 14 May 2008 01:02:17 +0000 (21:02 -0400)]
RS4xx: separate out RS400 and RS480 IGP chips
RS400 (intel based IGP) and RS480 (AMD based IGP) have
different MC and GART setups. Currently we only support
RS480.
Alex Deucher [Mon, 12 May 2008 18:49:43 +0000 (14:49 -0400)]
RADEON: fix copy/pasto in last commit
Alex Deucher [Mon, 12 May 2008 13:44:20 +0000 (09:44 -0400)]
R3/4/5: init pipe setup in drm
Similar (broken) code in mesa needs to be removed
Alex Deucher [Mon, 12 May 2008 13:35:06 +0000 (09:35 -0400)]
RADEON: cleanup radeon_do_engine_reset()
Alex Deucher [Mon, 12 May 2008 13:30:47 +0000 (09:30 -0400)]
R300+: fixup pixcache flush
Alex Deucher [Mon, 12 May 2008 13:24:13 +0000 (09:24 -0400)]
RS4xx: fix MCIND index mask
Alex Deucher [Mon, 12 May 2008 13:21:45 +0000 (09:21 -0400)]
RADEON: write AGP_BASE_2 on chips that support it
Alex Deucher [Mon, 12 May 2008 13:18:28 +0000 (09:18 -0400)]
R300+: fixup PURGE/FLUSH macros
Alex Deucher [Mon, 12 May 2008 13:13:44 +0000 (09:13 -0400)]
Radeon IGP: merge RS4xx/RS6xx gart setup
Alex Deucher [Mon, 12 May 2008 13:00:40 +0000 (09:00 -0400)]
Radeon IGP: wrap MCIND access
first step in merging rs4xx/rs6xx gart setup
Alex Deucher [Mon, 12 May 2008 12:56:11 +0000 (08:56 -0400)]
Radeon IGP: clean up registers and magic numbers
Dave Airlie [Wed, 7 May 2008 05:10:23 +0000 (15:10 +1000)]
drm: nopage compat fixup for drm_vm
The kernel has removed nopage so move the old nopage codepaths into a compat vm file and switch to using the fault paths.
nopfn is on its way out in the future also, so we should switch to using fault
for that path as well soon
Dave Airlie [Mon, 5 May 2008 06:49:04 +0000 (16:49 +1000)]
r500: add allowed range for us config/pixsize