a1d9600724
Merge commit 'origin/drm-gem' into modesetting-gem
...
Passed the compile test; it's ready to ship.
Conflicts:
libdrm/Makefile.am
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_memrange.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-06-10 17:31:54 -07:00
c987e76d95
Add EDID quirk handling
...
Port over EDID quirks from X.Org so we can handle more monitors. This meant
adding size info to the drm_display_mode struct, but other than that the
changes were isolated to the DRM EDID handling code (as they should be).
2008-06-09 16:20:45 -07:00
500c81d194
[gem] Don't forget to munmap in the non-bo-reuse object-freeing case.
2008-06-06 17:13:16 -07:00
c2fc142ea7
[intel] remove settable use_mi_batchbuffer_start
...
The driver can know what hardware requires MI_BATCH_BUFFER vs
MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
2008-06-06 21:54:38 +01:00
6cd0ef06a6
[intel] remove settable use_mi_batchbuffer_start
...
The driver can know what hardware requires MI_BATCH_BUFFER vs
MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
2008-06-06 13:26:03 -07:00
9f46c6935d
[intel-gem] Use timers to retire requests periodically.
...
Without the user IRQ running constantly, there's no wakeup when the ring
empties to go retire requests and free buffers. Use a 1 second timer to make
that happen more often.
2008-06-06 13:00:47 -07:00
a708106c77
[intel] free the hardware status page at driver_unload
...
This goes with the other hardware status page patch.
2008-06-06 13:00:46 -07:00
56a96841d0
[intel-gem] Add explicit throttle ioctl
...
Instead of throttling and execbuffer time, have the application ask to
throttle explicitly. This allows the throttle to happen less often, and
without holding the DRM lock.
2008-06-06 13:00:46 -07:00
329e086225
[libdrm/intel] Eliminate extra dri_gem_bo_bucket_entry structure
...
Place the buffer reuse links right into the dri_bo_gem object.
2008-06-06 13:00:46 -07:00
5a55b48a41
[libdrm/intel] Remove unused intel_validate_entry structure
2008-06-06 13:00:46 -07:00
a919ff5d5e
[libdrm/intel] Reuse entire dri_bo_gem structure
...
The code was discarding the dri_bo_gem structure and saving only the kernel
handle. This lost the mmap address, causing pain when the next buffer user
wanted to map the buffer.
2008-06-06 13:00:46 -07:00
5f5badb26f
[intel] Allocate hardware status page at driver load time
...
I couldn't get the re-allocated HWS to work on my 965GM, so I just gave up
and made it persist across the lifetime of the driver instead.
2008-06-06 13:00:46 -07:00
84162ccb7d
Ignore X server provided mmio address
2008-06-06 13:00:46 -07:00
118baeee18
[intel-gem] Dump error status on wait_request failure
2008-06-06 13:00:46 -07:00
6d4ffd12cd
drm: fix up fb resize again
2008-06-06 16:24:27 +10:00
00bb548c61
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
2008-06-06 15:38:53 +10:00
ec774e4d72
Merge remote branch 'origin/modesetting-101' into modesetting-101-fb
2008-06-06 15:21:57 +10:00
be501f00a3
intelfb: add multi fb paths
2008-06-06 15:21:22 +10:00
e6a3a1fdad
intelfb: remove duplicate define
2008-06-06 14:55:03 +10:00
fc08877b17
intelfb: admit fbdev is crap and punt on trying to resize to a larger fbdev.
2008-06-06 14:53:34 +10:00
8387a232a3
intelfb: move mode sets into the intel crtcs
...
better place to store them.
2008-06-06 12:02:51 +10:00
25c1bb334f
drm/intel: make hotplug just be an event
2008-06-06 10:39:58 +10:00
5f94172f81
intel: if no spare crtc exists don't just take one.
2008-06-06 10:31:36 +10:00
03bf1fba67
sysfs registration/teardown fixups
...
A check in drm_sysfs_connector_remove was supposed to allow it to be called
even with unregistered objects, to make cleanup paths a little simpler.
However, device_is_regsitered didn't always seem to return what we thought it
would, so we'd sometimes end up leaving objects lying around rather than
unregistering them.
Fix this situation up by requiring devices to be registered before being
removed. Any problems resulting from this change should be easier to track
down than the alternative (which is leaving kobjects registered after unload).
2008-06-05 15:58:43 -07:00
d198e9b091
Add a function to bufmgr_fake to evict all buffers in the GTT.
...
This will be used by the X Server for VT switch.
2008-06-05 08:45:39 -07:00
d9ead89c79
drm/modeset: add more debugging and fixup some fb enable/disabe bits
2008-06-05 16:32:41 +10:00
b31adb005a
drm/modesetting: more fb interface cleanups
2008-06-05 15:55:03 +10:00
efcf066eff
drm/modesetting: attempt to make fb code more sane
2008-06-05 15:21:07 +10:00
f73e54bbf0
drm: modesetting unify the hotplug init paths a lot.
...
remove fb callbacks, just probe into the driver to sort it out
2008-06-05 13:40:08 +10:00
56a1293184
modesetting: fix fb clearing up
2008-06-05 11:43:48 +10:00
1495dd31d6
modesetting: use surface width height for buffer allocs
2008-06-05 11:24:57 +10:00
1d980669e6
modesetting: add surface width/heights
2008-06-05 11:20:52 +10:00
967bd21911
modesetting: initial attempt at debonging fb
2008-06-05 11:11:22 +10:00
e90716671d
i915: use kzalloc to allocate intel_output for lvds
...
Better to initialize all the struct fields to 0. Also more consistent with
other output init routines.
2008-06-04 12:50:03 -07:00
52183fb05b
Fix crash in drm_mode_connector_update_edid_property
...
We need to initialize the edid_blob_ptr to NULL when we init a connector,
otherwise drm_mode_connector_update_edid_property may think there's a valid
EDID lying around and try to destroy it, causing a crash.
2008-06-04 09:38:44 -07:00
cf1964f971
drm: fix hotplug oops
2008-06-04 15:17:13 +10:00
a8725d95bc
intel: report a known connector
2008-06-04 15:17:00 +10:00
0903de0c8f
Drop struct_mutex while waiting in drm_client_lock_take
...
struct_mutex cannot be held while blocking on DRM lock.
2008-06-03 21:49:57 -07:00
9390bdab7c
libdrm: shouldn't rely on this
2008-06-04 13:53:33 +10:00
382aa3ceeb
drm: introduce generation counter to interface.
...
Idea being if you want to add new crtc/output/encoder dynamically later,
you just increase the generation counter and userspace should re-read
all the resources
2008-06-04 13:50:51 +10:00
9f31bd09c1
drm/sysfs: don't try an unregister if not registered
2008-06-04 13:16:49 +10:00
8e4c61e526
intel: use kzalloc
2008-06-04 13:09:20 +10:00
8690ad8ae0
drm/modesetting: bo not used anymore
2008-06-04 13:09:05 +10:00
58aca7485a
drm: remove sysfs in driver for now.. should probably be in helper
2008-06-04 13:03:23 +10:00
fd27591c6c
drm/modesetting: pass object handle to driver !bo
2008-06-04 13:00:31 +10:00
76a44f14d6
drm/modesetting: overhaul the fb create/delete.
...
Move TTM code into the driver
2008-06-04 11:59:28 +10:00
40229b6ad5
drm: make mode comparison more betterer.
...
This compares the clocks after converting to fb pico timings so we
get the same answer if the X and fb modes are the same.
2008-06-04 10:36:58 +10:00
8a3b510405
Fix libdrm to actually include the new code instead of just building it.
2008-06-03 14:44:53 -07:00
c4857429c7
Fix and hook up bufmgr code to the build.
2008-06-03 14:44:53 -07:00
6a9eb08a87
Import bufmgr code to libdrm. Not yet hooked up to the build.
2008-06-03 14:44:53 -07:00
Jesse Barnes
Jesse Barnes
Eric Anholt
Keith Packard
Dave Airlie
Dave Airlie