[prev in list] [next in list] [prev in thread] [next in thread] 

List:       dri-patches
Subject:    drm: Changes to 'modesetting-props'
From:       airlied () freedesktop ! org (Dave Airlie)
Date:       2007-11-26 7:32:48
Message-ID: 20071126073249.A0EA613000C () annarchy ! freedesktop ! org
[Download RAW message or body]

New branch 'modesetting-props' available with the following commits:
commit 8f77d20c9ca7794b1e31677d5ecec726079a245c
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Nov 26 18:38:45 2007 +1100

    properties: initial props work

commit f9ac54b0319b273de83a004d6cfdf46a3b9d6ced
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Nov 26 15:06:42 2007 +1100

    fb: make fb interface use user mode attach/detach for adding modes

commit 362f4283205a01b2a60a49838721e9fff9ae1a4c
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Nov 26 14:28:48 2007 +1100

    add _ioctl to the end of two more ioctls

commit 53b4e0cb789151164a0a43b55058319667847aaf
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Nov 26 14:05:49 2007 +1100

    drm: make fb modes use usermode add/remove interface
    
    this stops usermode from getting a mode in the crtc it can't make sense off.

commit a20587e3950f849deb1e723a0b4455a19f7b3fb8
Merge: 8fd8bf599b42b6caa062afabdfce7385d59a7695 \
                5dc5c36e624e5393b5427a159ad34e5fc358cc9f
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Nov 22 17:17:06 2007 +1100

    Merge branch 'origin' into modesetting-101
    
    Conflicts:
    
    	linux-core/drmP.h
    	shared-core/i915_dma.c
    	shared-core/i915_drm.h
    	shared-core/radeon_drv.h

commit 5dc5c36e624e5393b5427a159ad34e5fc358cc9f
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 22 16:10:36 2007 +1000

    drm: major whitespace/coding style realignment with kernel

commit 7bf05708b686ec8822cc1ac7c8b647d4f7110bff
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 22 13:29:17 2007 +1000

    drm: cleanup drm_regman.c coding style

commit 6ff4a70a2be606c02f2b27f92ebdb9a8ec11cbe0
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 22 09:17:34 2007 +1000

    i915: add context handle to superioctl struct
    
    This will be used later for lockless operation.

commit 09e51db77b049765117d3cfa8b59fab0b73e6c93
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Sun Nov 18 19:16:40 2007 +0100

    drm: don't reset to 0 irq_enabled when client open file descriptor

commit 8fd8bf599b42b6caa062afabdfce7385d59a7695
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Sun Nov 18 19:16:40 2007 +0100

    drm: don't reset to 0 irq_enabled when client open file descriptor

commit 3fc3fc082adfa9a7dfe45ea8fb7a9fb6e7019ff6
Author: Eric Anholt <eric@anholt.net>
Date:   Mon Nov 19 08:41:23 2007 -0800

    Fix capitalization of __linux__ define.

commit f29b2a583d6f9d2cd02d58e915a0ca1cdee0919e
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Mon Nov 19 14:37:21 2007 +0100

    drm: fix dead lock in drm_buffer_object_transfer

commit 648b5b582a4fc5a925e7c3010d5a21b24daca572
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Mon Nov 19 14:37:21 2007 +0100

    drm: fix dead lock in drm_buffer_object_transfer

commit a74181ddb2776d7ffbcb10d8103950bd3d88b00d
Author: Robert Noland <rnoland@squirrel.acs.internap.com>
Date:   Tue Nov 13 17:50:46 2007 -0500

    Bug #13233: Fix build on FreeBSD.

commit c12a3a3ce08cbbba118acd8742b2ef990b417eea
Author: Robert Noland <rnoland@squirrel.acs.internap.com>
Date:   Sun Nov 18 22:40:13 2007 -0800

    Bug #13233: Chase move of agp headers on FreeBSD.

commit a90510966e12e20d3c51d224dda607ac9951d039
Author: Dave Airlie <airlied@linux.ie>
Date:   Sun Nov 18 19:25:31 2007 +1000

    radeon: refactor out the fb/agp location read/write.
    
    Add a new get param to get the fb location into userspace. Mesa currently
    hits MMIO to do this, but this isn't always possible.

commit e0ab2034c3d87b9a1bbd86bfccd806793ce7c5b4
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Fri Nov 16 13:58:43 2007 -0800

    Fix connection status ABI
    
    Userspace expects a 1 based enum for connection status so fix up the kernel
    definition.

commit 96e136c4794f9f57e18c1f984a27bbad4b5e1500
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Fri Nov 16 13:57:42 2007 -0800

    Fix typo in copy_to_user calls
    
    We want to copy to card_res->modes + copied, not &card_res->modes + copied.

commit 307fc3c92c85ded23de414b0d1a3d48f934c666d
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Fri Nov 16 15:02:25 2007 +0100

    nouveau: also mention the number of succcessfully copied bios bytes.

commit f2c8d39a0f99dab9d69d927214c8c66aabb70c5c
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Thu Nov 15 22:09:59 2007 -0500

    nouveau: rename

commit a3e627f8d66b5e9e896837824ce76664e5997b27
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Thu Nov 15 20:46:49 2007 -0500

    nouveau: flip buffer into gart.

commit 7ec4ebe95e7eec6625d68ae6300255901b69d5c7
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Thu Nov 15 17:14:03 2007 -0800

    Use user copy routines for writing modes & ids back to userspace
    
    Since the drm_mode_card_res structure contains user pointers, we have to use
    put_user and copy_to_user to write stuff out.  The DRM ioctl wrapper will only
    take care of copying the base drm_mode_card_res struct, not the included
    arrays.

commit baf5d20297577c81d0a6be1abcc45555ed83643c
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Thu Nov 15 20:42:38 2007 +0100

    nouveau: be verbose about PPC bios for now.

commit 9b2a95bc6c9ddbf481d5f6017d9e85ed4def095d
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Thu Nov 15 18:01:26 2007 +0100

    nouveau: revert the nv34 context size change, it was not the culprit after all.

commit 3c998d8fcbb7745fd949347823eca678c6f904b8
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Thu Nov 15 16:00:25 2007 +0100

    nouveau: use get_property instead of of_get_property on pre-2.6.22 kernels.

commit d1b0258b32ad2af99f3aff4f0aedea676d0ff421
Merge: ca499f4d14ae29159f13957f2adc0536c71bf6d4 \
                6206091e5f300616c27dc834922f2976d97f72d4
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Thu Nov 15 10:42:47 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101

commit 6206091e5f300616c27dc834922f2976d97f72d4
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Thu Nov 15 10:38:55 2007 +0100

    mm fixups.

commit ca499f4d14ae29159f13957f2adc0536c71bf6d4
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 19:22:01 2007 +1100

    libdrm: return crtc id to userspace

commit f32688d3d011d631c18d584603d684edd9b9b512
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 18:31:50 2007 +1100

    libdrm: add crtc/output ids to userspace interface

commit 1e8984a3674c89c3b5ef9b6d3747fb75e10774b3
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 18:31:23 2007 +1100

    drm: send correct fb id to userspace

commit 2520d3fd99636e493060d51b1c3287a5faac22bf
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 16:52:04 2007 +1100

    modes: pass type to userspace for preferred showing

commit 7136f55faaf3afefe522ec978a4cbc906dace861
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 16:51:48 2007 +1100

    drm: don't remove mappings added by the driver

commit 12cbe1365b38ae04ad4979123eb5b4e9538ee533
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 16:51:35 2007 +1100

    intel: fixup || vs |

commit d275bb8fb87d8dc23e9a62c5f82627e36c8dc589
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 16:51:15 2007 +1100

    tests: update for new drm interface

commit f0fe478c1587780690edc465d957a762e02acc8a
Merge: e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 \
                62cdc6dbb3545d21bc3a68987d0781f277ae6ee4
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 15:04:19 2007 +1100

    Merge branch 'master' into modesetting-101
    
    Conflicts:
    
    	shared-core/i915_dma.c
    	tests/ttmtest/src/ttmtest.c

