drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.4.3+git+20090105+a8c5480-1'
Tag 'drm-snapshot-2.4.3+git+20090105+a8c5480-1' created by Chris Lamb <lamby@debian.org> at 2009-01-05 02:55 +0000
Uploading drm-snapshot (2.4.3+git+20090105+a8c5480-1) to experimental.
Changes since drm-snapshot-2.4.1+git+20081116+930c0e7-1:
Alan Hourihane (96):
Merge remote branch 'origin/modesetting-101' into modesetting-101
Remove extraneous drm_crtc.h include
Use drm_framebuffer instead of drm_crtc for fb & fbt
Correct PCI ID for i845
Fix SDVO outputs
Fix a register read that was swapped SDVOB/SDVOC
Move SDVO PENDING check to read_response so all SDVO commands
Check status after SDVO command for sdvo_set_control_bus_switch
Support the RGB outputs of SDVO cards, which are essentially
Merge remote branch 'origin/modesetting-101' into modesetting-101
When no valid EDID modes are available, we bail.
free the duplicated mode.
Fix build problem
Fix return status
Shouldn't free the mode here. It's done later on.
Just some minor cleanups.
Fix build problem
Grab the default mode if the preferred mode isn't available.
Move destruction of crtc as intelfb_remove uses the crtc to locate the fb.
bring in change from drm_fb.c
Set crtcinfo on temporary mode
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fix merge problem.
Move fbo creation to the specified fb driver which gives
Change some printk's to DRM_DEBUG's
Fix type/flags usage problem to check for preferred modes.
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
merge fixes
Bring back code from merge that was accidentally removed.
Move out the code from i915_dma_cleanup to unload to match
don't copy back if an error was returned.
no need to copy to/from user as the unlocked ioctl does
Add brackets
Add some more checks to modelist walking for matching
Create memory pool for TT memory
Set the fb_base, so userspace applications can actually work
Fix some buffer teardown problems.
should be unlocked
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fix a crash on X startup
Need fb attached
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
pass pointer for drmModeRmFB
Pass pointer to drmModeRmMode.
Use _size
add missing lock
remove duplicate and obsolete ioctl statements
remove unused define
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Remove duplicate
consistency
Add missing round_jiffies_relative() for older kernels
Fix function declaration
build fix for older kernels
fix some warnings
build fix for older kernels
DRM_CONTROL_ALLOW logic was reversed
consistency
make modefb/modedemo match each others test output.
tweak it
update app to cycle through 4 fbdev's
Revert "DRM_CONTROL_ALLOW logic was reversed"
After the previous revert fix libdrm to start at minor 1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fix up conflicts for DRI2 (untested)
compatibility code for pci_get_bus_and_slot()
minor test fixes
fix SAREA
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
silence warning
Implement short circuit for base change only
define PRETHAW
DRM_INFO -> DRM_DEBUG
DRM_INFO -> DRM_DEBUG
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Add FENCE registers to MMIO list
Fix connector description table
propogate failed fixups back up
Use ARRAY_SIZE
Check mode before adding to EDID
Add property info.
build fix
Add support for monitor hotplug signals/waits
global hotplug events happen in the pipe A stat register,
Add sample code to test hotplug events
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fix green offset
Older kernels don't have kobject_uevent_env(), so punt
Fix test applications for recent DRM changes
Fix build problems
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fix warnings
more checks for NULL encoder so we don't segfault.
Synchronize the DDC EDID read to it's fb_ddc.c counterpart
set to 2.4.0
Alex Deucher (35):
NV50: s/FALSE/false/
on_each_cpu() compat fixup from krh
Brute force port of legacy crtc/encoder code
unify connector, i2c handling for atom and legacy
Add legacy dac detect stubs
various cleanups
LUT updates
atom: implement crtc lock
Restructure cursor handling and add support for legacy cursors
Convert COM BIOS to table offset lookup function
set base in legacy crtc mode set
Get legacy working finally
Fix warnings
Add additional quirks from ddx
Fill in and make use of more com bios tables on legacy chips
Add com bios asic init bits
radeon: get primary dac adj info from bios tables
radeon: remove unused legacy state
radeon: first pass at bios scratch regs
radeon: first pass at legacy dac detect
radeon: legacy lvds updates
radeon: fix warning from radeon_legacy_state removal
Merge branch 'modesetting-gem' of git+ssh://agd5f@git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon: fix legacy LVDS
Export drm_put_minor
Radeon: restructure PLL data
radeon: add function to configure PCIE lanes
radeon: Add functions to set mem/eng clocks
radeon: pll and interlace updates from the ddx
radeon: rmx_fixup() fixes for legacy chips
radeon: first pass at using atombios on r4xx hw
Merge branch 'modesetting-gem' of git+ssh://agd5f@git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon: make atom on r4xx a module option
radeon: use atom for ext tmds on r4xx
radeon: pull in recent fixes from ddx
Ben Skeggs (6):
nouveau: allocate drm-use vram buffers from end of vram.
nv50: when destroying a channel make sure it's not still current on PFIFO
nouveau: interface changes for nv5x 3d
nv50: use same dma object for fb/tt access
nv50: update context-related tables for original 8800GTS
nv50: support NV94 chipset
Chris Lamb (3):
New upstream snapshot, bumping base version number to 2.4.3.
Merge branch 'upstream-experimental' into debian-experimental
Correct spelling mistakes in upstream's changelog to please Lintian.
Dave Airlie (377):
copy over some files and reorg radeon to add ttm fencing not working yet
radeon: de-static irq function, fixup fence/buffer
radeon: enable buffer manager
add initial PCIE GART framework for TTM
radeon: add setup for PCIE GART ttm
borrow edid.h from fb directory
Initial import of modesetting for intel driver in DRM
initial userspace interface to get modes
checkpoint commit: added getresources, crtc and output
checkpoint commit: implement SetCrtc so modes can in theory be set from user
add back compat for bool
make crtc_config be named mode_config
use the baseaddr at least
only bo finish at driver unload
only init at driver load
comment out unworkable code
add initial drm_fb framebuffer
add copyright statement
add getfb ioctl
allow framebuffer changes on the crtc setup
fix unbalanced lock and make sure mode list has modes so lvds code doesn't crash
set bracing style like Linux
only initialise modes when fbcon or fbset asks for it
cleanup framebuffers on drm unload
use FB everywhere
another large overhaul of interactions with userspace...
add some missing export symbols
I don't think this dec is necessary and my stuff all works without ..
backout alanh's broken commit
don't crash if no desired mode
Merge branch 'origin' into modesetting-101
make sure TMDS gets a crtc
backout SDVO control bus check and comment why this is a bad idea
fixup vrefresh reporting, it should now be *1000 in userspace
drm: make mode numbers no change by comparing probed modes
i915: fix vblank pipe setup
Merge branch 'origin' into modesetting-101
fix unusued variable
Add support for user defined modes
cleanup usermodes on drm mode setting shutdown
Merge branch 'origin' into radeon-ttm
cleanup pcigart ttm for new backend layout
WIP cleanup
complete PCIE backend for ttm
take the lock earlier in ttmtest
invalidate gart tlb on PCIE after table change
add wbinvd calls
set start to gart_vm_start at least
radeon: PCIGART memory is Can't map aperture as well there is one
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into radeon-ttm
radeon: add VRAM support for radeon ttm
drm/radeon/ttm: more VRAM fixes
radeon: make vram fixed type
i915: cleanup pageflip derefs sarea even if no sarea exists
Merge branch 'master' into modesetting-101
tests: update for new drm interface
intel: fixup || vs |
drm: don't remove mappings added by the driver
modes: pass type to userspace for preferred showing
drm: send correct fb id to userspace
libdrm: add crtc/output ids to userspace interface
libdrm: return crtc id to userspace
Merge branch 'origin' into modesetting-101
drm: make fb modes use usermode add/remove interface
add _ioctl to the end of two more ioctls
fb: make fb interface use user mode attach/detach for adding modes
drm/modesetting: add initial gettable properites code.
modesetting API change for removing mode ids and making modes per output.
finish of mode add/remove, just have attach/detach modes
mode: copy back the mode if is valid correctly
add flags to mode debug print
hooks up sync and flags and also clocks to get mode matching better
arrgggh.. make all ioctl structs 32/64-bit compatible hopefully.
more WIP on blobs..
add property blobs and edid reporting support
oops initialise variable to false
check previous mode first
retab intelfb code
modesetting: add dpms property and initial settable property ioctl
modesetting: fixup property setting and add connector property
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
remove output names
we should not be unlocking this here
lockdep warned about a possible locking dependency
HERE BEZ HACKZ.. magic variable to make shit work
Merge branch 'modesetting-airlied' into modesetting-101
s/TRUE/true
drm: move drm_head to drm_minor and fix up users
crtc: fixup allocation size
drm: add initial support for a drm control device node
drm: only call suspend/resume on control node
add control ioctls
allow control getversion
add internals for opening a control node
add control node open
fixup crtcinfo on modes from userspace
Merge remote branch 'origin/master' into modesetting-101
don't reinit ring if already initialised
if irq already enabled well just keep trucking
drm: re-write minor number allocation to use an idr.
Revert "After the previous revert fix libdrm to start at minor 1"
major port of multi-master ideas into modesetting
start moving over to proper hierarchy wrt master accesses
missing bits
remove drm_minors_limit
switch naming to new proposed scheme
various fixes from trying to get userspace started
fb: fixup the offset by getting it from the right place
ttm: make sure userspace can't destroy kernel create memory managers
drm/fb: get rid of offset from structure use bo offset
remove more offset
hopefully shit works now without this...
add ioctl to get back memory managed area sized - used for kernel inited areas
modesetting: fix memory leak and misallocation
drm: fix pick crtcs mode selection code
i915_mmio: add overlay regs
i915: fix typos
drm: add a check for if modesetting is supported.
drm: add modesetting as a driver feature.
drm: change fb api to take a bo handle not the bo pointer.
remove unused functions + include header file
Merge remote branch 'origin/master' into modesetting-101
libdrm: fix warnings in mode code
drm: fixup compat with old x.org drivers
fixup previous merge
Merge branch 'master' of ../../drm into modesetting-101
Merge branch 'master' of ../../drm into modesetting-101
woah somehow got these upstream
drm: fixup for new sysfs API
I really screwed up that merge somehow
Merge branch 'master' of ../../drm into modesetting-101
drm/modesetting: fixup irq removal on exit
worst merge effort ever
actually turn the irq off
make startup of Xorg smoother if the mode doesn't change.
drm: we already worked out the pitch. multiplying by 4 is just madness..
drm: hopefully fix cursors on 965
drm: fix oops on unload.
drm: fix fd closing ordering.
drm: select the correct master to attempt to remove the lock from.
drm: pick correct master for cleaning up
i915: safety check the sarea map still exists
drm: add master set/drop protocol
drm: remove authentication on master exit.
Merge remote branch 'origin/master' into modesetting-101
cursor: pass handle not BO.
drm: fix typo from previous merge
drm_mode: initial replacefb implemenation
drm: fix replacefb to change fb properties
intel: set correct limits on screen width/height from DDX
drm: set crtc->fb to NULL
drm: check for NULL fb here, shouldn't happen but avoid oops for now
i915: fix vbl swap for multi-master
Revert "i915: fix vbl swap for multi-master"
drm: fix oops on reading proc file with no master
drm: masters are always authenticated
drm: remove root only from a lot of drm ioctls to get stuff running as non-root
modeset: disable radeon ms by default
modesetting: reorganise code into core and helper functions.
modesetting: reorganise out crtc/outputs are allocated.
drm/modesetting: add initial encoder structures and setup functions
drm: remove unused init func from outputs
drm: add encoder / get encoder to the modesetting resources interface
libdrm: add encoder retrival
drm: add more encoder interfaces
drm: add encoder ids to the output handling
drm: add red hat copyright.
drm: init the encoder list/count
drm: add encoder free function
tests: add basic encoder reading to test
drm: add encoder attach/detach
drm: fix a couple of bugs in the encoder return to userspace
drm: attach an encoder.
modesetting: the great renaming.
modesetting: drop crtcs/clones from the connectors
drm: switch possible crtc/clones over to encoders
drm/modesetting: another re-org of some internals.
drm: fixup some interfaces so test code works again
drm/modesetting: move some connector functions to helper.
drm/modesetting: add best encoder finding for modesetting
drm: fixup encoder picking in set_config stage
Merge branch 'modesetting-101-encoders' into modesetting-101
drm: add functions to get/set gamma ramps
drm: only report framebuffers available on this fd.
drm/modesetting: redo object handles around a core object.
drm: initial mode object groups.
drm: make mode comparison more betterer.
drm/modesetting: overhaul the fb create/delete.
drm/modesetting: pass object handle to driver !bo
drm: remove sysfs in driver for now.. should probably be in helper
drm/modesetting: bo not used anymore
intel: use kzalloc
drm/sysfs: don't try an unregister if not registered
drm: introduce generation counter to interface.
libdrm: shouldn't rely on this
intel: report a known connector
drm: fix hotplug oops
modesetting: initial attempt at debonging fb
modesetting: add surface width/heights
modesetting: use surface width height for buffer allocs
modesetting: fix fb clearing up
drm: modesetting unify the hotplug init paths a lot.
drm/modesetting: attempt to make fb code more sane
drm/modesetting: more fb interface cleanups
drm/modeset: add more debugging and fixup some fb enable/disabe bits
intel: if no spare crtc exists don't just take one.
drm/intel: make hotplug just be an event
intelfb: move mode sets into the intel crtcs
intelfb: admit fbdev is crap and punt on trying to resize to a larger fbdev.
intelfb: remove duplicate define
intelfb: add multi fb paths
Merge remote branch 'origin/modesetting-101' into modesetting-101-fb
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
drm: fix up fb resize again
drm: fix encoders get permissions
modesetting: lookup blob using correct identifier.
modesetting: rip out all of the generation code.
Merge remote branch 'origin/modesetting-101' into modesetting-gem
modesetting/helper: fix array overrun - count should be reset here
drm: use correct mode destructor
Merge remote branch 'origin/modesetting-101' into modesetting-gem
modesetting: pass file_priv into cursor set functions
nv50: remove TRUE/FALSE
modesetting: pass file priv to cursor
drm: don't set the signal blocker on the master process.
Merge remote branch 'origin/modesetting-101' into modesetting-gem
radeon: add initial atombios modesetting and GEM -> TTM translation layer.
tests: add some basic radeon gem tests
radeon command submission start
r300: initial command stream parser for packet 0.
r300: add some packet 3 decodes
radeon_cs: extract some offsets from packet data
radeon_cs: add relocate hook for mm and non-mm relocations
radeon: move code around putting emit into cs
radeon: add some handles to the sarea + kernel mm available check
radeon: hack gem to get an offset back for Mesa.
TTM: remove API and userspace objects.
drm: add fault handler support so as to be more like possible upstream
drm: userspace rip out TTM API
drm: remove object hash
drm: remove unneeded debugging
modesetting: pick_crtcs can't be static
i915/radeon: use rmmap locked
drm: fixup master code to use krefs
drm: remove unused types
radeon: don't use ring if cp not going
radeon: add userspace mm enable switch
drm: finish bo after lastclose
radeon: fix blit due to registers wrong
radeon: fix setting new memmap in right place
pcigart: fixup memset + remove wbinvd
drm: don't teardown things in modeset paths
radeon: just evict to TT not cached
radeon: fixup PCI GART table with GEM enabled
radeon: add initial support for legacy crtc/encoders.
radeon: FEDORA: add old DMA buffers on top of GEM
radeon: add userspace call for mm support check
radeon: make buffer swap for older drivers work again on GEM
radeon: use mm_enabled variable to denote memory manager running
radeon: remove debugging
radeon: FEDORA: patch to make 3D driver work
radeon: fix kernel_mm properly
Merge branch 'radeon-gem-cs' into modesetting-gem
i915: fixup from last merge hopefully
radeon: add copy/solid regs for rn50
radeon: add support for memory map init
radeon: fix LVDS modes problem
radeon: reserve 64k of VRAM for now for text mode so we don't trample it
radeon: oops set correct scratch
drm: add gpu create script
drm: add memory clean flag.
radeon: fixup domains and use them properly
drm/ttm: export drm_bo_add_ttm
drm: add move zero function to memset unclean buffers
radeon/ttm: add support for zeroing the contents of VRAM buffers
radeon: avoid oops on encoders with no crtc set
radeon: braino pointed out on mailing list
drm: fix some whitespace
radeon: fixup checks for crtc in dpms paths
radeon: limit LVDS to first CRTC for now
drm: port X crtc picking algorithm.
radeon: get lvds atombios info
radeon: fixup LVDS mode getting
radeon: fixup a number of avivo checks for rs690
radeon: rs690 GART tables need to be in uncached memory.
radeon: change interface from headers add pin_domain into padding
modesetting: Add helper to force restore modes on crtcs at resume time
radeon: add initial suspend/resume support
make text reserve 256k
radeon: don't do full edid for detection purposes
radeon: remove unneeded debugging
radeon: sort out atom vs combios tables for r400 cards
radeon: fixup reference counting properly
radeon: fix return value
radeon: do proper memory controller init and setup
radeon: fail properly if we can't create the ring.
radeon: disable blit moves
radeon: fixup GEM domain setting - allows more userspace paths
radeon: fixup buffer and cs bits
fixup radeon stuff - need to checkout irqs
radeon: tmds bracket failure found by krh.
radeon: fix voverplus calculation
drm: fix brace placement
radeon: fix minor cursor issues
radeon: add parsing for r6xx object tables
radeon: add r600 modesetting registers writes
Merge remote branch 'origin/master' into modesetting-gem
Merge remote branch 'origin/modesetting-gem' into modesetting-gem
drm/radeon: fixup clean flag handling
radeon: fix pin ioctl interface to mesa can find offset for pinned buffers
radeon: fix alignment so Xv works again
drm/radeon: initial suspend/resume fix.
drm: add discardable flag.
radeon: use discardable flags on no backing store objects
drm: remove stray debug code
radeon: move memcpy until after CP is stopped
radeon: fix buffer copying for VRAM->TT
radeon: re-enable hw blits for copying from VRAM
radeon: fixup suspend/resume bus master enable
radeon: fixup interrupt suspend/resume
radeon: add CS support for r100/r200 in 2D driver
radeon: add initial agp support.
libdrm: don't depend or link to libdrm_intel
link libdrm_intel properly
drm: make handles 32-bits again not sure why they changed
radeon: add some more r100 support to test AGP
radeon: fix unused agp functionality
radeon: export radeon_modeset
radeon: don't enable dynclks on rs48x
radeon: workaround failure to parse some rs48x edid
radeon: fix small typo in agp code
radeon: fix some warnings
radeon: make writeback work again
radeon: fixup scratch register interactions properly
radeon: update proper chip family
radeon: fix accessible VRAM sizing
radeon: pull bus master enable into its own function
radeon: add r423 bits to modesetting
radeon: release agp on module unload
radeon/drm: fixup ref counting in on fb objs
radeon: make new CS2 command submission interface port older interface to this
radeon: don't copy to user the cs ids
radeon: CS2 make it all work with new relocs style
radeon: fix free after refcount
radeon: fix some warnings
radeon: remove unused gem indirect ioctl
radeon: rs480 fixes for bus mastering
radeon: add wait rendering API
radeon: only enable dynclks if asked for
radeon: add proc debugging for interrupts/ring
radeon: fix race in sysfs
radeon: overhaul ring interactions
radeon: add more debugging
radeon: setup isync cntl properly
radeon: enable DVI-D + HDMI connectors.
radeon: set dma bufs bo type to a kernel type
radeon: add more HDMI bits
radeon: commit ring after emitting the buffer discards
radeon: disable debugging message
radeon: disable AGP for certain chips if not specified until we figure it out
radeon: add mtrr support for VRAM aperture.
radeon: fix ROP values for the paint ROP
radeon: make build again
radeon: fixup vram visible calculation to take a/c pinned objects for now
radeon: force all ring writes to 16-dword alignment.
radeon: disable HDP read cache for now
radeon: fix ring tail overflow issue since alignment
drm/radeon: add uncached allocator to drm ttm code.
modesetting: set the crtc x,y after the mode base change
radeon: avivo cursors are across the full surface.
drm/radeon: add dpms connector functions
radeon: fix fence race condition hopefully
radeon: upgrade atom headers
radeon: add gart useable size to report to userspace
drm/bo: fix stupid lock imbalance
libdrm: bump to 2.4 for lib version
radeon: only write irq regs if irq is enabled
David Airlie (20):
mode: fixup problems with framebuffer add function
fixup numerous issues with adding framebuffer support
set the base address of the CRTC correctly
export output name to userspace
re-tab and fixup the i915GM get core clock function to actually work
fixup true/false in intel_sdvo.c
fixup sarea writes for set pipe base and dpms
add sdvo debugging output
fixup calculation to make sdvo work
use fb pitch and fix up some whitespace
add an fb count + id get to the get resources code path
add support for setting a framebuffer depth
fixup framebuffer depth
oops for 32 pitch.. hey I can see stuff on fbcon now.. it looks like text.. just a bit garbled
line_length calculation was incorrect.. I now can get fbcon to run
revert LVDS destroy - this oops on sysfs on sdvo init of i2c bus
export drm_bo_driver_finish symbol
i915/drm: clean up a lot of the i915/drm startup/teardown sequences
clean up ring buffer and TTM in i915_driver_unload
WIP more code for radeon
Eric Anholt (11):
Add required permission notices for code copied from X.Org source.
intel: Protect bufmgr objects with a pthread mutex.
intel: Add a function for setting (GTT,GTT) domain, for use by UXA.
Bump version to 2.4.2 to signal new libdrm_intel functions.
intel: Remove the mapped flag, which is adequately covered by bo_gem->virtual.
intel: don't let named buffers into the BO cache.
intel: don't skip set_domain on mapping of shared buffers.
libdrm: Fix modetest/modeprint to use automake stuff.
intel: Sync GEM ioctl comments for easier diffing against the kernel.
intel: Remove linux build of i915 DRM, as it's unmaintained and a user trap.
intel: Rename plane[AB]* back to pipe[AB]*.
Hong Liu (11):
Porting DVO stuff
fix removing output_attrs
clear interrupt status before install irq
add sysfs entry for DVO output
fixup i915 workqueue handling when modeset=1
fix G33 hardware status page in modeset
modeset init code cleanup
free dummy read page if fail to init mm
fix kernel oops when removing fb
i915: init bo mm at driver init only when modeset=1
i915: check dummy page before freeing
Jakob Bornecrantz (44):
add addfb/rmfb ioctls
Added debug messages so we know which output we are dealing with
Fix offset should from pci device address
Lvds now power up backlight on commit
Cleaned up userspace interface for modesetting.
Fix unlocking of spinlock when we should not
Changed mode config spinlock to mutex
Added small modesetting test
Modesetting Hotplug
Fix and cleanup of Hotplug
Fixed build
Updated test mode and added modedemo
Added fixed misc framebuffer problems
Updated the modedemo test
Panning now works without modeset
Fix for X axis panning problem
Made radeon_ms not always compile
Added cursor support
Misc panning fixes for intel_fb
ModeFB demo now display cursor
Fix for cursor off
Modedemo now uses two crtc and output pairs
Small update to modedemo
Added hotplug ioctl
Added kernel part of hotplug ioctl
Added userspace part of hotplug ioctl and demo
Wrong open call
Added you can now clone displays in modedemo
drm: Made set_config use drm_mode_set as a argument
i915: Fixed indent in intel_fb.c
i915: Changed intel_fb to use the new drm_crtc_set_config interface
i915: execbuf now works without i915_dma_init being called
tests: Improved and renamed the mode app to modeprint
tests: Updated modeprint
tests: modeprint s/fb/fd/
tests: Fix faulty error messages in modeprint
Seperate modesetting userspace bits into drm_mode.h
mode: Indent defines
mode: Try to settle on a standard for struct fields
mode: Unify types for ids and strings
mode: Remove hotplug support from ioctl interface
mode: Unify userspace API to uint_t
mode: Reorder the ioctls and numbering
mode: Minor reodering and renaming
Jerome Glisse (55):
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into modesetting-101
drm: split edid handling in get_edid & add_edid_mode
drm: check edid data, so we deal well with broken driver.
drm: fix dead lock in drm_buffer_object_transfer
drm: don't reset to 0 irq_enabled when client open file descriptor
radeon_ms: radeon modesetting first commit.
radeon_ms: avoid to unintialize things which haven't been initialized
Merge commit 'origin/modesetting-101' into modesetting-radeon
radeon_ms: update to lastest fb change
radeon_ms: fix fbcon by fixing palette
radeon_ms: fix pll computation to follow hw constraint
radeon_ms: add sarea & install header
radeon_ms: update to follow lastest modesetting change
radeon_ms: add rom parsing & adapt code
radeon_ms: cope with lastest drm modesetting change
radeon_ms: use radeon connector type insted of drm
radeon_ms: bring radeon_ms up to date with lastest changes
radeon: remove TTM from an earlier merge
rradeon_ms: rework fence code and bring radeon ms up to date
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
radeon_ms: fix fence
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
radeon_ms: this is a modesetting driver, bring things up to date
radeon_ms: add hang debuging helper functions
radeon_ms: initial pass at command buffer validation
radeon_ms: small fix & cleanup to command checking
radeon_ms: fixes fb handling
radeon_ms: add crtc set base callback & fix palette
radeon_ms: check for NULL fb
radeon_ms: fix framebuffer code
radeon_ms: another fb fix reset mode if fb changed
radeon_ms: command buffer validation use array of function pointer
radeon_ms: rework command submission ioctl & cleanup
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
radeon: radeon util library
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon: reloc are backend dependant
radeon: libdrm_radeon updates bo & cs interfaces
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon: debug bo
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon: libdrm_radeon add handle to debug string
radeon: lib radeon add bo & cs gem backend
libdrm-radeon: update libdrm-radeon to match current CS relocation structures
radeon: add more packet3 relocations handling
libdrm-radeon: be verbose on bo failure and cleanup cs a bit
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
radeon+libdrm-radeon: change relocation informations
libdrm-radeon: new tracker tools
libdrm-radeon: unreference buffer once cs stream is submited or on cs clean
libdrm-radeon: unref return current BO ptr to reflect BO destruction
libdrm-radeon: add print callback to cs & small fixes
radeon: protect cs ioctl atomic part with a mutex
gem: protect idr_pre with the spinlock
Revert "gem: protect idr_pre with the spinlock"
Jesse Barnes (141):
Add copyrights before I forget
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
make drmP.h include drm_crtc.h for CRTC related stuff.
various cleanups to EDID code:
document drm_mode_duplicate and fix vrefresh calculation (off by 1000 error)
just codingstyle cleanups
remove a printk to make things less verbose
Fix refresh calculation (mistakenly removed 1000 factor needed for integer calulations, fixed mode printout debugging routine instead).
Slam in most of X.Org's i830_lvds (not quite done yet so removed from Makefile.kernel too).
Finish bringing in LVDS code, re-add to Makefile. Needed other changes too:
Remove some delays from Intel i2c code, we'll need a more comprehensive fix
Remove some debug #if 0 codes and add a reminder to check locking around
Add save/restore state for LVDS code, along with a few other LVDS related
Move i915 init code to new file, i915_init.c, and create a new high level
Export drm_setup for use by new driver init code.
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Various changes for in-kernel modesetting:
Fixup DDC probing. We only have one DDC bus so we have to use it only
export vblank routine for use by intel_display.c and intel_sdvo.c.
fix modeset cleanup for LVDS and reenable it in i915.
Fix EDID pixel clock calculation.
Whitespace cleanups.
Fix i2c unregistration, cleanup panel_fixed_mode assignment.
Add aperture size and preallocation probing (from intelfb), cleanup load code to be more general.
Add new buffer object type for kernel allocations that don't initially have a user mapping.
Use new kernel buffer object type and cleanup agp probing.
Remove debug statement about buffer objects
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Revert "Export drm_setup for use by new driver init code.", we don't really want to use this function
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Whitespace cleanup
Move i2c init back to where it belongs and add i2c unregistration in *_destroy.
Don't use drm_setup, do SAREA allocation and mapping directly instead.
Initialize the hw lock waitqueue so we don't hang in drm_lastclose.
Don't need a NULL check prior to calling kfree.
Fix 945+ hotplug detection, remove some unused variables.
Add new function for getting a CRTC pointer given a pipe number.
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.
Oops, forgot to push the msleep() in the hotplug test. Wouldn't want to
Move driver load call to after AGP init, in case the load routine needs AGP stuff.
Fix PRIV0 memory initialization (mm_init takes pages, not bytes), align fb
Use drm_mem_reg_ioremap to map buffer object.
Add prototypes for drm_bo_init_mm and drm_buffer_object_create for use by
Cleanup whitespace, rename macro argument.
Move initial framebuffer allocation and configuration to drm_initial_config,
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Add framebuffer bo freeing to drm_mode_config_cleanup (seems like the best
Just use drm_output_destroy to cleanup LVDS failures. It'll call our cleanup
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Document main drm_crtc.c functions, and rename drm_crtc_mode_create to
Add a mode name generation wrapper to make name format changes easier.
Document drm_modes.c functions.
Add a monitor information structure separate from the EDID data for tracking
Oops, edid data should just be a char *, as edid.h is private to edid.c
Fix FB pitch value (we had it wrong and were working around it in a few
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Remove unused edid.h header from X.Org.
Add locking. The main lock is dev->mode_config.config_lock. It should be
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Call preallocated space VRAM instead of PRIV0 to be more consistent with
Suspend/resume support (incomplete).
Suspend/resume shouldn't call drm_initial_config (seems to work ok for me now),
Merge branch 'master' into modesetting-101 - TTM & typedef removal
Add 965GM macro bits
Cleanup SDVO debug output
Remove buffer object user list check in drm_bo_destroy_unlocked
Move map hash destruction to after driver unload hook is called
Hack out i915_mem_takedown
Merge branch 'master' into modesetting-101
Use user copy routines for writing modes & ids back to userspace
Fix typo in copy_to_user calls
Fix connection status ABI
Don't use panel fitter if we're programming a native mode
Don't free driver mapped locks
i915: initial (and untested) TV out support
Improved DRM sysfs support
Add devname in modeset case
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Fixup sysfs output registration
Add newline to debug output for output add
Port pipe reservation code for load detection
Fix TV load detection
Add TV out hotplug detection
Keep display info in struct display_info
Fix masking in get_load_detect_pipe
Remove structure fields & code
Split TV property creation into its own routine
Fixup Intel TV property code
i915: allocate devname at init time
i915: add basic VBT support
i915: use BDB TV flag for TV detection
i915: TV hotplug fixes
i915: register definition & header file cleanup
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
drm_mode_debug_printmodeline doesn't need struct drm_device *
i915: do a better job of parsing VBIOS data
i915: unmap BIOS when we're done with it
Fix crash in drm_mode_connector_update_edid_property
i915: use kzalloc to allocate intel_output for lvds
sysfs registration/teardown fixups
Add EDID quirk handling
Merge commit 'origin/drm-gem' into modesetting-gem
Merge commit 'origin/drm-gem' into modesetting-gem
Use GEM in modesetting
i915: switch back to fbcon on panic
Merge branch 'modesetting-101' into modesetting-gem
i915: use WC mapping for framebuffer screen_base
Merge commit 'origin/drm-gem' into modesetting-gem
i915: cleanup PCI state before disabling MSI
i915: add blanking support to intelfb
Merge branch 'drm-gem' into modesetting-gem
Make modesetting-gem build with recent kernels
Export a generic dri_bo handle for use by clients
Add error checking to framebuffer creation
Merge branch 'master' into modesetting-gem
Merge branch 'modesetting-101' into modesetting-gem
i915: setup hardware status page if physical addrs are required
i915: update cursor handling to use GEM objects
i915: set domain properly on fb mapping, flush out changes
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
i915: finish removing TTM bits
intel bufmgr: reinstate buffer handle tracking
libdrm: fix ABI change in drm_mode_get_encoder
libdrm: add support for i915 GTT mapping ioctl
libdrm_intel: fix warnings on 64 bit
Merge branch 'master' into modesetting-gem
Update modetest
libdrm_intel: fix merge error
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
DRM: make drm_map_type match kernel
DRM: make drm_map_type match upstream kernel
Merge branch 'master' into modesetting-gem
Merge branch 'master' into modesetting-gem
Merge branch 'master' into modesetting-gem
Merge branch 'modesetting-gem'
Update .gitignore with new modetest program
Bump version to 2.4.3 to reflect addition of mode setting header
Revert "Merge branch 'modesetting-gem'"
libdrm: add mode setting files
Remove executable from modeprint test dir
Julien Cristau (3):
Make libdrm-dev depend on libdrm-intel1.
Restrict the libdrm-dev dep on libdrm-intel1 to x86
Fix typo in Vcs-Browser control field (closes: #507898).
Keith Packard (5):
[intel] remove settable use_mi_batchbuffer_start
intel: Dump out memory usage information when the kernel fails to pin
intel: return error status from drm_intel_gem_bo_map
intel: Debug output %u vs uint64_t warning fix
intel: Cache tiling/swizzle state in user mode. Reset tiling on reuse.
Kristian Høgsberg (15):
Clean up and return if no outputs are found.
Initialize rwlock using rwlock_init to appease lockdep validator.
Make radeon_ms compile.
Make via compile.
Fix ivch i2c read function to use the "special" i2c format.
Use lowercase bool constants.
Merge commit 'origin/drm-gem' into ms-gem
Add back flink, open and close ioctls.
Make it compile again.
Merge commit 'origin/master' into modesetting-gem
Merge commit 'origin/drm-gem' into modesetting-gem
Store the buffer object backing the fb as a void pointer, not a handle.
radeon: Fix type in check for tmds type.
Update intel modesetting to use mm_private instead of mm_handle.
modetest: Print more stuff. Prettier.
Maarten Maathuis (59):
NV50: Initial import of kernel modesetting.
Undo something i didn't want to change.
NV50: A few minor added safeties + cleanup.
fix typo
NV50: Fix a few more possible leaks.
nouveau: disable KMS for pre-NV50 even when specifically enabled
NV50: Improve set_config and fix some minor bugs.
libdrm: check for allocation failure
[modesetting-101] update mode count after fill_modes.
NV50: fix some misc bugs
NV50: These are actually errors.
NV50: fix cursor hide/show
NV50: fix a few misc things
NV50: minor change
NV50: Some cleanup and fixes.
NV50: i misunderstood NOUVEAU_MEM_INTERNAL, so remove it
modesetting-101: Make dpms property optional + misc cleanup.
Revert "modesetting-101: Make dpms property optional + misc cleanup."
[modesetting-101] tab-cleanup
NV50: Implement DPMS.
NV50: A minor change.
[modesetting-101] Actually store properties when being changed.
Change some obviously wrong things about property blobs, still broken though.
NV50: use list_head item instead of list_head head to avoid confusion
NV50: some i2c cleanup
NV50: switch to fixed point scale factor calculations
NV50: basic fbcon + misc fixes
[libdrm] count connectors and such has no place in a crtc object
Forgot to fix the modeprint test.
[modeseting-101] add connected field to sysfs
NV50: replace active by enabled
[drm-sysfs] connected is ambigious in the context of a connector, replace with enabled
nv50: s/FALSE/false && s/TRUE/true
libdrm: fix typo in comment
[modesetting-101] Add subconnector and select_subconnector properties.
modesetting-101: Move some defines used for enumeration into the public header.
Forgot the 0'th element for the tv property.
modesetting-101: tv_left_margin_property shouldn't be immutable.
modesetting-101: Make the interface variable names a little more consistent + modeprint changes.
NV50: fix switch_fb and connector_is_digital
NV50: remove edid when monitor is gone, improve fbcon, misc fixes
NV50: minor fix
modesetting-101: rename modeflags, as to avoid conflicts with the xorg definitions
modesetting-101: Rename DPMS modes to avoid compatibility issues with xorg definitions.
NV50: fix minor bug in fbcon crtc selection
NV50: init gamma storage
drm: As a workaround don't tear down sg with a modesetting driver.
modesetting-101: implement optional scaling and dithering properties
modesetting-101: set_property should return an int, not a bool
NV50: LVDS always needs some kind of gpu scaling
modesetting-101: Only store property value when set_property was successful.
NV50: delay changing gpu<->non-gpu scaling modes until next modeset
NV50: Do detect with hpd and load detect if possible.
NV50: Use bios table for load pattern when possible.
NV50: don't fail on LVDS by default
NV50: Don't create a "native" mode for LVDS when there is none.
NV50: call drm_sysfs_hotplug_event when appropriate
NV50: enable hotplug irq
NV50: minor changes
Robert Noland (1):
[FreeBSD] Fix build on FreeBSD after modesetting import.
Stephane Marchesin (1):
Unbreak drm build.
Thomas Hellstrom (9):
Merge branch 'master' into modesetting-101
Buffer flags and masks are 64-bit.
Merge branch 'master' into modesetting-101
Merge branch 'master' into modesetting-101
Merge branch 'master' into modesetting-101
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Merge branch 'master' into modesetting-101
root (3):
Revert "Remove some delays from Intel i2c code, we'll need a more comprehensive fix"
Large changes for fbdev support.
silence warning
---
.gitignore | 2
bsd-core/drm_mode.h | 1
configure.ac | 4
debian/changelog | 1077 ++++++++++++++++
debian/control | 4
debian/rules | 2
libdrm/Makefile.am | 5
libdrm/intel/intel_bufmgr.h | 14
libdrm/intel/intel_bufmgr_gem.c | 281 +++-
libdrm/xf86drm.c | 44
libdrm/xf86drm.h | 6
libdrm/xf86drmMode.c | 686 ++++++++++
libdrm/xf86drmMode.h | 258 ++++
linux-core/Makefile | 9
linux-core/Makefile.kernel | 6
linux-core/drm_mode.h | 1
shared-core/Makefile.am | 1
shared-core/drm.h | 30
shared-core/drm_mode.h | 273 ++++
shared-core/i915_drm.h | 68 -
shared-core/nv50_graph.c | 6
shared-core/nv50_grctx.h | 2542 +++++++++++++++++++++++++++++++++++++---
shared-core/radeon_irq.c | 6
tests/Makefile.am | 4
tests/dristat.c | 2
tests/modeprint/Makefile.am | 13
tests/modeprint/modeprint.c | 402 ++++++
tests/modetest/Makefile.am | 13
tests/modetest/modetest.c | 470 +++++++
29 files changed, 5986 insertions(+), 244 deletions(-)
---
Reply to: