7f269bec7e
Merge branch 'master' into modesetting-101
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-04-28 12:10:44 +02:00
7f8e406085
Use fixed sized types in new ioctls
...
Make both crtc and the command argument 32 bits to avoid any 32-on-64 compat
issues.
2008-04-27 09:42:17 -07:00
b45fe49bcd
Enum-ectomy of vblank modesetting ioctl
...
Enum can be of pretty much any size since C leaves the choice of size up to the implementation. So avoid using it in new interfaces like the vblank pre- & post-modeset ioctl. Thanks to hch for spotting this.
2008-04-26 17:11:18 -07:00
55a9941977
Make via compile.
...
Chase the lock to it's new location.
2008-04-23 12:43:52 -04:00
33fa02f2d8
Make radeon_ms compile.
...
Remove lock functions and use pci_map_rom() instead of pci_map_rom_copy().
2008-04-23 12:42:26 -04:00
10b9a116a7
Don't disable IRQs, just tasklets, when taking the drm lock spinlock.
2008-04-23 17:34:21 +02:00
9ba3aaaa1a
Fixed unlock check on EAGAIN
2008-04-23 12:43:45 +02:00
feff72929e
i915: fix for compatibility mode
2008-04-23 17:17:16 +08:00
8dc4d4fa1f
i915: allocate devname at init time
...
Since it'll be freed at unload time, we should alloc devname rather than
pointing to the DRIVER_NAME string.
2008-04-22 18:41:28 -07:00
b57e1f7efd
add sysfs entry for DVO output
...
forget to add it in the previous DVO porting patch.
Signed-off-by: Hong Liu <hong.liu@intel.com>
2008-04-22 18:35:26 -07:00
8a390e058f
clear interrupt status before install irq
...
On my 865G machine, it seems the CPU will receive interrupt before
irq_postinstall is called. This will cause kernel oops because vblank is not
inited at that time. Clear interrupt status before install seems fixing this
problem.
Signed-off-by: Hong Liu <hong.liu@intel.com>
2008-04-22 18:34:11 -07:00
c250104c8f
fix removing output_attrs
...
fix a typo in removing output sysfs.
Signed-off-by: Hong Liu <hong.liu@intel.com>
2008-04-22 18:32:39 -07:00
b3967765c0
linux-core Makefile: add GIT_REVISION
...
This tries to automatically fetch a git revision string and if succeeds,
it #defines GIT_REVISION string macro. Packagers can override it by
'make GIT_REVISION=foo'.
Update Nouveau to use GIT_REVISION, if defined, instead of DRIVER_DATE
in struct drm_driver.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-04-22 22:07:21 +03:00
ce8c842518
i915: gfx hw and i945gme fixes from upstream
...
From Jesse and Zhenyu originally.
2008-04-22 16:08:17 +10:00
f0e38f5217
[I915] Handle tiled buffers in vblank tasklet
...
The vblank tasklet update code must build 2D blt commands with the
appropriate tiled flags.
2008-04-20 16:10:05 -07:00
21dbba5a22
On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
...
The batchbuffer submission paths were fixed to use the 965-specific command,
but the vblank tasklet was not. When the older version is sent, the 965 will
lock up.
2008-04-20 01:56:02 -07:00
21a93915d8
Porting DVO stuff
...
Ported from Xorg intel 2d driver. Changed interfaces definitions, which needed
to be changed later if other device wants to use these DVO stuff.
2008-04-17 11:43:28 -07:00
1ad1bd5bd9
Fix buffer object map wait error.
...
Add some branch prediction hints.
2008-04-14 13:52:33 +02:00
c5955c6523
Fix buffer object creation validation.
...
BO lock fixes.
2008-04-14 12:14:20 +02:00
c9b73ef6da
Unlock the BO mutex while waiting for idle, unmapped, unfenced.
...
Move unfenced checking into idle checking.
Never time out while waiting for software events like unmapped or unfenced.
2008-04-14 12:13:33 +02:00
65dd0e68ff
Fix up buffer manager locking.
2008-04-14 12:13:17 +02:00
b986d7d2c9
Save and restore dsparb and d_state regs
2008-04-11 20:31:07 -07:00
6cc2d7e7ae
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
2008-04-12 00:15:47 +02:00
5891b0bd2a
radeon_ms: rework command submission ioctl & cleanup
2008-04-12 00:15:12 +02:00
3b32ee36ae
Fixup Intel TV property code
...
Use the new TV property creation routine and fixup the set_property code
to actually do a mode set call when properties change.
2008-04-10 20:31:31 -07:00
83c3acb7da
Split TV property creation into its own routine
...
It needs to take arguments from the caller about supported TV formats,
so declare it in drm_crtc.h and export it.
2008-04-10 20:30:12 -07:00
bee546ad69
Remove structure fields & code
...
Cleanup some random cruft left over from the initial port.
2008-04-10 19:02:53 -07:00
ebd1544973
Fix masking in get_load_detect_pipe
...
Start i at -1 so that the masking works right.
2008-04-10 11:27:39 -07:00
0a6e301e6d
Keep display info in struct display_info
...
Some fields had snuck into the drm_output structure. Put them back and
fill in more stuff from the EDID block.
2008-04-10 11:23:55 -07:00
386ea38b8e
Add TV out hotplug detection
...
Doesn't yet work on my i915 test machine, but most of the necessary bits
should be there.
2008-04-09 14:13:38 -07:00
b3737f3fd9
Fix TV load detection
...
Now that we can allocate load detect pipes, we can perform TV out load
detection correctly. Call the new routines and enable proper TV
detection.
2008-04-09 14:13:38 -07:00
6c92689dcc
Port pipe reservation code for load detection
...
TV out needs to do load detection, which means we have to find an
available pipe to use for the detection. Port over the pipe reservation
code for this purpose.
2008-04-09 14:13:38 -07:00
256a96135e
Add newline to debug output for output add
2008-04-09 14:13:38 -07:00
61a81a043c
Older kernels don't have kobject_uevent_env(), so punt
...
the event for these older kernels.
2008-04-09 22:07:40 +01:00
fa116081a9
Fixup sysfs output registration
...
Put off registering new outputs with sysfs until they're properly configured,
or we may get duplicates if the type hasn't been set yet (as is the case with
SDVO initialization). This also means moving de-registration into the cleanup
function instead of output destroy, since the latter occurs during the normal
course of setup when an output isn't found (and therefore not registered with
sysfs yet.
2008-04-09 11:30:15 -07:00
e3c7a0fcb0
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
2008-04-08 12:48:41 -07:00
a2edd07f20
Add devname in modeset case
...
If the driver is 'modeset' enabled, it'll register it's interrupt
handler at load time. Set the devname in this case so that
/proc/interrupts makes sense.
2008-04-08 12:44:52 -07:00
5a3ce06f3a
Improved DRM sysfs support
...
This patch ties outputs, output properties and hotplug events into the
DRM core. Each output has a corresponding directory under the primary
DRM device (usually card0) containing dpms, edid, modes, and connection
status files.
New hotplug change events occur when outputs are added or hotplug events
are detected.
2008-04-08 12:42:23 -07:00
779e826c1e
radeon_ms: command buffer validation use array of function pointer
2008-04-08 02:18:14 +02:00
db61f02bd7
Missing KERNEL_VERSION macro
2008-04-07 22:24:24 +02:00
fee64980c4
radeon_ms: another fb fix reset mode if fb changed
2008-04-07 20:49:36 +02:00
27c3785d3f
Add DragonFly BSD support for device creation
...
DragonFly behaves just like FreeBSD in this regard.
2008-04-07 15:27:43 +03:00
dfa9f03992
nouveau: enable accelerated move to sysmem
2008-04-07 13:29:11 +10:00
c12b60b509
nouveau: enable m2mf for tt<->vram moves, fix fence_poll
2008-04-07 13:05:51 +10:00
060e725a0e
radeon_ms: fix framebuffer code
2008-04-06 19:23:20 +02:00
91bfd69745
radeon_ms: check for NULL fb
2008-04-06 19:01:31 +02:00
e89710bef7
Place highmem pages last in the ttm page array.
2008-04-06 11:21:22 +02:00
c3888b97f6
Use clflush() when available for cache flushing.
2008-04-06 10:32:02 +02:00
51a0fdcf3f
[I915] Fix VRAM eviction.
2008-04-06 10:30:27 +02:00
87ae5b22e3
Fix emergency allocation accounting.
2008-04-06 10:30:27 +02:00
Thomas Hellstrom
Jesse Barnes
Jesse Barnes
Kristian Høgsberg
Jakob Bornecrantz
Xiang, Haihao
Hong Liu
Pekka Paalanen
Dave Airlie
Keith Packard
Jerome Glisse
Jesse Barnes
Alan Hourihane
Patrice Mandin
Hasso Tepper
Ben Skeggs