commit 62cdc6dbb3545d21bc3a68987d0781f277ae6ee4
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 14:43:23 2007 +1100

    i915: remove excess debug output

commit 2cf7ad0d9b2f265537c7030c6f93b4275cb2d051
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Thu Nov 15 03:43:22 2007 +0100

    nouveau: Copy the PPC bios to RAMIN on init, that lets us do proper output \
detection in user space.

commit 2eee33ace5b647153a7cf20990efd12313cc8472
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Nov 15 13:29:55 2007 +1100

    intel: add flushing for i8xx chipsets.
    
    Add a nut vs hammer style chipset flush for the i8xx chipsets - reenable TTM
    code paths

commit 46235ea4595152d8dd5f016c18c6845a77db30b0
Author: Patrice Mandin <pmandin@caramail.com>
Date:   Wed Nov 14 23:31:59 2007 +0100

    nouveau: nv30: missing ramin init, does it brake other hw?

commit 68cdcda1eaf02353f2ef2d637c6bf1003c849185
Author: Kristian Høgsberg <krh@temari.boston.redhat.com>
Date:   Wed Nov 14 14:28:34 2007 -0500

    Add new shared header file drm_internal.h.
    
    This header file is shared across linux and bsd, but is not installed
    for user space to access.  It's the place to put prototypes and data
    types that aren't platform or chipset specific, but still internal to
    the drm.

commit 448ccf13ba647a4b649857c661ab9c64bce91795
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Wed Nov 14 02:52:55 2007 +0100

    nouveau: adjust the size of the NV34 context. That fixes mobile PPC cards.

commit f3708b4c04b35b03c28b2297c23eb424206747cd
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Tue Nov 13 15:42:08 2007 +0100

    Fix ttmtest.

commit 2d7eb4434f50ab190b530a7ef23e4a361092a33d
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 05:36:20 2007 +1100

    nouveau: Also wait until CACHE1 gets emptied.

commit 7e4bb6099a492b90374565aa574ba65f19ae2ab2
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 05:11:11 2007 +1100

    Revert "nouveau: stub superioctl"
    
    This reverts commit 2370ded79b4176d76cda1ec5f495fd33c2d566ed.
    
    Err.. didn't mean for that to slip in :)

commit eb5487b9ca1d7ce60d5ddc784089d91cf176f439
Merge: 2370ded79b4176d76cda1ec5f495fd33c2d566ed \
                7c1e59fb0c5043d3d369f5feb8e195a6a3da3457
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 05:09:07 2007 +1100

    Merge branch 'fifo-cleanup' into upstream-master

commit 7c1e59fb0c5043d3d369f5feb8e195a6a3da3457
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 04:24:36 2007 +1100

    nouveau: Attempt to wait for channel idle before we destroy it.

commit 53ab6026cfb20bfdf34b245e41af424be62941a8
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 04:15:13 2007 +1100

    nouveau: Use "new" NV40 USER control regs.
    
    Probably entirely pointless, but a simple change in any case.

commit 7246a33dd104903bc9227628270712ea9e6168d8
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 04:05:48 2007 +1100

    nouveau: store user control reg offsets in channel struct

commit d0904f0f2b87c725d3e67060419c445259bd4a5e
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Wed Nov 14 03:27:37 2007 +1100

    nouveau: funcs to determine active channel on PFIFO.

commit 2370ded79b4176d76cda1ec5f495fd33c2d566ed
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Fri Nov 9 04:27:23 2007 +1100

    nouveau: stub superioctl

commit 793cd1dad5e248509a1b09dce7126f236efadb3e
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Nov 10 14:39:36 2007 -0800

    Make sure PLLs are enabled before writing pipe configuration regs
    
    Fix from the X driver.  Make sure the PLLs are enabled and not in VGA mode
    before writing PIPE(A|B)CONF regs to avoid hangs or crashes.

commit c2f80ecf4be09b5b9866d12e3b25cdcf7996b1f4
Author: Patrice Mandin <pmandin@caramail.com>
Date:   Fri Nov 9 18:08:08 2007 +0100

    suspend() and resume() need kernel 2.6.22 or later

commit e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Fri Nov 9 17:28:56 2007 +0100

    drm: check edid data, so we deal well with broken driver.

commit ffb89d4c3b6650551aaab06076896540a78faddf
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Fri Nov 9 15:47:24 2007 +0100

    drm: split edid handling in get_edid & add_edid_mode
    
    This way driver can get_edid in output status detection
    (using all workaround which are in get_edid) and then provide
    this edid data in get_mode callback of output.

commit d983ed90cb9de559271817e04bddc8b40fc16a0d
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Nov 9 11:30:50 2007 +1000

    i915: cleanup pageflip derefs sarea even if no sarea exists

commit e9805de5c736f899dea5220ab8b521cc69c9eca6
Merge: c07dd80269fad45fdad61de0a43fe3d15cd1a119 \
                c20370e0969e41bbf735daf932e37ac5ec959213
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Wed Nov 7 18:10:46 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101  
    Conflicts:
    
    	shared-core/i915_dma.c

commit c20370e0969e41bbf735daf932e37ac5ec959213
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Wed Nov 7 18:07:10 2007 +0100

    Don't overwrite TTM page flags.

commit 47497abc1e38081564db429329a3ba16198c1521
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date:   Wed Nov 7 23:10:24 2007 +1000

    i915: oops disable TTM is backwards

commit c07dd80269fad45fdad61de0a43fe3d15cd1a119
Merge: 5ce43a346cb9b2a6f6f31f1f750db75d5628c15b \
                40fb079aebae4277813e6a32e2e93c81dc0038e3
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Tue Nov 6 10:01:52 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101  
    Conflicts:
    
    	linux-core/Makefile.kernel
    	shared-core/i915_dma.c
    	shared-core/i915_drv.h
    	shared-core/i915_irq.c

commit 40fb079aebae4277813e6a32e2e93c81dc0038e3
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Tue Nov 6 09:47:57 2007 +0100

    Avoid buffers not ending up on a list in some cases.

commit 20eecf2b884193d865419312290b2bb9f94ebf37
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Tue Nov 6 09:36:25 2007 +0100

    Add missing drm_regman.c file.

commit 9280076b6710e8fcc9594b7f8db87176d3e92097
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Nov 6 18:13:46 2007 +1100

    i915: disable TTM on 8xx chips for now until flushing is solved

commit 349eebd567246e3c2d47734772e882ae50723cb9
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Nov 6 18:00:10 2007 +1100

    i915: compat code doesn't work in i8xx hw.

commit 81b7f9b71c45fc621e0b5770062aedf5ae5e57ee
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date:   Tue Nov 6 17:59:14 2007 +1100

    [PATCH] i915: fix missing G33 detect in IS_I9XX
    
    G33 detect seems missing with Jesse's suspend/resume patch.

commit b437c8ca0fe62a43661a31a3010284926d20f209
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Nov 6 12:12:10 2007 +1000

    drm/agp: kernel style fixes

commit 9493ce6ca39b65b9f955943a043c0741a5c59f7c
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Nov 6 11:32:58 2007 +1000

    i915: cleanup most of the whitespace

commit 5ce43a346cb9b2a6f6f31f1f750db75d5628c15b
Merge: 1b91113957e731d264d1e5d49326597f3b78e96f \
                427cc561b3dfbd504472e284e5fc16b63acd1816
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Mon Nov 5 13:46:06 2007 +0100

    Merge branch 'master' into modesetting-101
    
    Conflicts:
    
    	linux-core/drm_bufs.c
    	shared-core/i915_dma.c
    	shared-core/i915_drv.h
    	shared-core/i915_irq.c

commit 427cc561b3dfbd504472e284e5fc16b63acd1816
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Mon Nov 5 13:22:00 2007 +0100

    Export a symbol.

commit 44ad6f409d6d08163d26e20d41b1601b2fde53d7
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Mon Nov 5 13:20:16 2007 +0100

    Fix a user-buffer check.

commit 1b91113957e731d264d1e5d49326597f3b78e96f
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:06:37 2007 +0000

    remove unused define

commit 306bb12603ad724f50fb6ce212a090ea7ea78013
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:05:01 2007 +0000

    remove duplicate and obsolete ioctl statements

