OSDN Git Service
Maarten Maathuis [Sun, 22 Jun 2008 16:47:51 +0000 (18:47 +0200)]
NV50: A few minor added safeties + cleanup.
Maarten Maathuis [Sun, 22 Jun 2008 15:01:30 +0000 (17:01 +0200)]
Undo something i didn't want to change.
- I made it consistent with recent kernel fb code (maybe this is older bugged code?)
- Still i don't use this and i should leave it to others.
Maarten Maathuis [Sun, 22 Jun 2008 14:29:00 +0000 (16:29 +0200)]
NV50: Initial import of kernel modesetting.
Jesse Barnes [Wed, 18 Jun 2008 20:57:39 +0000 (13:57 -0700)]
i915: switch back to fbcon on panic
Normally when X is running, panic messages will be invisible and the machine
will just appear to hard hang. This patch adds support for switching back to
the fbcon framebuffer on panic (through the use of a panic notifier
registration) so we can see what happened.
Note that in order to be really useful, X will have to run its VT in something
other than KD_GRAPHICS mode. Also, not all kernel errors result in panics,
some go through BUG() which may trigger another type of event, not resulting in
a switch.
Jesse Barnes [Mon, 9 Jun 2008 23:20:45 +0000 (16:20 -0700)]
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).
Keith Packard [Fri, 6 Jun 2008 20:54:38 +0000 (21:54 +0100)]
[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.
Dave Airlie [Fri, 6 Jun 2008 06:24:27 +0000 (16:24 +1000)]
drm: fix up fb resize again
Dave Airlie [Fri, 6 Jun 2008 05:38:53 +0000 (15:38 +1000)]
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
Dave Airlie [Fri, 6 Jun 2008 05:21:57 +0000 (15:21 +1000)]
Merge remote branch 'origin/modesetting-101' into modesetting-101-fb
Dave Airlie [Fri, 6 Jun 2008 05:21:22 +0000 (15:21 +1000)]
intelfb: add multi fb paths
Dave Airlie [Fri, 6 Jun 2008 04:55:03 +0000 (14:55 +1000)]
intelfb: remove duplicate define
Dave Airlie [Fri, 6 Jun 2008 04:53:34 +0000 (14:53 +1000)]
intelfb: admit fbdev is crap and punt on trying to resize to a larger fbdev.
Dave Airlie [Fri, 6 Jun 2008 02:02:51 +0000 (12:02 +1000)]
intelfb: move mode sets into the intel crtcs
better place to store them.
Dave Airlie [Fri, 6 Jun 2008 00:38:35 +0000 (10:38 +1000)]
drm/intel: make hotplug just be an event
Dave Airlie [Fri, 6 Jun 2008 00:31:36 +0000 (10:31 +1000)]
intel: if no spare crtc exists don't just take one.
Jesse Barnes [Thu, 5 Jun 2008 22:58:43 +0000 (15:58 -0700)]
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).
Dave Airlie [Thu, 5 Jun 2008 06:32:41 +0000 (16:32 +1000)]
drm/modeset: add more debugging and fixup some fb enable/disabe bits
Dave Airlie [Thu, 5 Jun 2008 05:55:03 +0000 (15:55 +1000)]
drm/modesetting: more fb interface cleanups
Dave Airlie [Thu, 5 Jun 2008 05:21:07 +0000 (15:21 +1000)]
drm/modesetting: attempt to make fb code more sane
Dave Airlie [Thu, 5 Jun 2008 03:40:08 +0000 (13:40 +1000)]
drm: modesetting unify the hotplug init paths a lot.
remove fb callbacks, just probe into the driver to sort it out
Dave Airlie [Thu, 5 Jun 2008 01:43:48 +0000 (11:43 +1000)]
modesetting: fix fb clearing up
Dave Airlie [Thu, 5 Jun 2008 01:24:57 +0000 (11:24 +1000)]
modesetting: use surface width height for buffer allocs
Dave Airlie [Thu, 5 Jun 2008 01:20:52 +0000 (11:20 +1000)]
modesetting: add surface width/heights
Dave Airlie [Thu, 5 Jun 2008 01:11:22 +0000 (11:11 +1000)]
modesetting: initial attempt at debonging fb
Jesse Barnes [Wed, 4 Jun 2008 19:50:03 +0000 (12:50 -0700)]
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.
Jesse Barnes [Wed, 4 Jun 2008 16:38:44 +0000 (09:38 -0700)]
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.
Dave Airlie [Wed, 4 Jun 2008 05:17:13 +0000 (15:17 +1000)]
drm: fix hotplug oops
Dave Airlie [Wed, 4 Jun 2008 05:17:00 +0000 (15:17 +1000)]
intel: report a known connector
Dave Airlie [Wed, 4 Jun 2008 03:53:33 +0000 (13:53 +1000)]
libdrm: shouldn't rely on this
Dave Airlie [Wed, 4 Jun 2008 03:49:43 +0000 (13:49 +1000)]
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
Dave Airlie [Wed, 4 Jun 2008 03:16:49 +0000 (13:16 +1000)]
drm/sysfs: don't try an unregister if not registered
Dave Airlie [Wed, 4 Jun 2008 03:09:20 +0000 (13:09 +1000)]
intel: use kzalloc
Dave Airlie [Wed, 4 Jun 2008 03:09:05 +0000 (13:09 +1000)]
drm/modesetting: bo not used anymore
Dave Airlie [Wed, 4 Jun 2008 03:03:23 +0000 (13:03 +1000)]
drm: remove sysfs in driver for now.. should probably be in helper
Dave Airlie [Wed, 4 Jun 2008 03:00:31 +0000 (13:00 +1000)]
drm/modesetting: pass object handle to driver !bo
Dave Airlie [Wed, 4 Jun 2008 01:59:28 +0000 (11:59 +1000)]
drm/modesetting: overhaul the fb create/delete.
Move TTM code into the driver
Dave Airlie [Wed, 4 Jun 2008 00:34:34 +0000 (10:34 +1000)]
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.
Alan Hourihane [Mon, 2 Jun 2008 09:44:29 +0000 (10:44 +0100)]
more checks for NULL encoder so we don't segfault.
Alan Hourihane [Mon, 2 Jun 2008 09:03:28 +0000 (10:03 +0100)]
Fix warnings
Dave Airlie [Mon, 2 Jun 2008 06:45:44 +0000 (16:45 +1000)]
drm: initial mode object groups.
This creates a default group attached to the legacy drm minor nodes.
It covers all the objects in the set. make set resources only return
objects for this set. Need to fix up other functions to only work on
objects in their allowed set.
Dave Airlie [Mon, 2 Jun 2008 06:19:21 +0000 (16:19 +1000)]
drm/modesetting: redo object handles around a core object.
handle crtc/encoders/connectors/fb/mode/property/blob using this system.
Dave Airlie [Mon, 2 Jun 2008 04:33:42 +0000 (14:33 +1000)]
drm: only report framebuffers available on this fd.
Not 100% sure this is a good idea, but I think I'd rather things
communicate with bo handles not fb ids.
Dave Airlie [Mon, 2 Jun 2008 04:04:41 +0000 (14:04 +1000)]
drm: add functions to get/set gamma ramps
Dave Airlie [Mon, 2 Jun 2008 02:58:10 +0000 (12:58 +1000)]
Merge branch 'modesetting-101-encoders' into modesetting-101
Dave Airlie [Mon, 2 Jun 2008 02:57:09 +0000 (12:57 +1000)]
drm: fixup encoder picking in set_config stage
Dave Airlie [Mon, 2 Jun 2008 01:44:35 +0000 (11:44 +1000)]
drm/modesetting: add best encoder finding for modesetting
This asks the driver to suggest the best encoder for the connector
during the pick crtcs stage.
Need to also do this during mode setting stages
Dave Airlie [Mon, 2 Jun 2008 01:12:28 +0000 (11:12 +1000)]
drm/modesetting: move some connector functions to helper.
Migrated the output mode collection into the helper.
Dave Airlie [Mon, 2 Jun 2008 00:41:12 +0000 (10:41 +1000)]
drm: fixup some interfaces so test code works again
Dave Airlie [Mon, 2 Jun 2008 00:05:54 +0000 (10:05 +1000)]
drm/modesetting: another re-org of some internals.
Move dpms into the helper functions.
Move crtc into the encoder.
Move disable unused functions into the helper.
Kristian Høgsberg [Fri, 30 May 2008 18:23:04 +0000 (14:23 -0400)]
Fix ivch i2c read function to use the "special" i2c format.
Dave Airlie [Fri, 30 May 2008 05:32:58 +0000 (15:32 +1000)]
drm: switch possible crtc/clones over to encoders
Dave Airlie [Fri, 30 May 2008 05:18:07 +0000 (15:18 +1000)]
modesetting: drop crtcs/clones from the connectors
Dave Airlie [Fri, 30 May 2008 05:03:12 +0000 (15:03 +1000)]
modesetting: the great renaming.
Okay we have crtc, encoder and connectors.
No more outputs exposed beyond driver internals
I've broken intel tv connector stuff.
Really for TV we should have one TV connector, with a sub property for the
type of signal been driven over it
Dave Airlie [Fri, 30 May 2008 03:57:27 +0000 (13:57 +1000)]
drm: attach an encoder.
Time to do some renaming on the connectors I think
Dave Airlie [Fri, 30 May 2008 03:49:39 +0000 (13:49 +1000)]
drm: fix a couple of bugs in the encoder return to userspace
Dave Airlie [Fri, 30 May 2008 03:31:16 +0000 (13:31 +1000)]
drm: add encoder attach/detach
Dave Airlie [Fri, 30 May 2008 03:22:51 +0000 (13:22 +1000)]
tests: add basic encoder reading to test
Dave Airlie [Fri, 30 May 2008 02:29:45 +0000 (12:29 +1000)]
drm: add encoder free function
Dave Airlie [Fri, 30 May 2008 02:24:19 +0000 (12:24 +1000)]
drm: init the encoder list/count
Dave Airlie [Fri, 30 May 2008 02:20:36 +0000 (12:20 +1000)]
drm: add red hat copyright.
Dave Airlie [Fri, 30 May 2008 02:19:13 +0000 (12:19 +1000)]
drm: add encoder ids to the output handling
Dave Airlie [Fri, 30 May 2008 02:14:44 +0000 (12:14 +1000)]
drm: add more encoder interfaces
Dave Airlie [Fri, 30 May 2008 02:10:01 +0000 (12:10 +1000)]
libdrm: add encoder retrival
Dave Airlie [Fri, 30 May 2008 02:03:36 +0000 (12:03 +1000)]
drm: add encoder / get encoder to the modesetting resources interface
Dave Airlie [Fri, 30 May 2008 01:48:41 +0000 (11:48 +1000)]
drm: remove unused init func from outputs
Dave Airlie [Fri, 30 May 2008 01:47:57 +0000 (11:47 +1000)]
drm/modesetting: add initial encoder structures and setup functions
Dave Airlie [Fri, 30 May 2008 01:25:41 +0000 (11:25 +1000)]
modesetting: reorganise out crtc/outputs are allocated.
Use subclassing from the drivers to allocate the objects. This saves
two objects being allocated for each crtc/output and generally makes
exit paths cleaner.
Dave Airlie [Thu, 29 May 2008 04:02:14 +0000 (14:02 +1000)]
modesetting: reorganise code into core and helper functions.
This splits a lot of the core modesetting code out into a file of
helper functions, that are only called from themselves and/or the driver.
The driver gets called into more often or can call these functions from itself
if it is a helper using driver.
I've broken framebuffer resize doing this but I didn't like the API for that
in any case.
Dave Airlie [Thu, 29 May 2008 03:58:26 +0000 (13:58 +1000)]
modeset: disable radeon ms by default
as I'm going to break it.
Alan Hourihane [Wed, 28 May 2008 20:01:18 +0000 (21:01 +0100)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Jesse Barnes [Wed, 28 May 2008 15:24:42 +0000 (08:24 -0700)]
i915: unmap BIOS when we're done with it
At the moment, we only read it at startup time, so we can just unmap it there
when we're done.
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.
Jesse Barnes [Sat, 24 May 2008 01:42:47 +0000 (18:42 -0700)]
i915: do a better job of parsing VBIOS data
Add code to get panel modes from the VBIOS if present and check whether certain
outputs exist. Should make our display detection code a little more robust.
Jesse Barnes [Sat, 24 May 2008 01:41:58 +0000 (18:41 -0700)]
drm_mode_debug_printmodeline doesn't need struct drm_device *
Makes printing modelines from some routines easier.
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
Hong Liu [Mon, 19 May 2008 09:06:40 +0000 (17:06 +0800)]
i915: check dummy page before freeing
The dummy read page will point to NULL if drm_bo_driver_init failed at
firstopen (modeset is not enabled), and will cause kernel oops at
subsequent drm_lastclose call, so be sure to check it.
Hong Liu [Mon, 19 May 2008 09:06:38 +0000 (17:06 +0800)]
i915: init bo mm at driver init only when modeset=1
To avoid bo memory manager being inited twice, it will be called
at firstopen when modeset is not enabled.
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.
Jesse Barnes [Tue, 13 May 2008 21:47:17 +0000 (14:47 -0700)]
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Jesse Barnes [Tue, 13 May 2008 21:44:17 +0000 (14:44 -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.
Jakob Bornecrantz [Tue, 13 May 2008 07:24:47 +0000 (09:24 +0200)]
i915: execbuf now works without i915_dma_init being called
Jesse Barnes [Mon, 12 May 2008 22:47:19 +0000 (15:47 -0700)]
i915: TV hotplug fixes
In order to avoid recursive ->detect->interrupt->detect->interrupt->...
we need to disable TV hotplug interrupts in
intel_tv.c:intel_tv_detect_type. We also need to enable the TV interrupt
detection and hotplug sequence properly in i915_irq.c.