OSDN Git Service
Dave Airlie [Tue, 17 Apr 2007 08:18:25 +0000 (18:18 +1000)]
add some missing export symbols
Dave Airlie [Tue, 17 Apr 2007 08:16:38 +0000 (18:16 +1000)]
another large overhaul of interactions with userspace...
We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
Jakob Bornecrantz [Mon, 16 Apr 2007 18:54:24 +0000 (20:54 +0200)]
Fix offset should from pci device address
Jesse Barnes [Sat, 14 Apr 2007 22:35:38 +0000 (15:35 -0700)]
Use drm_mem_reg_ioremap to map buffer object.
Jesse Barnes [Sat, 14 Apr 2007 22:35:21 +0000 (15:35 -0700)]
Fix PRIV0 memory initialization (mm_init takes pages, not bytes), align fb
allocation correctly, and use drm_mem_reg_iomap to map ring buffer object.
Jakob Bornecrantz [Fri, 13 Apr 2007 00:23:42 +0000 (02:23 +0200)]
Added debug messages so we know which output we are dealing with
David Airlie [Fri, 13 Apr 2007 04:33:52 +0000 (14:33 +1000)]
i915/drm: clean up a lot of the i915/drm startup/teardown sequences
When the kernel driver is loaded it sets up a lot of stuff..
it tears down the same stuff on unload.
This add a new map type called DRM_DRIVER which means the driver will clean the mapping up
and fix up the map cleaner
David Airlie [Fri, 13 Apr 2007 04:31:10 +0000 (14:31 +1000)]
export drm_bo_driver_finish symbol
David Airlie [Fri, 13 Apr 2007 04:30:44 +0000 (14:30 +1000)]
revert LVDS destroy - this oops on sysfs on sdvo init of i2c bus
Jesse Barnes [Fri, 13 Apr 2007 01:30:36 +0000 (18:30 -0700)]
Move driver load call to after AGP init, in case the load routine needs AGP stuff.
Jesse Barnes [Thu, 12 Apr 2007 21:57:07 +0000 (14:57 -0700)]
Oops, forgot to push the msleep() in the hotplug test. Wouldn't want to
spin in the kernel for a whole second w/o it...
Jesse Barnes [Thu, 12 Apr 2007 19:43:47 +0000 (12:43 -0700)]
Use crtc_from_pipe call in intel_lvds.c and add get_mode panel mode detection. Also fix up error case for when LVDS mode can't be determined. Leave placeholder code in place for BIOS mode probing and platform quirks.
Jesse Barnes [Thu, 12 Apr 2007 19:41:56 +0000 (12:41 -0700)]
Add new function for getting a CRTC pointer given a pipe number.
Jesse Barnes [Thu, 12 Apr 2007 19:40:51 +0000 (12:40 -0700)]
Fix 945+ hotplug detection, remove some unused variables.
Jesse Barnes [Thu, 12 Apr 2007 18:50:57 +0000 (11:50 -0700)]
Don't need a NULL check prior to calling kfree.
Jesse Barnes [Thu, 12 Apr 2007 18:40:12 +0000 (11:40 -0700)]
Initialize the hw lock waitqueue so we don't hang in drm_lastclose.
Jesse Barnes [Thu, 12 Apr 2007 16:01:53 +0000 (09:01 -0700)]
Don't use drm_setup, do SAREA allocation and mapping directly instead.
Jesse Barnes [Thu, 12 Apr 2007 15:57:58 +0000 (08:57 -0700)]
Move i2c init back to where it belongs and add i2c unregistration in *_destroy.
Jesse Barnes [Thu, 12 Apr 2007 15:56:34 +0000 (08:56 -0700)]
Whitespace cleanup
Jesse Barnes [Thu, 12 Apr 2007 15:55:51 +0000 (08:55 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Jesse Barnes [Thu, 12 Apr 2007 15:53:03 +0000 (08:53 -0700)]
Revert "Export drm_setup for use by new driver init code.", we don't really want to use this function
This reverts commit
e114b981bc291049fa6996d487334a408acc1ce2.
Alan Hourihane [Thu, 12 Apr 2007 14:12:00 +0000 (15:12 +0100)]
Use drm_framebuffer instead of drm_crtc for fb & fbt
Alan Hourihane [Thu, 12 Apr 2007 14:11:38 +0000 (15:11 +0100)]
Remove extraneous drm_crtc.h include
Alan Hourihane [Thu, 12 Apr 2007 14:10:08 +0000 (15:10 +0100)]
Merge remote branch 'origin/modesetting-101' into modesetting-101
Jesse Barnes [Thu, 12 Apr 2007 03:41:54 +0000 (20:41 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Jesse Barnes [Thu, 12 Apr 2007 03:41:27 +0000 (20:41 -0700)]
Remove debug statement about buffer objects
Dave Airlie [Thu, 12 Apr 2007 02:11:58 +0000 (12:11 +1000)]
use FB everywhere
Dave Airlie [Thu, 12 Apr 2007 01:55:10 +0000 (11:55 +1000)]
cleanup framebuffers on drm unload
Dave Airlie [Thu, 12 Apr 2007 01:54:49 +0000 (11:54 +1000)]
only initialise modes when fbcon or fbset asks for it
Dave Airlie [Thu, 12 Apr 2007 01:43:13 +0000 (11:43 +1000)]
set bracing style like Linux
Dave Airlie [Thu, 12 Apr 2007 01:28:55 +0000 (11:28 +1000)]
fix unbalanced lock and make sure mode list has modes so lvds code doesn't crash
Dave Airlie [Wed, 11 Apr 2007 22:54:31 +0000 (08:54 +1000)]
allow framebuffer changes on the crtc setup
Dave Airlie [Wed, 11 Apr 2007 22:45:40 +0000 (08:45 +1000)]
add getfb ioctl
Jesse Barnes [Wed, 11 Apr 2007 19:52:57 +0000 (12:52 -0700)]
Use new kernel buffer object type and cleanup agp probing.
Jesse Barnes [Wed, 11 Apr 2007 19:51:52 +0000 (12:51 -0700)]
Add new buffer object type for kernel allocations that don't initially have a user mapping.
Jesse Barnes [Wed, 11 Apr 2007 18:47:58 +0000 (11:47 -0700)]
Add aperture size and preallocation probing (from intelfb), cleanup load code to be more general.
Jesse Barnes [Wed, 11 Apr 2007 18:46:37 +0000 (11:46 -0700)]
Fix i2c unregistration, cleanup panel_fixed_mode assignment.
Jesse Barnes [Wed, 11 Apr 2007 18:44:54 +0000 (11:44 -0700)]
Whitespace cleanups.
Jesse Barnes [Wed, 11 Apr 2007 18:42:00 +0000 (11:42 -0700)]
Fix EDID pixel clock calculation.
Jesse Barnes [Wed, 11 Apr 2007 14:21:24 +0000 (07:21 -0700)]
fix modeset cleanup for LVDS and reenable it in i915.
Jesse Barnes [Wed, 11 Apr 2007 14:08:48 +0000 (07:08 -0700)]
export vblank routine for use by intel_display.c and intel_sdvo.c.
Jesse Barnes [Wed, 11 Apr 2007 14:08:29 +0000 (07:08 -0700)]
Fixup DDC probing. We only have one DDC bus so we have to use it only
on demand, and unregister when we're done.
Jesse Barnes [Wed, 11 Apr 2007 14:07:54 +0000 (07:07 -0700)]
Various changes for in-kernel modesetting:
- allow drm_buffer_object_create to be called w/o dev_mapping
- fixup i915 init code to allocate memory, fb and set modes right
- pass fb to drm_initial_config for setup
- change some debug output to make it easier to spot
- fixup lvds code to use DDC probing correctly
David Airlie [Wed, 11 Apr 2007 07:35:00 +0000 (17:35 +1000)]
line_length calculation was incorrect.. I now can get fbcon to run
David Airlie [Wed, 11 Apr 2007 07:25:37 +0000 (17:25 +1000)]
oops for 32 pitch.. hey I can see stuff on fbcon now.. it looks like text.. just a bit garbled
David Airlie [Wed, 11 Apr 2007 07:13:57 +0000 (17:13 +1000)]
fixup framebuffer depth
David Airlie [Wed, 11 Apr 2007 07:13:45 +0000 (17:13 +1000)]
add support for setting a framebuffer depth
Dave Airlie [Wed, 11 Apr 2007 06:34:40 +0000 (16:34 +1000)]
add copyright statement
Dave Airlie [Wed, 11 Apr 2007 06:33:03 +0000 (16:33 +1000)]
add initial drm_fb framebuffer
So far I can load fbcon, once I use my miniglx to add a framebuffer.
fbcon doesn't show anything on screen but baby steps and all that.
Dave Airlie [Wed, 11 Apr 2007 04:43:02 +0000 (14:43 +1000)]
comment out unworkable code
Dave Airlie [Wed, 11 Apr 2007 04:34:43 +0000 (14:34 +1000)]
only init at driver load
Dave Airlie [Wed, 11 Apr 2007 04:34:22 +0000 (14:34 +1000)]
only bo finish at driver unload
Dave Airlie [Wed, 11 Apr 2007 04:04:18 +0000 (14:04 +1000)]
use the baseaddr at least
root [Wed, 11 Apr 2007 03:40:50 +0000 (13:40 +1000)]
Revert "Remove some delays from Intel i2c code, we'll need a more comprehensive fix"
This reverts commit
c0336989884e75bcd05284257e884754bb5f85b6.
this break SDVO
David Airlie [Wed, 11 Apr 2007 03:19:30 +0000 (13:19 +1000)]
add an fb count + id get to the get resources code path
David Airlie [Wed, 11 Apr 2007 03:18:49 +0000 (13:18 +1000)]
use fb pitch and fix up some whitespace
Jesse Barnes [Wed, 11 Apr 2007 00:58:30 +0000 (17:58 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
David Airlie [Tue, 10 Apr 2007 23:56:09 +0000 (09:56 +1000)]
fixup calculation to make sdvo work
Matthieu Castet [Tue, 10 Apr 2007 21:19:29 +0000 (23:19 +0200)]
nouveau: nv10 per channel init from ddx
Jesse Barnes [Tue, 10 Apr 2007 17:45:55 +0000 (10:45 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
Jesse Barnes [Tue, 10 Apr 2007 17:31:58 +0000 (10:31 -0700)]
Export drm_setup for use by new driver init code.
Jesse Barnes [Tue, 10 Apr 2007 17:31:10 +0000 (10:31 -0700)]
Move i915 init code to new file, i915_init.c, and create a new high level
init routine that runs at driver load time.
Jesse Barnes [Tue, 10 Apr 2007 16:51:17 +0000 (09:51 -0700)]
Add save/restore state for LVDS code, along with a few other LVDS related
items to i915 private structure.
Jesse Barnes [Tue, 10 Apr 2007 16:49:02 +0000 (09:49 -0700)]
Remove some debug #if 0 codes and add a reminder to check locking around
output enumeration stuff.
Jesse Barnes [Tue, 10 Apr 2007 16:48:20 +0000 (09:48 -0700)]
Remove some delays from Intel i2c code, we'll need a more comprehensive fix
in the Linux i2c layer to make DDC reliable on old monitors.
Jesse Barnes [Tue, 10 Apr 2007 16:47:37 +0000 (09:47 -0700)]
Finish bringing in LVDS code, re-add to Makefile. Needed other changes too:
- move EDID structures to drm_edid.h
- add EDID info structure to drm_output
- add a few routines to intel_display for getting current mode info
- add some prototypes to intel_drv.h and drm_crtc.h
David Airlie [Tue, 10 Apr 2007 06:49:36 +0000 (16:49 +1000)]
add sdvo debugging output
David Airlie [Tue, 10 Apr 2007 06:32:17 +0000 (16:32 +1000)]
fixup sarea writes for set pipe base and dpms
David Airlie [Tue, 10 Apr 2007 06:26:07 +0000 (16:26 +1000)]
fixup true/false in intel_sdvo.c
David Airlie [Tue, 10 Apr 2007 06:25:52 +0000 (16:25 +1000)]
re-tab and fixup the i915GM get core clock function to actually work
David Airlie [Tue, 10 Apr 2007 06:25:31 +0000 (16:25 +1000)]
export output name to userspace
David Airlie [Tue, 10 Apr 2007 05:20:50 +0000 (15:20 +1000)]
set the base address of the CRTC correctly
David Airlie [Tue, 10 Apr 2007 04:49:49 +0000 (14:49 +1000)]
fixup numerous issues with adding framebuffer support
This still isn't perfect but it fixes a few oopses and cleans up
some of the tabs and bugs in the original fb limit code
Jesse Barnes [Tue, 10 Apr 2007 03:46:38 +0000 (20:46 -0700)]
Slam in most of X.Org's i830_lvds (not quite done yet so removed from Makefile.kernel too).
David Airlie [Tue, 10 Apr 2007 01:51:31 +0000 (11:51 +1000)]
mode: fixup problems with framebuffer add function
Dave Airlie [Tue, 10 Apr 2007 08:56:02 +0000 (18:56 +1000)]
make crtc_config be named mode_config
X.org calls this crtc_config but this is a bad name and will confuse ppl later
(and me now :-)
Jakob Bornecrantz [Tue, 10 Apr 2007 08:44:47 +0000 (18:44 +1000)]
add addfb/rmfb ioctls
Originally from Jakob, cleaned up by airlied.
Oliver McFadden [Mon, 9 Apr 2007 23:23:40 +0000 (23:23 +0000)]
rs480: Renamed some unknown registers. See dri-devel list.
Jesse Barnes [Mon, 9 Apr 2007 15:52:53 +0000 (08:52 -0700)]
Fix refresh calculation (mistakenly removed 1000 factor needed for integer calulations, fixed mode printout debugging routine instead).
Ben Skeggs [Mon, 9 Apr 2007 13:20:26 +0000 (23:20 +1000)]
nouveau: NV46 support
Dave Airlie [Mon, 9 Apr 2007 12:00:34 +0000 (22:00 +1000)]
radeon: bump version for IGPGART support
Dave Airlie [Mon, 9 Apr 2007 11:52:59 +0000 (21:52 +1000)]
radeon: add support for reverse engineered xpress200m
The IGPGART setup code was traced using mmio-trace on fglrx by myself
and Phillip Ezolt <phillipezolt@gmail.com> on dri-devel.
This code doesn't let the 3D driver work properly as the card has no
vertex shader support.
Thanks to Matthew Garrett + Ubuntu for providing me some hardware to do this
work on.
Jesse Barnes [Sun, 8 Apr 2007 02:26:55 +0000 (19:26 -0700)]
remove a printk to make things less verbose
Jesse Barnes [Sun, 8 Apr 2007 02:25:25 +0000 (19:25 -0700)]
just codingstyle cleanups
Jesse Barnes [Sun, 8 Apr 2007 02:24:53 +0000 (19:24 -0700)]
document drm_mode_duplicate and fix vrefresh calculation (off by 1000 error)
Jesse Barnes [Sun, 8 Apr 2007 02:24:09 +0000 (19:24 -0700)]
various cleanups to EDID code:
- pull in FB DDC code (we'll have to rewrite it anyway it appears)
- add comments
- note a few FIXMEs
- make it less quiet, and more informative when it actually does print
Jesse Barnes [Sun, 8 Apr 2007 02:22:39 +0000 (19:22 -0700)]
make drmP.h include drm_crtc.h for CRTC related stuff.
fixup drm_crtc.c so it matches VGA and other outputs properly.
make drm_crtc.c less verbose.
add function declarations in drm_crtc.h for other files.
Dave Airlie [Fri, 6 Apr 2007 21:21:05 +0000 (07:21 +1000)]
fixup install target, not sure what I was smokin...
Dave Airlie [Sun, 1 Apr 2007 06:30:52 +0000 (16:30 +1000)]
i915: use breadcrumb macro everywhere
Eric Anholt [Thu, 5 Apr 2007 18:34:11 +0000 (11:34 -0700)]
Add required permission notices for code copied from X.Org source.
Ben Skeggs [Thu, 5 Apr 2007 17:24:39 +0000 (03:24 +1000)]
nouveau: make a note about a bit that breaks some cards
Ben Skeggs [Thu, 5 Apr 2007 17:03:59 +0000 (03:03 +1000)]
nouveau: Power up all card units by default on startup.
Jesse Barnes [Thu, 5 Apr 2007 16:27:12 +0000 (09:27 -0700)]
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Jesse Barnes [Thu, 5 Apr 2007 16:21:31 +0000 (09:21 -0700)]
Add copyrights before I forget
Dave Airlie [Thu, 5 Apr 2007 10:20:33 +0000 (20:20 +1000)]
add back compat for bool
Dave Airlie [Thu, 5 Apr 2007 08:01:02 +0000 (18:01 +1000)]
checkpoint commit: implement SetCrtc so modes can in theory be set from user
This hooks up the userspace mode set it "seems" to work.
Dave Airlie [Thu, 5 Apr 2007 07:06:42 +0000 (17:06 +1000)]
checkpoint commit: added getresources, crtc and output
This adds the user interfaces from Jakob and hooks them up for 3 ioctls
GetResources, GetCrtc and GetOutput.
I've made the ids for everything fbs, crtcs, outputs and modes go via idr as
per krh's suggestion on irc as it make the code nice and consistent.
Dave Airlie [Thu, 5 Apr 2007 03:34:50 +0000 (13:34 +1000)]
initial userspace interface to get modes
Dave Airlie [Thu, 5 Apr 2007 01:21:06 +0000 (11:21 +1000)]
Initial import of modesetting for intel driver in DRM
Dave Airlie [Thu, 5 Apr 2007 01:20:23 +0000 (11:20 +1000)]
borrow edid.h from fb directory