commit 71385d6f75bb3b551e2f8d9f74a4438f0f3da9df
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:03:26 2007 +0000

    add missing lock

commit d0956339e322238d2af5d63a2e65405ca3b8c4f8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:02:46 2007 +0000

    Use _size

commit 0bee83a8c8bca817459a0ee9caa6e13f3f1aa281
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:00:43 2007 +0000

    Pass pointer to drmModeRmMode.

commit 5e86f67a34c50ec49e1d7b3b834d1695ebf5d4c8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Nov 5 10:00:11 2007 +0000

    pass pointer for drmModeRmFB

commit 82ffcbbd628fc8c07d3becbbcb86a54214e78110
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 19:14:23 2007 +1000

    drm: more kernel coding style cleanups

commit 6ee5412da0cc7516472235805482b8632cb374ef
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 19:09:18 2007 +1000

    drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c

commit 7ad38907075852e347b5b4432c96d199387f5ce8
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 19:05:32 2007 +1000

    drm/ttm: kernel coding style for bo.c and objects.h

commit 3b43ed51cca4cf4b03d74ee403b8a72b919f87c8
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 18:56:46 2007 +1000

    drm: fix the the typo

commit 78fe88baee9271ceaf6187019633e4cccfebb776
Author: Li Zefan <lizf@cn.fujitsu.com>
Date:   Mon Nov 5 18:48:27 2007 +1000

    drm: fix memset size error
    
    The size passing to memset is wrong.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

commit 921bd07c242355d187018f36d74bd95fd0d02b17
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 12:56:55 2007 +1000

    drm: update kernel generator script using v4l script

commit 7f6bf84c238a1859ffd409c0ef1f1ca7eb5e6e72
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 12:42:22 2007 +1000

    drm: remove lots of spurious whitespace.
    
    Kernel "cleanfile" script run.

commit 3664de73955aafe912318c91717ff9ecc1027af2
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Nov 5 12:10:52 2007 +1000

    drm: move some of the OS stuff into the OS header

commit d81bc78a04f3b72bdf2600158cea084223a3a682
Author: Pekka Paalanen <pq@iki.fi>
Date:   Thu Oct 25 22:34:45 2007 +0300

    nouveau: more nv20_graph_init.
    
    This patch is originally from malc0_, but since it used some NV40_*
    regs, I edited them into hex values with a comment.
    This seems to correspond quite well with my own mmio-trace,
    for the parts I cared to check.

commit 5092865601ccaae1409abfa083147276916d6c25
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 05:42:08 2007 +1100

    nouveau: Use a sw method instead of notify interrupt to signal fence completion.

commit 9096d50df7ac99f44d043556420f9f9f54e59b3f
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 05:15:32 2007 +1100

    nouveau: disable m2mf buffer move for the moment

commit 6abbbb2f4f5b6b280077a6c88bb643507c8ec8fa
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 04:44:40 2007 +1100

    Fill fence sequence after emit ioctl.

commit 0a2ab1a9003f132195fe70c145a78b4079a3fb7f
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 03:53:46 2007 +1100

    nouveau: cleanups

commit c1008104adcd45faad2c6c1a2192c86447f3d9a3
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 02:35:56 2007 +1100

    nouveau: only pass annoying messages if irq isn't handled fully.

commit dfa449cf9a7ce5de9cbd571f604ae7c3c778dabd
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 02:32:46 2007 +1100

    nouveau: vram is bar1

commit 173a5be28f4ed59e27d7a719f62bc275959b5b70
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 02:20:35 2007 +1100

    nouveau: hook up an inital fence irq handler

commit 9a999e57af4a3f5a863c21154dd3b9618888c1f7
Author: Ben Skeggs <skeggsb@gmail.com>
Date:   Mon Nov 5 00:01:38 2007 +1100

    nouveau: crappy ttm mm init, disabled for now.

commit a2e8e294d8e5d7cf179cb562745c1b613ff60e52
Author: Dave Airlie <airlied@linux.ie>
Date:   Sun Nov 4 11:01:27 2007 +1100

    drm: fix oops since user objects..

commit 998d120a47cab85e985b24932fe8f4682f5f78e9
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Fri Nov 2 19:46:27 2007 -0400

    nouveau: add darktama's email address to authors section.

commit 2dc2ee7a5aed18b82a1125d8e56a7ef92be18532
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Fri Nov 2 19:44:30 2007 -0400

    nouveau: put it all together.

commit c1aa08106e0a7190c7a303ec8a9b6b5339251137
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Fri Nov 2 19:43:53 2007 -0400

    nouveau:  Add darktama's fencing code.  Restructure some stuff.

commit 2c6cbea7dedc0b06114117b4c4ce2a23f74c54f6
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Thu Nov 1 23:35:46 2007 -0400

    nouveau: incorporate darktama's buffer object work.

commit 239e81093f05e7d81f95a55527f3c9fcb8fc483a
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Thu Nov 1 19:04:38 2007 -0400

    nouveau: more filling in for ttm.  Change copyright since it's based off of \
radeon code.

commit 9906c7e54bdb9fa172155eaa57b7e6c47ab01c58
Merge: 629c8b0dbf975632473d848f60606baf309f2f3b \
                94c22c334948a49641f4a1fa84687f992e5cc5cb
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Fri Nov 2 16:07:36 2007 +0100

    Merge branch 'master' into modesetting-101

commit 94c22c334948a49641f4a1fa84687f992e5cc5cb
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Fri Nov 2 16:03:41 2007 +0100

    User buffer support.

commit c06808fb6521822238bca4574758f30246b71c2d
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Fri Nov 2 15:52:00 2007 +0100

    Return fence errors.
    Time out properly in the presence of signals.

commit bb5f2158dbd30dbbffa3881fac75b71d71ecaaf9
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date:   Sat Nov 3 00:39:44 2007 +1000

    radeon: set the address to access the aperture on the CPU side correctly
    
    This code relied on the CPU and GPU address for the aperture being the same,
    On some r5xx hardware I was playing with I noticed that this isn't always true.
    I wonder if this will fix some of those r4xx DRI issues we've seen in the past.

commit 629c8b0dbf975632473d848f60606baf309f2f3b
Merge: 90d8f792794d46d1a8e998856bc7bbe54596114b \
                5766d81074d6faa7f14b45635765cdb7209597fc
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Thu Nov 1 15:27:55 2007 -0700

    Merge branch 'master' into modesetting-101
    
    Conflicts:
    
    	linux-core/Makefile.kernel
    	linux-core/drm_stub.c
    	linux-core/i915_drv.c
    	shared-core/i915_dma.c
    	shared-core/i915_drv.h
    
    Fixup suspend/resume conflicts (basically use what's in DRM master for now).
    Also fix up a few other conflicts that snuck in (i915_dma changes etc.).

commit 5766d81074d6faa7f14b45635765cdb7209597fc
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Thu Nov 1 15:48:46 2007 +0100

    nouveau: don't use AGP on PPC. It's a hopeless case.

commit 1b176e76134224e2af94d24ff7b33c7b536eaeea
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Wed Oct 31 21:27:00 2007 -0400

    nouveau: add missing file.

commit 9416541fb29666c630f2bcfcc0f3ae0b6c4436d8
Merge: 31847b4b62575739a164e019b33ced0531683403 \
                61cbcb5dbe487c6d4eba04794cbaa0279ab807b0
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Wed Oct 31 20:14:48 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm

commit 31847b4b62575739a164e019b33ced0531683403
Author: Jeremy Kolb <jkolb@brandeis.edu>
Date:   Wed Oct 31 20:13:01 2007 -0400

    nouveau: ttm stubs

commit 61cbcb5dbe487c6d4eba04794cbaa0279ab807b0
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Nov 1 10:34:11 2007 +1100

    drm/ttm: add support for cached un-snooped mappings.
    
    This mapping allows cached objects to be mapped in/out of the TT space
    with the appropriate flushing calls.
    
    It should put back the old CACHED functionality for snooped mappings

commit 6b0b2546c29858866ae1986b3b7254551245967e
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date:   Thu Nov 1 02:00:36 2007 +1000

    i915: fix compat code on 965/g33

commit 17f0882d5080a2436e4351c2bf497b8e00bc8e74
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed Oct 31 11:33:34 2007 +1100

    drm: add chipset flushing via agp support

commit 2489062a3319c72197914ee06b089ae581c5f0a8
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed Oct 31 11:27:44 2007 +1100

    i915: add backwards compat chipset flushing code

commit c106a7d8b9ddc1f6da3d462e3114af2ca72b3b46
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed Oct 31 11:21:05 2007 +1100

    drm: call driver load after initing agp subsystem

commit 79744d730c90019edd367eee4a8ec1fa22d53402
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Tue Oct 30 16:55:17 2007 +0100

    Nouveau: add a comment about SKIPS for next API breakage.

commit 0cebcd43dd7b950c07625601b87c72329857d831
Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date:   Tue Oct 30 16:54:57 2007 +0100

    Nouveau: fold some loops.

commit 50dec29c800a6e980a01be38190e44a0ba7916b5
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Oct 30 17:51:59 2007 +1000

    drm/i915: add driver cache flush entry point
    
    Use clflush on Intel hardware to flush cached objects.

commit 90d8f792794d46d1a8e998856bc7bbe54596114b
Merge: 343696583c77983ac7689b24cd49529864035cf7 \
                89d44a1023543a95b429bf72662b5e2308b0a550
Author: Jerome Glisse <glisse@freedesktop.org>
Date:   Sun Oct 28 00:55:27 2007 +0200

    Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into \
modesetting-101  
    Conflicts:
    
    	linux-core/Makefile.kernel
    	linux-core/drmP.h
    	shared-core/radeon_cp.c
    	shared-core/radeon_drv.h
    	shared-core/radeon_irq.c
    
    	modified:   linux-core/Makefile.kernel
    	modified:   linux-core/ati_pcigart.c
    	modified:   linux-core/drmP.h
    	new file:   linux-core/radeon_buffer.c
    	modified:   linux-core/radeon_drv.c
    	new file:   linux-core/radeon_fence.c
    	modified:   shared-core/radeon_cp.c
    	modified:   shared-core/radeon_drm.h
    	modified:   shared-core/radeon_drv.h
    	modified:   shared-core/radeon_irq.c
    	modified:   tests/ttmtest/src/ttmtest.c

commit 343696583c77983ac7689b24cd49529864035cf7
Merge: 26c32a3d797efb7474e5ae88c46afcb0e6015294 \
                a4c87d3796cac374d25e01b26bdbb9028ce03107
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Fri Oct 26 10:33:42 2007 +0200

    Merge branch 'master' into modesetting-101

commit 26c32a3d797efb7474e5ae88c46afcb0e6015294
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Fri Oct 26 10:25:57 2007 +0200

    Buffer flags and masks are 64-bit.
    don't mask off the high dword.

commit 9adf8c02563b1e6110e46dabd733e2dc440b4200
Merge: d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 \
                b9d9c30474238ac8ba4899a19fe4a97e9376f6c4
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Thu Oct 25 11:00:45 2007 +0200

    Merge branch 'master' into modesetting-101
    
    Conflicts:
    
    	linux-core/Makefile.kernel
    	linux-core/drm_bo.c
    	linux-core/drm_objects.h

commit d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5
Merge: 198170ab97bbf2ca6362bb7100e9ed86d90aa51f \
                a294aa724a1e932fb6017383e08532bfcc914df0
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Tue Oct 23 15:34:12 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101

commit 198170ab97bbf2ca6362bb7100e9ed86d90aa51f
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Tue Oct 23 15:33:20 2007 +0100

    Need fb attached

commit be2d68914d0992a37b9fb4d93338aeaf2240c4f5
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Wed Oct 17 09:35:44 2007 +0100

    Fix a crash on X startup

commit 90bfc8e611cb0c72ee03dce47027b50d2cc614b1
Merge: 2b07b0a45d32a9ffb7f6b9bb1b8f6f8e615524cb \
                db1709f2f3f8cab2477fb149b58420de4db65654
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Tue Oct 16 15:28:33 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101  
    Conflicts:
    
    	linux-core/drm_bo.c
    	linux-core/drm_objects.h
    	shared-core/i915_dma.c
    	shared-core/i915_drv.h

commit 2b07b0a45d32a9ffb7f6b9bb1b8f6f8e615524cb
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Oct 15 11:54:18 2007 +0100

    should be unlocked

commit cc9be8ac323e47616e48adebc5cc85c654524b45
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Mon Oct 15 11:51:19 2007 +0100

    Fix some buffer teardown problems.

commit d69721a14a8954420b4e0022ecf10bb040c6b807
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Fri Sep 28 09:21:09 2007 +0100

    Set the fb_base, so userspace applications can actually work
    now instead of locking up.

commit bf9bd5671c184e1caeeb25ead588cbb2ab77c360
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Thu Sep 27 14:21:29 2007 +0100

    Create memory pool for TT memory

commit 2ed12b6b7eee8a1b5b0adf0cd8f3cb8c1bc3ccaf
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Thu Sep 27 14:21:03 2007 +0100

    Add some more checks to modelist walking for matching
    incoming modes to current modelist.

commit 61dfd19de81716aea0eaba90518fcb110b46b8f0
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Sep 26 16:18:19 2007 +0100

    Add brackets

commit dfcf9272ce4427d959098b0f9e1748832a47a786
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Sep 26 15:40:40 2007 +0100

    no need to copy to/from user as the unlocked ioctl does
    that for us.
    
    other small cleanups.

commit b2c4c7ae5e14598dbb8c1de32918ec9cc8dde7c9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Sep 26 15:38:54 2007 +0100

    don't copy back if an error was returned.

commit 972ec4fa25059c84ed103c28efcb17f9f97a6d74
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Tue Sep 25 16:18:01 2007 -0700

    Hack out i915_mem_takedown
    
    We may want to make the old i915 memory manager obsolete eventually, and in the
    meantime the takedown causes problems on unload so remove it for now.

commit 053ff86566bcf050c7fd5b5dc7158bb35d39c38b
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Tue Sep 25 16:16:33 2007 -0700

    Move map hash destruction to after driver unload hook is called
    
    The driver unload routine will want to remove register and SAREA maps, so don't
    destroy the map hash before we get there.

commit 5433bbbfde10bed7fbafcd90c64c364546ca724f
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Tue Sep 25 16:15:48 2007 -0700

    Remove buffer object user list check in drm_bo_destroy_unlocked
    
    In the case of driver allocated buffers, there won't necessarily be a user list
    associated with the buffer, so don't bug out on an empty list.

commit cbcbe80c09bd95485ce8a9b0d86242fedcd7c182
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Mon Sep 24 15:43:00 2007 -0700

    Cleanup SDVO debug output
    
    SDVO debug messages were incorrectly including severity prefixes in each print
    rather than each unique line.  Fix it up.

commit 0be6e919aa3e7af884980e2004755848a2aa7519
Author: Jesse Barnes <jesse.barnes@intel.com>
Date:   Mon Sep 24 15:40:55 2007 -0700

    Add 965GM macro bits
    
    Update IS_MOBILE macro to include new IS_I965GM test.

commit 5cc3083179b19678456905a9122a3d0f04e6f623
Merge: 2a2d02bbc500140a861380df52ce66abcac39312 \
                54df1b9ff3b79097fedd8ed7bf54aca30a660cbd
Author: Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Date:   Mon Sep 24 14:41:46 2007 -0700

    Merge branch 'master' into modesetting-101 - TTM & typedef removal
    
    Conflicts:
    
    	linux-core/drmP.h
    	linux-core/drm_bo.c
    	linux-core/drm_drv.c
    	linux-core/drm_objects.h
    	shared-core/drm.h
    	shared-core/i915_dma.c
    	shared-core/i915_drv.h
    	shared-core/i915_irq.c
    
    Mostly removing typedefs that snuck into the modesetting code and
    updating to the latest TTM APIs.  As of today, the i915 driver builds,
    but there are likely to be problems, so debugging and bugfixes will
    come next.

commit 2a2d02bbc500140a861380df52ce66abcac39312
Author: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date:   Mon Sep 24 14:53:10 2007 +0200

    Added small modesetting test

commit 9ccb8440f393a395941b211ee87d9addcfa6d69a
Author: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date:   Fri Jul 20 11:36:57 2007 +0200

    Changed mode config spinlock to mutex

commit 43c9abdedc88807a40034513de842d6eeb8c3ed2
Author: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date:   Thu Jul 19 16:58:23 2007 +0200

    Fix unlocking of spinlock when we should not

commit 70fd9351ed6c666def710fd61b542a7c975d9ac9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri Jun 29 21:04:17 2007 +0100

    Move out the code from i915_dma_cleanup to unload to match
    existing code.
    
    This needs verifying.

commit adff58223f4568d084cf62d03d4ecfc3a6cec000
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri Jun 29 20:58:16 2007 +0100

    Bring back code from merge that was accidentally removed.

commit 14c49df06bb0b1adc0fa2a9bd575c454d39c7cf0
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri Jun 29 20:14:09 2007 +0100

    merge fixes

commit 8a78dead291ffdb5a8774419cdca369a1e27cad9
Merge: e79e2a58161d44754fd55507e155b7e12a09c4d2 \
                a27af4c4a665864df09123f177ca7269e48f6171
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri Jun 29 20:09:44 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101  
    Conflicts:
    
    	linux-core/drm_drv.c
    	linux-core/drm_fops.c
    	linux-core/drm_objects.h
    	linux-core/drm_stub.c
    	shared-core/i915_dma.c

commit e79e2a58161d44754fd55507e155b7e12a09c4d2
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu Jun 28 21:25:13 2007 +0100

    Fix type/flags usage problem to check for preferred modes.
    
    Add more debugging to help diagnose problems.

commit fa92e1f2ec396d2e772734f726a0958801b9fc99
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu May 24 18:41:44 2007 -0700

    Suspend/resume shouldn't call drm_initial_config (seems to work ok for me now),
    also we should fail if we can't enable the device at resume time.

commit 462d5a0dfc80dfa02da3d24d30ad90ad0387f0a2
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue May 22 17:49:04 2007 -0700

    Suspend/resume support (incomplete).

commit e918d2b7814e2cf5345dba63031c402010b1d3e4
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue May 22 13:38:58 2007 -0700

    Call preallocated space VRAM instead of PRIV0 to be more consistent with
    other drivers.

commit a4929b921e44dcd3cae8e384b9b7eabc51db28ff
Merge: f89458722173b364b8c3c27788b6c61889da554c \
                d42c1de3fb05405820b03ec9bb12f0b9a7eb0a7b
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri May 18 09:42:51 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101  
    Conflicts:
    
    	linux-core/drm_crtc.c - reconcile with locking changes

commit f89458722173b364b8c3c27788b6c61889da554c
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri May 18 09:40:01 2007 -0700

    Add locking.  The main lock is dev->mode_config.config_lock.  It should be
    held across any operations that modify mode lists, crtc config, output
    config, etc.  It should be taken at high level entry points (currently just
    initial config and user IOCTL).
    
    Seems to work ok on my system, but needs more testing (with lockdep) and
    review from some fresh eyes.

commit d42c1de3fb05405820b03ec9bb12f0b9a7eb0a7b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri May 18 14:16:27 2007 +0100

    Change some printk's to DRM_DEBUG's

commit 0c33a2cd2ec81478403d39b1b92aaa4431e7cf0a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri May 18 14:16:10 2007 +0100

    Move fbo creation to the specified fb driver which gives
    it a chance to allocate the memory from whichever buffer it wants to.

commit 3851600b3450697e20286b1937f3e51397f1965a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri May 18 13:59:46 2007 +0100

    Fix merge problem.

commit 315cf14af814da60285adb95238181de430c6f68
Merge: 95945bbf226610ba4f41381fd0436722082397ec \
                ea98d7e79657469545b865a353784d79fc8cff9d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Fri May 18 13:48:56 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101  
    Conflicts:
    
    	shared-core/i915_dma.c

commit 95945bbf226610ba4f41381fd0436722082397ec
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 17 23:33:48 2007 +0100

    Set crtcinfo on temporary mode

commit f3beabedc36b7bc2d45ca9c7f64d2c54e291e32b
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu May 17 13:48:46 2007 -0700

    Remove unused edid.h header from X.Org.

commit c0479dad8e34a51efebfaa05b0d329aa7d2b95d1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 17 19:32:46 2007 +0100

    bring in change from drm_fb.c

commit 07a5fbaa612a777de37b5dc0112f6f3f3f84c486
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 17 19:28:03 2007 +0100

    Move destruction of crtc as intelfb_remove uses the crtc to locate the fb.

commit b7bf317f42915dc4f5fde4a696e37985cea45104
Merge: a18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c \
                fd63ea971322246734fca5977a800c3ef51cc3fe
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu May 17 10:35:07 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101  
    Conflicts:
    
    	linux-core/drm_crtc.c
    	linux-core/drm_fb.c
    
    Lots of changes to merge with alanh's latest stuff:
      o fix use of fb->pitch now that it has the right value
      o add new helper for finding the CRTC given an FB
      o fix new fb_probe/fb_remove functions to take a CRTC
      o fixup callers of new FB routines
      o port drm_fb changes to intel_fb
      o check for errors after creating fb buffer object
      o go back to using cfb_imageblit since the accel stubs aren't ready

commit fd63ea971322246734fca5977a800c3ef51cc3fe
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 17 17:00:11 2007 +0100

    Grab the default mode if the preferred mode isn't available.
    
    Fix an overflow problem.

commit a18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu May 17 09:00:06 2007 -0700

    Fix FB pitch value (we had it wrong and were working around it in a few
    places).
    Add new FB hooks to the drm driver structure and make i915 use them for an
    Intel specific FB driver.  This will allow acceleration and better handling
    of the command stream.

commit 2222bd767f9fc02d05ebd0f35a8ceeff2f032c94
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 17 13:19:56 2007 +0100

    Fix build problem

commit 5ce8aaae7251e60c078eda0a21894aae0e1d7a45
Author: root <root@localhost.(none)>
Date:   Thu May 17 12:46:36 2007 +0100

    Large changes for fbdev support.
    
    Change from DIRECTCOLOR to TRUECOLOR, and enable
    support for PSEUDOCOLOR. DIRECTCOLOR support needs more work.
    
    Add the ability to change the mode on the fbdev device.
    
    Support depth 8, 15, 16 and 24 (and 32).
    
    Add a /dev/fbX device per CRTC, but there's some code which
    doesn't allocate the fbX device unless the output is actually
    enabled. Read the code on this as it impacts the fbcon map flags.
    
    Pick CRTC's based on the available outputs. More work could
    be done here to match modes, so cloning could be achieved on
    outputs. This fits more inline with what the X code does.

commit eba00df1203040905d38bf0ef449d25d6dbdb72c
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu May 10 13:16:05 2007 +0100

    Just some minor cleanups.

commit 45e09ea3cf85b76c18fb92a593ca7c40681052a7
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date:   Sat May 5 16:08:27 2007 +0200

    Cleaned up userspace interface for modesetting.

commit 3a69e2484a4a392c8fc8542fc44f9c6552589c46
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue May 1 14:20:22 2007 +1000

    cleanup usermodes on drm mode setting shutdown

commit 89231953d108e74ee7b0eb99494ead1dd795d640
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue May 1 13:16:29 2007 +1000

    Add support for user defined modes
    
    This allows userspace to specify modes and add them to the modesetting
    system and attach modes to outputs

commit 8e8e37515eafbd75b971f57f767ef01344361256
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue May 1 13:15:41 2007 +1000

    fix unusued variable

commit b589b846e73bfe6235cd702bb8ae89701c85eaab
Merge: 34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68 \
                5c8561aae22138880673503d930af7f1b361d071
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 26 15:56:21 2007 +1000

    Merge branch 'origin' into modesetting-101

commit 34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 26 14:50:00 2007 +1000

    i915: fix vblank pipe setup

commit ceb44021ad7755721acc3c0307c54009b666442e
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Apr 23 11:42:29 2007 +1000

    drm: make mode numbers no change by comparing probed modes
    
    The mode list sets all the output modes to UNVERIFIED, then probes a new list,
    If a mode is on the new list and not on the old, it adds it to the old,
    if a mode is on the new list and old, it just updates the status to the new
    mode status.
    If a mode is on the old list and not on the new, prune invalid modes should
    remove all UNVERIFIED modes

commit 0f3c5148f02bd98411095fdc8059207fa17b4a7d
Author: Dave Airlie <airlied@linux.ie>
Date:   Mon Apr 23 09:10:46 2007 +1000

    fixup vrefresh reporting, it should now be *1000 in userspace

commit 97b5599982c76915b0750c6ef0a270639b02a6f2
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri Apr 20 18:00:44 2007 -0700

    Oops, edid data should just be a char *, as edid.h is private to edid.c
    (we can just recombine them now).

commit eb892fb09dc2e5206f2461e8b258495c7cef904a
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri Apr 20 17:59:30 2007 -0700

    Add a monitor information structure separate from the EDID data for tracking
    monitor limits, etc.

commit a21ff375c697fc7560c16d0f88335a6db2c9c37a
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri Apr 20 17:03:50 2007 -0700

    Document drm_modes.c functions.

commit 9ca4932054a5bde5dda500ea346ad101bb5c80a0
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Fri Apr 20 16:32:58 2007 -0700

    Add a mode name generation wrapper to make name format changes easier.

commit 2d1de1fc6b9ab3524a1247f56ddeea7238c04ea3
Author: Kristian Høgsberg <krh@redhat.com>
Date:   Fri Apr 20 18:06:31 2007 -0400

    Initialize rwlock using rwlock_init to appease lockdep validator.

commit 6238ebee21f800cec6c77b6bf90d7916ca945931
Author: Kristian Høgsberg <krh@redhat.com>
Date:   Fri Apr 20 16:52:04 2007 -0400

    Clean up and return if no outputs are found.

commit 8d893e49ec35905a3718c565ec56c21d76dc745c
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 19 09:43:46 2007 +1000

    backout SDVO control bus check and comment why this is a bad idea

commit 5587961cfeff86d8368ff03867a1f0667e4a64d4
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 18 11:49:42 2007 -0700

    Document main drm_crtc.c functions, and rename drm_crtc_mode_create to
    drm_mode_create to be consistent with the other functions.  Also document
    where we need locking fixes and what the locks are for.

commit dfc02547ff5f35bfa5cffd6a0dcb56402db59f33
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 14:18:56 2007 +0100

    Shouldn't free the mode here. It's done later on.

commit b642ced0830d4e91785ba94677abe637c7cb3791
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 13:52:46 2007 +0100

    Fix return status

commit 0207b51acce0382b2e3cf55ed7dbbe02e48c73b2
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 12:19:16 2007 +0100

    Fix build problem

commit 87b46bd436074572b3a62e2fb7ec85a1db8df892
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 12:10:06 2007 +0100

    free the duplicated mode.

commit 191594ebd5fbe3ac3615247c4e2cd50e1b099635
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 12:07:55 2007 +0100

    When no valid EDID modes are available, we bail.
    
    This snippet adds a standard 640x480 @ 60Hz mode when
    that occurs, so we can continue with a basic mode.
    
    Should we do this here though ???

commit ef2bce3a16428feb89f447e528bdea00c1066b8b
Merge: 51e867c57880c85c87e187af0a667e9b99413206 \
                20b2949e3738bc900407d6aeddc6338f05b0b169
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 11:55:09 2007 +0100

    Merge remote branch 'origin/modesetting-101' into modesetting-101

commit 51e867c57880c85c87e187af0a667e9b99413206
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 11:53:25 2007 +0100

    Support the RGB outputs of SDVO cards, which are essentially
    VGA outs.
    
    The drm_initial_config path has specific handling code to name
    match for VGA, TMDS or LVDS. This is pretty restrictive and should
    probably be dealt with to be more generic.

commit ea8bcb466bca82081816ca3d83a420f09a62870c
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 11:47:21 2007 +0100

    Check status after SDVO command for sdvo_set_control_bus_switch

commit dc03e07f236ea5716d271155dcbbc54a218732c6
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Wed Apr 18 11:46:04 2007 +0100

    Move SDVO PENDING check to read_response so all SDVO commands
    benefit from the spin loop.

commit 20b2949e3738bc900407d6aeddc6338f05b0b169
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 18 14:55:43 2007 +1000

    make sure TMDS gets a crtc

commit e46e028bd21552331ca4db409c2b45e54491ced6
Merge: c71c44bb9288e0bf1b319ec19a2e25f4467d9583 \
                5a96d59ce9d9ad5816e2d0e195afa9902445f594
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 18 14:11:49 2007 +1000

    Merge branch 'origin' into modesetting-101
    
    Conflicts:
    
    	linux-core/drm_bo.c
    
    Merge in changes from master from Thomas fixiing TTM problems

commit c71c44bb9288e0bf1b319ec19a2e25f4467d9583
Merge: 4f0841a31cbed315a3e891557eadc55cab0dfd23 \
                d20aaf485893ed11dd0d68daf63ccadd77b02213
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 18:20:05 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101

commit 4f0841a31cbed315a3e891557eadc55cab0dfd23
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 18:03:14 2007 -0700

    Just use drm_output_destroy to cleanup LVDS failures.  It'll call our cleanup
    routine, which will take care of freeing our dev_priv and i2c ddc bus.

commit d20aaf485893ed11dd0d68daf63ccadd77b02213
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 18 10:41:39 2007 +1000

    don't crash if no desired mode

commit 2352ec9bfab20761cc898ea40db2a7c6d53e81f3
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 18 10:39:58 2007 +1000

    backout alanh's broken commit

commit 7c9e19ba55dcdf212845253648194115639fe7b6
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Fri Apr 13 16:43:55 2007 +1000

    clean up ring buffer and TTM in i915_driver_unload
    
    I've commented out the framebuffer for now

commit 73b031df613b58c4462a65818b88200bed0a97de
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 17:30:46 2007 -0700

    Add framebuffer bo freeing to drm_mode_config_cleanup (seems like the best
    place for now).

commit a45fa264f2b60185ae797f85d2084d57de49bbca
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date:   Tue Apr 17 22:27:46 2007 +0200

    Lvds now power up backlight on commit
    
    Now saves previous power level in prepare and sets
    that power level in commit, should power level
    be 0 it will set maximum level.

commit 1c7f895fa6531b16e7e9fd4568d4f6a50ca5711e
Merge: 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f \
                b729b919baed250313caf3f0bbd4044e084de8bf
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 10:14:18 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101  
    Conflicts:
    
    	shared-core/i915_init.c - reconcile with airlied's new code

commit 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 10:00:37 2007 -0700

    Move initial framebuffer allocation and configuration to drm_initial_config,
    remove i915_driver_load fb related stuff.  Add a small helper for setting up
    outputs.

commit eeb5de059401361871e34e29c456a1feebac0b1e
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 09:59:21 2007 -0700

    Cleanup whitespace, rename macro argument.

commit 5e6c34539694c58cd7e9dd60541fc6e2bde1a79d
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 17 09:57:08 2007 -0700

    Add prototypes for drm_bo_init_mm and drm_buffer_object_create for use by
    in-kernel code.

commit b729b919baed250313caf3f0bbd4044e084de8bf
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Tue Apr 17 16:11:00 2007 +0100

    Fix a register read that was swapped SDVOB/SDVOC
    
    Check for the PENDING message when reading the attached
    displays. Ensures the command has completed before continuing.
    
    (probably need to check PENDING in other SDVO calls too)

commit ecd9801c3cf08082b4aaa7e23f1f94a5e1d47a75
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Tue Apr 17 16:09:40 2007 +0100

    Fix SDVO outputs

commit 32b5616cc681e404f671b4bc3b030ee24b753d4a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Tue Apr 17 16:08:26 2007 +0100

    Correct PCI ID for i845

commit 1a5e647f63f083788a7fe43c2367d2e022c48588
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Apr 17 18:18:42 2007 +1000

    I don't think this dec is necessary and my stuff all works without ..
    with it everything falls over

commit 56ef1ab8acc0c68b66c4f781107b605f9dd79657
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Apr 17 18:18:25 2007 +1000

    add some missing export symbols

commit 79aa1d54746f33c33ffbf98fb96ccbf88c3cb390
Author: Dave Airlie <airlied@linux.ie>
Date:   Tue Apr 17 18:16:38 2007 +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.

commit cd5769c3b563048357535b24dc40783775adb227
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date:   Mon Apr 16 20:54:24 2007 +0200

    Fix offset should from pci device address

commit 2aa183db1ff0fb6044d24eae51854ff128da9a0f
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 14 15:35:38 2007 -0700

    Use drm_mem_reg_ioremap to map buffer object.

commit 65619cab276ba1f00014f9701b8347e2b834abe4
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 14 15:35:21 2007 -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.

commit c4e944182db3002101c330453ebb3f454637743e
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date:   Fri Apr 13 02:23:42 2007 +0200

    Added debug messages so we know which output we are dealing with

commit cc471a361fc7058df4fb8d15d9c9a8b5cdd3dd77
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Fri Apr 13 14:33:52 2007 +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

commit 27598bacfd8e086832753a8b931f0fce18989f8d
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Fri Apr 13 14:31:10 2007 +1000

    export drm_bo_driver_finish symbol

commit a890d596fc22a3dca9d390f96f0f739cf90de5e1
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Fri Apr 13 14:30:44 2007 +1000

    revert LVDS destroy - this oops on sysfs on sdvo init of i2c bus

commit 9f0f6509f5278b5d46a282acf40e7b69790892a6
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 18:30:36 2007 -0700

    Move driver load call to after AGP init, in case the load routine needs AGP \
stuff.

commit 79b7a588bb685459d51527e7ac6877696fe392a3
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 14:57:07 2007 -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...

commit 9a39cb9b9a51516abcaf795fa6e38cbeb22d7db9
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 12:43:47 2007 -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.

commit 6b229c1e59e8d070e1822030f8f0c1d61140508d
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 12:41:56 2007 -0700

    Add new function for getting a CRTC pointer given a pipe number.

commit 9e5d61d5b8c052b4dc126b155dca1f0d2e4e5ad9
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 12:40:51 2007 -0700

    Fix 945+ hotplug detection, remove some unused variables.

commit fb3c82f1d8362a0b7d64cb3bce75be8c72328e1c
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 11:50:57 2007 -0700

    Don't need a NULL check prior to calling kfree.

commit e183a091ff44e5b03ec521696830c45b2ce9ce87
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 11:40:12 2007 -0700

    Initialize the hw lock waitqueue so we don't hang in drm_lastclose.

commit 2160e267ff3e1a503ab7666b60ffe21f4a90b803
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 09:01:53 2007 -0700

    Don't use drm_setup, do SAREA allocation and mapping directly instead.

commit c2fce380c26d72f2d7971a4d08076da33c41f5ae
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 08:57:58 2007 -0700

    Move i2c init back to where it belongs and add i2c unregistration in *_destroy.

commit 258e1cf70345198209e6d49a428efc3de8ce8238
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 08:56:34 2007 -0700

    Whitespace cleanup

commit e7b97f552390319d817595da8accefbe56199346
Merge: f2e3d790ac05b2792e795f47fee32fe896a096cc \
                cf016891435a0aa74dc4909ed4125c7ed906b7d1
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 08:55:51 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101

commit f2e3d790ac05b2792e795f47fee32fe896a096cc
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Thu Apr 12 08:53:03 2007 -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.

commit cf016891435a0aa74dc4909ed4125c7ed906b7d1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu Apr 12 15:12:00 2007 +0100

    Use drm_framebuffer instead of drm_crtc for fb & fbt

commit a85440c8a6cac3de4b0e50805fa30cdce40e311b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu Apr 12 15:11:38 2007 +0100

    Remove extraneous drm_crtc.h include

commit 9420ab4b419458605c678d179de6c80de23b8ee1
Merge: 9b7211dd6793dc62d11ad1ae980b22fa2d61f9dd \
                b1f0fd6dfbd1495aa08c6358e936582eeca042c8
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date:   Thu Apr 12 15:10:08 2007 +0100

    Merge remote branch 'origin/modesetting-101' into modesetting-101

commit e8bd9fdf31bf3db91431b69ce1fc8d419148c838
Merge: 0430a80fc7861a3397a3f2649dfeb9eff14359a5 \
                b1f0fd6dfbd1495aa08c6358e936582eeca042c8
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 20:41:54 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101

commit 0430a80fc7861a3397a3f2649dfeb9eff14359a5
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 20:41:27 2007 -0700

    Remove debug statement about buffer objects

commit b1f0fd6dfbd1495aa08c6358e936582eeca042c8
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 12:11:58 2007 +1000

    use FB everywhere

commit 1bba3cb3b37ca9bc302d83377c1e9d5441653d0d
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 11:55:10 2007 +1000

    cleanup framebuffers on drm unload

commit fb6c5aacb9955248300e0c62f68a5a65b40e15e1
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 11:54:49 2007 +1000

    only initialise modes when fbcon or fbset asks for it

commit b49b3ba4c1aad0d3f34f06013f2ffa67fc8d82c9
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 11:43:13 2007 +1000

    set bracing style like Linux

commit a5cf4cc369fcc2cf7b84bbaef1e458250ecb91ee
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 11:28:55 2007 +1000

    fix unbalanced lock and make sure mode list has modes so lvds code doesn't crash

commit 981f8156de0c5ec6387f659fbcac031d663d943c
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 08:54:31 2007 +1000

    allow framebuffer changes on the crtc setup

commit a81558d8b3ee17fbf46e32b10732e22fcd997858
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 12 08:45:40 2007 +1000

    add getfb ioctl

commit 9d7160c43a7475b9d2ab06c5c353acb9456efa12
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 12:52:57 2007 -0700

    Use new kernel buffer object type and cleanup agp probing.

commit 2e21779992bd5026d8ec4dea52466377dbe5a0ed
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 12:51:52 2007 -0700

    Add new buffer object type for kernel allocations that don't initially have a \
user mapping.

commit 8dd75bd601f5fbf9793afc7b869a278050aa17d5
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 11:47:58 2007 -0700

    Add aperture size and preallocation probing (from intelfb), cleanup load code to \
be more general.

commit 63d4d40463b04f1277470ccf5cc96dafd81e8687
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 11:46:37 2007 -0700

    Fix i2c unregistration, cleanup panel_fixed_mode assignment.

commit 425da42e95606fec19cc87fad9329d48f93dfe6b
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 11:44:54 2007 -0700

    Whitespace cleanups.

commit c731b68091aa7284ee3a89c8a7ea3fdabac45a54
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 11:42:00 2007 -0700

    Fix EDID pixel clock calculation.

commit cc7faa4de80a68d5a7a484046b9b42de961cdbef
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 07:21:24 2007 -0700

    fix modeset cleanup for LVDS and reenable it in i915.

commit dd00aa5851ca7c5590ae0b0825dd84c027cfd420
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 07:08:48 2007 -0700

    export vblank routine for use by intel_display.c and intel_sdvo.c.

commit f35db6690625ccd01fb61dc766e6380a9c14c331
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 07:08:29 2007 -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.

commit 78598fdaa8b23a199880a63b79f17cfd7f14cb0f
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Apr 11 07:07:54 2007 -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

commit 7e48d47fb51cc0f1a38a99acfe591821a45d7081
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 17:35:00 2007 +1000

    line_length calculation was incorrect.. I now can get fbcon to run

commit 0392badd84ec833ddd9e2b187844d246d860bbf7
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 17:25:37 2007 +1000

    oops for 32 pitch.. hey I can see stuff on fbcon now.. it looks like text.. just \
a bit garbled

commit 1147fefed8d1154482c9cc9a9785e6871cd6e6a1
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 17:13:57 2007 +1000

    fixup framebuffer depth

commit a6cc6a778f8b2f86300a8ce87441d044fd67f930
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 17:13:45 2007 +1000

    add support for setting a framebuffer depth

commit c582eaac194411f52a2c0527ffa093b5a422d7b9
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 16:34:40 2007 +1000

    add copyright statement

commit 32f6a58db216f23a7c71ca9c7eda56aaa8293078
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 16:33:03 2007 +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.

commit add7a928ad1819df17d5764d06fb81985b285d08
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 14:43:02 2007 +1000

    comment out unworkable code

commit 3dd5dc5728620cadec24ee5db323a20c3bb48bf0
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 14:34:43 2007 +1000

    only init at driver load

commit 9d12da5917ec57605a2c4cd81c1753145f7e229c
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 14:34:22 2007 +1000

    only bo finish at driver unload

commit b329f91502a20cc6def44b7bea6cbc8b016edd5e
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Wed Apr 11 14:04:18 2007 +1000

    use the baseaddr at least

commit 7e58276c76ff2297fdf9ba295d696338377d6e14
Author: root <root@airlied2.(none)>
Date:   Wed Apr 11 13:40:50 2007 +1000

    Revert "Remove some delays from Intel i2c code, we'll need a more comprehensive \
fix"  
    This reverts commit c0336989884e75bcd05284257e884754bb5f85b6.
    
    this break SDVO

commit 44be9c9d5950d3b2ba4d5527189abec8dac0686f
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 13:19:30 2007 +1000

    add an fb count + id get to the get resources code path

commit 3e994a56be1bfc633e49434c9e4a3e3262070248
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 13:18:49 2007 +1000

    use fb pitch and fix up some whitespace

commit f50eec752c8754595ba99f0ec7a7c8138316a819
Merge: 44a8761302888080f1cb6596d4573d88c1746da4 \
                b62ffb8e91dafbe46b4daa5be13a867b149b0170
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 17:58:30 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
origin/modesetting-101

commit b62ffb8e91dafbe46b4daa5be13a867b149b0170
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Wed Apr 11 09:56:09 2007 +1000

    fixup calculation to make sdvo work

commit 44a8761302888080f1cb6596d4573d88c1746da4
Merge: e114b981bc291049fa6996d487334a408acc1ce2 \
                50672adb3142abca743535a8e60c360ef47b2a08
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 10:45:55 2007 -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

commit e114b981bc291049fa6996d487334a408acc1ce2
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 10:31:58 2007 -0700

    Export drm_setup for use by new driver init code.

commit b59285d738b1a832b12d9258bd6f1db8f7e61f08
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 10:31:10 2007 -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.

commit 5130918e2531b9a8f6f6b65cdfce81f4f0904329
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 09:51:17 2007 -0700

    Add save/restore state for LVDS code, along with a few other LVDS related
    items to i915 private structure.

commit 8785679f893ef9257c589a70113ac731edba0194
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 09:49:02 2007 -0700

    Remove some debug #if 0 codes and add a reminder to check locking around
    output enumeration stuff.

commit c0336989884e75bcd05284257e884754bb5f85b6
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 09:48:20 2007 -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.

commit 183cbd92dd016f8935f9b58ef9345fde1391173e
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Tue Apr 10 09:47:37 2007 -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

commit 50672adb3142abca743535a8e60c360ef47b2a08
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 16:49:36 2007 +1000

    add sdvo debugging output

commit b9c7fa55e2c6685c4c533613ab14f305f033c353
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 16:32:17 2007 +1000

    fixup sarea writes for set pipe base and dpms

commit 23a66fd506e71fdfde906d1679fb07c0df8bec4c
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 16:26:07 2007 +1000

    fixup true/false in intel_sdvo.c

commit f1476e4e5cefd4aa8c487b4e651a26056110e2f0
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 16:25:52 2007 +1000

    re-tab and fixup the i915GM get core clock function to actually work

commit 1e39dc43230ba1827eedc29ab422464281ec3e1b
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 16:25:31 2007 +1000

    export output name to userspace

commit 40bd6dcd86d554ca426deccd4fbada693c4be8a6
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 15:20:50 2007 +1000

    set the base address of the CRTC correctly

commit 65f465ed5ad3caf773658bb2832785c963b987f6
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 14:49:49 2007 +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

commit c446bf50e3ae730f272c6842f4ad04d523bd40c3
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Mon Apr 9 20:46:38 2007 -0700

    Slam in most of X.Org's i830_lvds (not quite done yet so removed from \
Makefile.kernel too).

commit eb9bdc27879d1aa307b234bbdb0f81494dcf7095
Author: David Airlie <airlied@asimov.stargames.com.au>
Date:   Tue Apr 10 11:51:31 2007 +1000

    mode: fixup problems with framebuffer add function

commit ed0ebd9d3da2e5c4e8053b6e7a7d2898b184f857
Author: Dave Airlie <airlied@airlied2.(none)>
Date:   Tue Apr 10 18:56:02 2007 +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 :-)

