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.
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
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.
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).
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.
Eric Anholt [Thu, 5 Apr 2007 18:34:11 +0000 (11:34 -0700)]
Add required permission notices for code copied from X.Org source.
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
Dave Airlie [Thu, 5 Apr 2007 01:18:00 +0000 (11:18 +1000)]
add an install target to the drm modules makefile
Thomas Hellstrom [Tue, 3 Apr 2007 08:54:23 +0000 (10:54 +0200)]
Fix user object reference when caller is not object creator.
(Reported by Dave Airlie).
Thomas Hellstrom [Tue, 3 Apr 2007 08:24:06 +0000 (10:24 +0200)]
Add a fence flush event to each fence-signaled check when lazy-waiting
to make sure we don't lose any sequence numbers if, for some reason,
they don't generate an IRQ.
Thomas Hellstrom [Tue, 3 Apr 2007 08:21:41 +0000 (10:21 +0200)]
Make sure we ack irqs before we read a breadcrumb so that
breadcrumb updates that occur _AFTER_ we've read the breadcrumb really
generates a new IRQ.
Thomas Hellstrom [Fri, 30 Mar 2007 12:14:26 +0000 (14:14 +0200)]
Evicted no-move buffers can get lost if they end up in another
memory type than local.
Thomas Hellstrom [Fri, 30 Mar 2007 10:23:22 +0000 (12:23 +0200)]
Fix an oops when trying to clean a not yet initialized memory type.
Thomas Hellstrom [Thu, 29 Mar 2007 19:33:41 +0000 (21:33 +0200)]
Make sure CMA (Can't map aperture) pages are mapped uncached.
(Should really make this write-combined using PATs, at some point).
Oliver McFadden [Mon, 2 Apr 2007 19:45:10 +0000 (19:45 +0000)]
r300: Synchronize the register header file again.
It's a good idea to keep these synchronized; even though the DRM doesn't use all
the defines, maintaining two different copies is prone to errors when the diff
gets bigger.
Matthieu Castet [Sun, 1 Apr 2007 12:31:41 +0000 (14:31 +0200)]
nouveau: fix usage of PGRAPH_CTX_CONTROL on nv20+
http://gitweb.freedesktop.org/?p=mesa/drm.git;a=commitdiff;h=
17985f07d68322519919a7f629a6d2d9bf3916ed could have broken some nvxx_graph code : it rename NV03_PGRAPH_CTX_CONTROL to NV10_PGRAPH_CTX_CONTROL, but forgot to update it in nvxx_graph file.
Also when migrating init stuff in http://gitweb.freedesktop.org/?p=mesa/drm.git;a=commitdiff;h=
674cefd4fe4b537a20a10edcb4ec5df55facca8e, NV04_PGRAPH_CTX_CONTROL is used everywhere but the old ddx code use NV_PGRAPH_CTX_CONTROL_NV04 or NV_PGRAPH_CTX_CONTROL.
Matthieu Castet [Sun, 1 Apr 2007 12:21:29 +0000 (14:21 +0200)]
nouveau : nv10 ctx switch fix
restoring NV10_PGRAPH_CTX_SWITCH1 now works
Matthieu Castet [Sat, 31 Mar 2007 22:44:11 +0000 (00:44 +0200)]
nouveau : set the correct PGRAPH_CTX_CONTROL register
"
5a072f32 (Stephane Marchesin 2007-02-03 04:57:06 +0100" broke nv10 ctx switch by setting wrong PGRAPH_CTX_CONTROL reg
Eric Anholt [Fri, 30 Mar 2007 19:56:34 +0000 (12:56 -0700)]
Merge branch 'crestline-qa', adding support for the 965GM chipset.
Eric Anholt [Fri, 30 Mar 2007 19:56:08 +0000 (12:56 -0700)]
Merge branch 'origin'
Dave Airlie [Wed, 28 Mar 2007 23:25:04 +0000 (09:25 +1000)]
drm/bo: avoid oops if the memory manager for this type isn't initialised
Stephane Marchesin [Wed, 28 Mar 2007 22:54:18 +0000 (00:54 +0200)]
nouveau: fix nv04 context switches.
Dave Airlie [Tue, 27 Mar 2007 08:01:31 +0000 (18:01 +1000)]
drm/i915: set the bo up at firstopen time not after DMA init
This is required to use TTM to allocate the ring buffer.
Dave Airlie [Tue, 27 Mar 2007 07:59:30 +0000 (17:59 +1000)]
drm/ttm: make sure dev_mapping is set-up for the first opener of the drm
This was causing an oops in my miniglx code to try and use a TTM-only setup.
Nian Wu [Tue, 27 Mar 2007 04:53:13 +0000 (12:53 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Ben Skeggs [Mon, 26 Mar 2007 09:43:48 +0000 (19:43 +1000)]
nouveau: move card initialisation into the drm
The PGRAPH init for the various cards will need cleaning up at some point,
a lot of the values written there are per-context state left over from the
all the hardcoding done in the ddx.
It's possible some cards get broken by this commit, let me know.
Tested on: NV5, NV18, NV28, NV35, NV40, NV4E
Nian Wu [Sun, 25 Mar 2007 09:00:36 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Eric Anholt [Sat, 24 Mar 2007 16:39:09 +0000 (09:39 -0700)]
Catch up to new interrupt API, and retire FreeBSD 4.x support here.
Dave Airlie [Sat, 24 Mar 2007 06:58:27 +0000 (17:58 +1100)]
vm: cleanup drm_vm.c along lines of cleanups queued for kernel
Nian Wu [Fri, 23 Mar 2007 09:00:41 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Ben Skeggs [Fri, 23 Mar 2007 03:45:00 +0000 (14:45 +1100)]
nouveau: rework nouveau_fifo_alloc() so the drm can create internal FIFOs
Dave Airlie [Fri, 23 Mar 2007 03:56:39 +0000 (14:56 +1100)]
cleanup more whitespace from ttm merge
Dave Airlie [Fri, 23 Mar 2007 03:56:28 +0000 (14:56 +1100)]
drm: remove second spinlock init for tasklet lock
Ben Skeggs [Fri, 23 Mar 2007 02:45:29 +0000 (13:45 +1100)]
nouveau: remove unused cruft
Nian Wu [Wed, 21 Mar 2007 09:00:43 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Ben Skeggs [Wed, 21 Mar 2007 06:57:47 +0000 (17:57 +1100)]
nouveau: support multiple channels per client (breaks drm interface)
Nian Wu [Tue, 20 Mar 2007 05:11:02 +0000 (13:11 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Dave Airlie [Mon, 19 Mar 2007 23:13:58 +0000 (10:13 +1100)]
rename badly named define
Alan Hourihane [Mon, 19 Mar 2007 11:40:52 +0000 (11:40 +0000)]
remove i830 reference