commit b50bda002b824efb24e18e8d514ff0ca763c15b9
Author: Jakob Bornecrantz <wallbraker@gmail.com>
Date:   Tue Apr 10 18:44:47 2007 +1000

    add addfb/rmfb ioctls
    
    Originally from Jakob, cleaned up by airlied.

commit 7e2b1a6cf55579c6f8b1fd56a97e9f41e34b88fc
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Mon Apr 9 08:52:53 2007 -0700

    Fix refresh calculation (mistakenly removed 1000 factor needed for integer \
calulations, fixed mode printout debugging routine instead).

commit ab7ee9c1af3bd844653a83b5160773db671bbcad
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 7 19:26:55 2007 -0700

    remove a printk to make things less verbose

commit 2430d0c3157ef20a3319a4f93dc44b28d0189868
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 7 19:25:25 2007 -0700

    just codingstyle cleanups

commit 491ed9e4c27da6b1b5a6a6921039a7bf3a98c290
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 7 19:24:53 2007 -0700

    document drm_mode_duplicate and fix vrefresh calculation (off by 1000 error)

commit 13d4ea90c09fa834eb6eecaa082780aace78dac7
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 7 19:24:09 2007 -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

commit a35ba455b27b72f1ee3e1136ca6659f672ada4fa
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Sat Apr 7 19:22:39 2007 -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.

commit 1c9ba24c2f37ca78965f8aa57ece02ef5bdb9b06
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Apr 5 11:34:11 2007 -0700

    Add required permission notices for code copied from X.Org source.

commit 50ee722e018a5f17f886286e3d9eebe93f3cecaa
Merge: 6f3534a13abb0c8afb157511d0871dbc35bc403d \
                652bbb77f6c9efb7e0a67cc868dfda42b00fc5fb
Author: Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Date:   Thu Apr 5 09:27:12 2007 -0700

    Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into \
modesetting-101

commit 6f3534a13abb0c8afb157511d0871dbc35bc403d
Author: Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Date:   Thu Apr 5 09:21:31 2007 -0700

    Add copyrights before I forget

commit 652bbb77f6c9efb7e0a67cc868dfda42b00fc5fb
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 20:20:33 2007 +1000

    add back compat for bool

commit b4094864f188a1346cc3b51bcb457beeacefbf82
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 18:01:02 2007 +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.

commit 7bb112fecadc6fe42e5828b861600691071ccd91
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 17:06:42 2007 +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.

commit 5bffbd6e275efffbb649c20c528a11412ccf99cd
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 13:34:50 2007 +1000

    initial userspace interface to get modes

commit 52f9028c84baea81230dc673b756552e8e90aecd
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 11:21:06 2007 +1000

    Initial import of modesetting for intel driver in DRM

commit 8fe8793a0fdf4e6082a0f0b0fc4650f171737356
Author: Dave Airlie <airlied@linux.ie>
Date:   Thu Apr 5 11:20:23 2007 +1000

    borrow edid.h from fb directory



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

--
_______________________________________________
Dri-patches mailing list
Dri-patches@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-patches


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic