Hi Linus,
one of the smaller drm -next pulls in ages!
Ben (nouveau) has a rewrite in progress but we decided to leave it stew
for another cycle, so just some fixes from him.
radeon: lots of documentation work, fixes, more ring and locking changes,
pcie gen2, more dp fixes,
i915: haswell features, gpu reset fixes, /dev/agpgart removal on machines
that we never used it on, more VGA/HDP fix., more DP fixes
drm core: cleanups from Daniel, sis 64-bit fixes, range allocator
colouring.
but yeah fairly quiet merge this time, probably because I missed half of
it!
Dave.
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux.git drm-next
for you to fetch changes up to 98c7b42375011ec37251e6fc85a0471cfe499eea:
Merge branch 'drm-intel-fixes' of
git://people.freedesktop.org/~danvet/drm-intel into drm-next (2012-07-26
10:40:31 +1000)
----------------------------------------------------------------
Alex Deucher (18):
drm/radeon: clean up CS functions in r100.c
drm/radeon: move r100_enable_bm to a more logic place
drm/radeon: update ib_execute for SI (v2)
drm/radeon: remove radeon_ring_index()
drm/radeon: update rptr saving logic for memory buffers
drm/radeon: add rptr save support for r1xx-r5xx
drm/radeon: document radeon_device.c (v2)
drm/radeon: document radeon_kms.c
drm/radeon: document radeon_irq_kms.c
drm/radeon: document radeon_asic.c
drm/radeon: document radeon_fence.c (v2)
drm/radeon: document radeon_ring.c (v4)
drm/radeon: document non-VM functions in radeon_gart.c (v2)
drm/radeon: document VM functions in radeon_gart.c (v3)
drm/radeon: start to document the functions r100.c
drm/radeon: start to document evergreen.c
drm/radeon: fix up pll selection on DCE5/6
drm/radeon: fix SS setup for DCPLL
Ander Conselvan de Oliveira (1):
drm/i915: mask tiled bit when updating ILK sprites
Ben Skeggs (5):
drm/nouveau: dcb table quirk for fdo#50830
drm/nouveau/gem: fix object reference leak in a failure path
drm/nouveau: move current gpuobj code out of nouveau_object.c
drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
Ben Widawsky (29):
drm/i915: timeout parameter for seqno wait
drm/i915: improve i915_wait_request_begin trace
drm/i915: wait render timeout ioctl
drm/i915: s/i915_wait_request/i915_wait_seqno/g
drm/i915: Dynamic Parity Detection handling
drm/i915: enable parity error interrupts
drm/i915: remap l3 on hw init
drm/i915: l3 parity sysfs interface
drm/i915: Inifite timeout for wait ioctl
drm/i915: Add wait render timeout get param
drm/i915: CXT_SIZE register offsets added
drm/i915: preliminary context support
drm/i915: context basic create & destroy
drm/i915: context switch implementation
drm/i915: Ivybridge MI_ARB_ON_OFF context w/a
drm/i915: PIPE_CONTROL_TLB_INVALIDATE
drm/i915: possibly invalidate TLB before context switch
drm/i915: use the default context
drm/i915: add ccid to error state
drm/i915: switch to default context on idle
drm/i915/context: create & destroy ioctls
drm/i915/context: switch contexts with execbuf2
drm/i915: reset the GPU on context fini
drm/i915: disable contexts on old HW
drm/i915: set IDICOS to medium uncore resources
drm/i915: linuxify create_hw_context()
drm/i915/context/: s/CTX/CXT
drm/i915/context: Add missing IVB context sizes
drm/i915: missing error case in init status page
Chris Wilson (18):
drm/i915: All members of gen4 have hotplug, so unconditionally enable its
irq
drm/i915: Inspect the right status bits for DP/HDMI hotplug on gen4
drm/i915: SDVO hotplug have different interrupt status bits for
i915/i965/g4x
drm/i915/hdmi: Query the live connector status bit for G4x
drm/i915/dp: For consistency use the DP hotplug synonyms
drm/i915/hdmi: Fix reg values for g4x_hdmi_connected
drm/i915: Switch off FBC when disabling the primary plane when obscured
drm/i915: Group the GT routines together in both code and vtable
drm/i915: Implement w/a for sporadic read failures on waking from rc6
drm: Add colouring to the range allocator
drm/i915: Only request PM interrupts for the events we handled
drm/i915: Disable the BLT on pre-production SNB hardware
drm/i915: Add comments to explain the BSD tail write workaround
drm/i915: Insert a flush between batches if the breadcrumb was dropped
drm/i915: Make the lock for pageflips interruptible
drm/i915: Flush the context object from the CPU caches upon switching
drm/i915: Add -EIO to the list of known errors for __wait_seqno
drm/i915: fix invalid reference handling of the default ctx obj
Christian Koenig (4):
drm/radeon: remove some unneeded structure members
drm/radeon: fix & improve ih ring handling v3
drm/radeon: apply Murphy's law to the kms irq code v3
drm/radeon: replace pflip and sw_int counters with atomics
Christian K?nig (22):
drm/radeon: remove radeon_fence_create
drm/radeon: add infrastructure for advanced ring synchronization v2
drm/radeon: rework ring syncing code
drm/radeon: replace vmram_mutex with mclk_lock v2
drm/radeon: replace cs_mutex with vm_mutex v3
drm/radeon: add error handling to fence_wait_empty_locked
drm/radeon: add error handling to radeon_vm_unbind_locked
drm/radeon: fix fence related segfault in CS
drm/radeon: fix ring commit padding
drm/radeon: fix fence value access
drm/radeon: fix fence init after resume
drm/radeon: remove FIXME comment from chipset suspend
drm/radeon: make cp init on cayman more robust
drm/radeon: remove ip_pool start/suspend
drm/radeon: remove r600_blit_suspend
drm/radeon: remove vm_manager start/suspend
drm/radeon: move radeon_ib_ring_tests out of chipset code
drm/radeon: record what is next valid wptr for each ring v4
drm/radeon: implement ring saving on reset v4
drm/radeon: return an error if there is nothing to wait for
drm/radeon: let sa manager block for fences to wait for v2
drm/radeon: fix const IB handling v2
Dan Carpenter (3):
drm/i915/bios: cleanup return type of intel_parse_bios()
drm/radeon: check for allocation failure in radeon_ring_backup()
drm/i915: dereferencing an error pointer
Daniel Vetter (76):
drm/i915: clarify preferred sdvo input mode code
drm/i915: don't silently ignore sdvo mode_set failures
drm/i915: there's no cxsr on ilk
drm/i915: reuse the sdvo tv clock adjustment in ilk mode_set
drm/i915: s/mdelay/msleep/ in the sdvo detect function
drm/i915: ivybridge_handle_parity_error should be static
drm/i915: initialize the parity work only once
drm/i915: simplify sysfs setup code
Merge remote-tracking branch 'airlied/drm-prime-vmap' into
drm-intel-next-queued
drm/i915: clarify IBX dp workaround
drm/i915: extract object active state flushing code
drm/i915: compute the target_clock for edp directly
drm/i915: adjusted_mode->clock in the dp mode_fixup
drm/i915: don't chnage the original mode in dp_mode_fixup
drm/i915: implement IBX hdmi transcoder select workaround
drm/i915: assert that the IBX port transcoder select w/a is implemented
drm/i915: ensure HDMI port is disabled inside set_infoframes
drm/i915: pnv has a backlight polarity control bit, too
drm/i915: clear up backlight #define confusion on gen4+
drm/i915: properly enable the blc controller on the right pipe
drm/i915: allow pipe A for lvds on gen4
agp/intel-gtt: remove dead code
drm/i915: stop using dev->agp->base
agp/intel-gtt: don't require the agp bridge on setup
drm/i915 + agp/intel-gtt: prep work for direct setup
agp/intel-gtt: move gart base addres setup
drm/i915: call intel_enable_gtt
drm/i915: kick any firmware framebuffers before claiming the gtt
drm/i915: ensure context objects are bound to the global gtt
drm/i915/crt: Do not rely upon the HPD presence pin
drm/i915: fixup hangman rebase goof-up
drm/i915: fix module unload after context merge
drm/i915: initialize the context idr unconditionally
drm/i915: return -ENOENT if the context doesn't exist
drm/i915/context: shut up compiler
drm/i915: simplify context_idr_cleanup
drm/i915: return -ENODEV if hw context are not supported
drm/i915: don't call modeset_init_hw in i915_reset
drm/i915: disable flushing_list/gpu_write_list
Merge tag 'v3.5-rc4' into drm-intel-next-queued
drm/i915: wrap up gt powersave enabling functions
drm/i915: make enable/disable_gt_powersave locking consistent
drm/i915: don't use dev->agp
drm/i915: disable drm agp support for !gen3 with kms enabled
agp/intel-agp: remove snb+ host bridge pciids
drm/i915: "Flush Me Harder" required on gen6+
drm/i915: fix up ilk rc6 disabling confusion
drm/i915: don't trylock in the gpu reset code
drm/i915: non-interruptible sleeps can't handle -EAGAIN
drm/i915: don't hang userspace when the gpu reset is stuck
drm/i915: properly SIGBUS on I/O errors
drm/i915: don't return a spurious -EIO from intel_ring_begin
drm/i915: introduce crtc->dspaddr_offset
drm/i915: adjust framebuffer base address on gen4+
drm/i915: introduce for_each_encoder_on_crtc
drm/fb-helper: delay hotplug handling when partially bound
drm/fb helper: don't call drm_crtc_helper_set_config
drm: remove the list_head from drm_mode_set
drm/via: clean up reclaim_buffers
drm/sis: clean up reclaim_buffers
drm: kill reclaim_buffers_idlelocked functions
Revert "Revert "drm/i810: cleanup reclaim_buffers""
drm: kill reclaim_buffers_locked
drm/savage: clean up reclaim_buffers
drm: kill reclaim_buffers callback
drm: ditch strange DRIVER_DMA_QUEUE only error bail-out
drm: kill dma queue support
drm: unconditionally clean up dma buffers of closing clients
drm: kill i915/i830 ids from drm_pciids.h
drm/sis: fixup sis_mm ioctl structs
drm/i915: fix up PCH backlight #define mixup
drm/i915: check whether we actually received an edid in detect_ddc
drm/i915: kill intel_ddc_probe
drm/i915/lvds: ditch ->prepare special case
drm/i915: constify mode in crtc_mode_fixup
drm/i915: unbreak lastclose for failed driver init
Dave Airlie (14):
Merge tag 'drm-intel-next-2012-06-04' of
git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux
into drm-core-next
Merge tag 'drm-intel-next-2012-06-21-merged' of
git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
Merge tag 'drm-intel-next-2012-07-06' of
git://people.freedesktop.org/~danvet/drm-intel into drm-next
drm: fail gracefully when proc isn't setup.
Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux
into drm-next
Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux
into drm-next
pci_regs: define LNKSTA2 pcie cap + bits.
drm/pci: add support for getting the supported link bw.
drm/radeon/kms: auto detect pcie link speed from root port
drm/udl: port over blanking code from udlfb.
Merge tag 'v3.5-rc7' into drm-next
Merge branch 'drm-nouveau-fixes' of
git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Merge branch 'drm-intel-fixes' of
git://people.freedesktop.org/~danvet/drm-intel into drm-next
Devendra Naga (1):
drm/mgag200: fix null pointer dereference
Eric Anholt (1):
drm/i915: Set the context before setting up regs for the context.
Eugeni Dodonov (13):
drm/i915: properly wait for SBI status
drm/i915: support Haswell force waking
drm/i915: add RPS configuration for Haswell
drm/i915: slightly improve gt enable/disable routines
drm/i915: enable RC6 by default on Haswell
drm/i915: disable RC6 when disabling rps
drm/i915: introduce haswell_init_clock_gating
drm/i915: enable RC6 workaround on Haswell
drm/i915: move force wake support into intel_pm
drm/i915: re-initialize DDI buffer translations after resume
drm/i915: prevent bogus intel_update_fbc notifications
drm/i915: program FDI_RX TP and FDI delays
drm/i915: initialize power wells in modeset_init_hw
Ilija Hadzic (2):
drm/ttm: remove stale declaration and field
drm: track dev_mapping in more robust and flexible way
Jerome Glisse (7):
drm/radeon: add an exclusive lock for GPU reset v2
drm/radeon: improve GPU lockup debugging info on r6xx/r7xx/r8xx/r9xx
drm/radeon: fix bo creation retry path
drm/radeon: fix non revealent error message
drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)
drm/radeon: on hotplug force link training to happen (v2)
drm/radeon: fix dpms on/off on trinity/aruba v2
Jesper Juhl (1):
drm/i915/sprite: Fix mem leak in intel_plane_init()
Jesse Barnes (19):
drm/i915: add min freq control to debugfs
drm/i915: disable RCBP and VDS unit clock gating on SNB and VLV
drm/i915: load boot context at driver init time
drm/i915: add TDL unit clock gating disable for VLV
drm/i915: add L3 bank clock gating disable on VLV
drm/i915: ValleyView mode setting limits and PLL functions
drm/i915: add ValleyView specific CRT detect function
drm/i915: add HDMI and DP port enumeration on ValleyView
drm/i915: access VLV regs through read/write switch
drm/i915: VLV VGA port only handles on & off, like PCH VGA
agp/intel: allow cacheable and GDFT PTEs on ValleyView
agp/intel: use correct GTT offset on VLV
drm/i915: don't enable PPGTT on VLV yet
drm/i915: support page flipping on ValleyView
drm/i915: enable display messages to GT on ValleyView
drm/i915: bind driver to ValleyView chipsets
drm/i915: mask tiled bit when updating IVB sprites
drm/i915: correct IVB default sprite format
drm/i915: prefer wide & slow to fast & narrow in DP configs
Laurent Pinchart (2):
drm: Disallow DRM_IOCTL_MODESET_CTL for KMS drivers
drm: Make the .mode_fixup() operations mode argument a const pointer
Maarten Lankhorst (1):
nouveau: Fix alignment requirements on src and dst addresses
Marcin Slusarz (3):
drm/nv84: decode PCRYPT errors
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
drm/nouveau: init vblank requests list
Michel D?nzer (1):
drm/radeon: Try harder to avoid HW cursor ending on a multiple of 128
columns.
Paulo Zanoni (18):
drm/i915: add set_infoframes to struct intel_hdmi
drm/i915: properly alternate between DVI and HDMI
drm/i915: only set the HDMI port on the DIP once
drm/i915: enable DIP before enabling each InfoFrame
drm/i915: don't wait for vblank while writing InfoFrames
drm/i915: explicitly disable the DIPs we're not using
drm/i915: disable DIP while changing the port
drm/i915: don't write 0 to DIP control at HDMI init
drm/i915: don't set SDVO_BORDER_ENABLE when we're HDMI
drm/i915: remove comment about HSW HDMI DIPs
drm/i915: add some barriers when changing DIPs
drm/i915: fix PIPE_WM_LINETIME definition
drm/i915: add PCH_NONE to enum intel_pch
drm/i915: get rid of dev_priv->info->has_pch_split
drm/i915: don't ironlake_init_pch_refclk() on LPT
drm/i915: fix PIPE_DDI_PORT_MASK
drm/i915: try to train DP even harder
drm/i915: don't forget the PCH backlight registers
Sachin Kamat (1):
drm: Add missing static storage class specifier
Seth Forshee (1):
drm/i915: ignore pipe select bit when checking for LVDS register
initialization
Shobhit Kumar (1):
drm/i915: Enable DP panel power sequencing for ValleyView
Sjoerd Simons (1):
drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
Ville Syrj?l? (2):
drm/i915: Zero initialize mode_cmd
drm/i915: Reject page flips with changed format/offset/pitch
Yuanhan Liu (1):
drm: use format %d to print error code
drivers/char/agp/intel-agp.c | 16 +-
drivers/char/agp/intel-agp.h | 3 -
drivers/char/agp/intel-gtt.c | 91 +-
drivers/gpu/drm/ast/ast_mode.c | 6 +-
drivers/gpu/drm/cirrus/cirrus_mode.c | 6 +-
drivers/gpu/drm/drm_bufs.c | 16 +-
drivers/gpu/drm/drm_debugfs.c | 1 -
drivers/gpu/drm/drm_dma.c | 5 -
drivers/gpu/drm/drm_drv.c | 13 +-
drivers/gpu/drm/drm_fb_helper.c | 10 +-
drivers/gpu/drm/drm_fops.c | 78 +-
drivers/gpu/drm/drm_gem.c | 2 +-
drivers/gpu/drm/drm_info.c | 38 +-
drivers/gpu/drm/drm_irq.c | 5 +-
drivers/gpu/drm/drm_lock.c | 4 -
drivers/gpu/drm/drm_mm.c | 169 +-
drivers/gpu/drm/drm_pci.c | 49 +
drivers/gpu/drm/drm_proc.c | 1 -
drivers/gpu/drm/drm_sysfs.c | 4 +
drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 +-
drivers/gpu/drm/exynos/exynos_drm_encoder.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 2 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.h | 2 +-
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +-
drivers/gpu/drm/gma500/mdfld_dsi_dpi.h | 2 +-
drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
drivers/gpu/drm/gma500/psb_drv.c | 1 -
drivers/gpu/drm/gma500/psb_intel_display.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +-
drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +-
drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
drivers/gpu/drm/i2c/ch7006_mode.c | 2 +-
drivers/gpu/drm/i2c/ch7006_priv.h | 2 +-
drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
drivers/gpu/drm/i810/i810_dma.c | 17 +-
drivers/gpu/drm/i810/i810_drv.c | 3 +-
drivers/gpu/drm/i810/i810_drv.h | 6 +-
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/dvo.h | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 68 +
drivers/gpu/drm/i915/i915_dma.c | 61 +-
drivers/gpu/drm/i915/i915_drv.c | 276 ++--
drivers/gpu/drm/i915/i915_drv.h | 70 +-
drivers/gpu/drm/i915/i915_gem.c | 351 +++-
drivers/gpu/drm/i915/i915_gem_context.c | 536 ++++++
drivers/gpu/drm/i915/i915_gem_debug.c | 3 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 9 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 73 +-
drivers/gpu/drm/i915/i915_irq.c | 270 +--
drivers/gpu/drm/i915/i915_reg.h | 191 ++-
drivers/gpu/drm/i915/i915_suspend.c | 5 +-
drivers/gpu/drm/i915/i915_sysfs.c | 127 +-
drivers/gpu/drm/i915/i915_trace.h | 28 +-
drivers/gpu/drm/i915/intel_bios.c | 2 +-
drivers/gpu/drm/i915/intel_bios.h | 2 +-
drivers/gpu/drm/i915/intel_crt.c | 92 +-
drivers/gpu/drm/i915/intel_ddi.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 498 ++++--
drivers/gpu/drm/i915/intel_dp.c | 84 +-
drivers/gpu/drm/i915/intel_drv.h | 32 +-
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/intel_fb.c | 6 +-
drivers/gpu/drm/i915/intel_hdmi.c | 375 ++++-
drivers/gpu/drm/i915/intel_lvds.c | 58 +-
drivers/gpu/drm/i915/intel_modes.c | 28 -
drivers/gpu/drm/i915/intel_overlay.c | 4 +-
drivers/gpu/drm/i915/intel_panel.c | 53 +-
drivers/gpu/drm/i915/intel_pm.c | 483 +++++-
drivers/gpu/drm/i915/intel_ringbuffer.c | 92 +-
drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +
drivers/gpu/drm/i915/intel_sdvo.c | 60 +-
drivers/gpu/drm/i915/intel_sprite.c | 31 +-
drivers/gpu/drm/i915/intel_tv.c | 13 +-
drivers/gpu/drm/mga/mga_drv.c | 1 -
drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +
drivers/gpu/drm/mgag200/mgag200_mode.c | 8 +-
drivers/gpu/drm/nouveau/Makefile | 3 +-
drivers/gpu/drm/nouveau/nouveau_abi16.c | 245 +++
drivers/gpu/drm/nouveau/nouveau_abi16.h | 83 +
drivers/gpu/drm/nouveau/nouveau_bios.c | 12 +
drivers/gpu/drm/nouveau/nouveau_channel.c | 95 --
drivers/gpu/drm/nouveau/nouveau_drv.c | 19 +-
drivers/gpu/drm/nouveau/nouveau_drv.h | 19 +-
drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +-
.../nouveau/{nouveau_object.c => nouveau_gpuobj.c} | 60 -
drivers/gpu/drm/nouveau/nouveau_irq.c | 4 -
drivers/gpu/drm/nouveau/nouveau_notifier.c | 41 -
drivers/gpu/drm/nouveau/nouveau_software.h | 23 +-
drivers/gpu/drm/nouveau/nouveau_state.c | 74 -
drivers/gpu/drm/nouveau/nv04_crtc.c | 2 +-
drivers/gpu/drm/nouveau/nv04_dac.c | 2 +-
drivers/gpu/drm/nouveau/nv04_dfp.c | 2 +-
drivers/gpu/drm/nouveau/nv17_tv.c | 2 +-
drivers/gpu/drm/nouveau/nv50_crtc.c | 2 +-
drivers/gpu/drm/nouveau/nv50_dac.c | 3 +-
drivers/gpu/drm/nouveau/nv50_display.c | 25 +-
drivers/gpu/drm/nouveau/nv50_graph.c | 2 +-
drivers/gpu/drm/nouveau/nv50_software.c | 19 +-
drivers/gpu/drm/nouveau/nv50_sor.c | 3 +-
drivers/gpu/drm/nouveau/nv84_crypt.c | 18 +-
drivers/gpu/drm/nouveau/nva3_copy.fuc | 4 +-
drivers/gpu/drm/nouveau/nva3_copy.fuc.h | 94 +-
drivers/gpu/drm/nouveau/nvc0_copy.fuc.h | 87 +-
drivers/gpu/drm/nouveau/nvd0_display.c | 8 +-
drivers/gpu/drm/r128/r128_drv.c | 1 -
drivers/gpu/drm/radeon/atombios_crtc.c | 24 +-
drivers/gpu/drm/radeon/atombios_dp.c | 12 +-
drivers/gpu/drm/radeon/atombios_encoders.c | 16 +-
drivers/gpu/drm/radeon/evergreen.c | 270 ++-
drivers/gpu/drm/radeon/evergreen_blit_kms.c | 43 +-
drivers/gpu/drm/radeon/evergreend.h | 4 +
drivers/gpu/drm/radeon/ni.c | 198 ++-
drivers/gpu/drm/radeon/nid.h | 4 +
drivers/gpu/drm/radeon/r100.c | 1717 +++++++++++---------
drivers/gpu/drm/radeon/r200.c | 4 +-
drivers/gpu/drm/radeon/r300.c | 21 +-
drivers/gpu/drm/radeon/r420.c | 21 +-
drivers/gpu/drm/radeon/r520.c | 18 +-
drivers/gpu/drm/radeon/r600.c | 193 +--
drivers/gpu/drm/radeon/r600_blit_kms.c | 70 +-
drivers/gpu/drm/radeon/r600_hdmi.c | 6 +-
drivers/gpu/drm/radeon/r600d.h | 3 +
drivers/gpu/drm/radeon/radeon.h | 153 +-
drivers/gpu/drm/radeon/radeon_asic.c | 46 +
drivers/gpu/drm/radeon/radeon_asic.h | 14 +-
drivers/gpu/drm/radeon/radeon_benchmark.c | 10 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 35 +-
drivers/gpu/drm/radeon/radeon_cs.c | 79 +-
drivers/gpu/drm/radeon/radeon_cursor.c | 8 +-
drivers/gpu/drm/radeon/radeon_device.c | 384 ++++-
drivers/gpu/drm/radeon/radeon_display.c | 4 +-
drivers/gpu/drm/radeon/radeon_drv.c | 6 +-
drivers/gpu/drm/radeon/radeon_fence.c | 398 ++++-
drivers/gpu/drm/radeon/radeon_gart.c | 393 ++++-
drivers/gpu/drm/radeon/radeon_gem.c | 10 +-
drivers/gpu/drm/radeon/radeon_irq_kms.c | 283 +++-
drivers/gpu/drm/radeon/radeon_kms.c | 138 +-
drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 +-
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +-
drivers/gpu/drm/radeon/radeon_mode.h | 4 +-
drivers/gpu/drm/radeon/radeon_object.c | 15 +-
drivers/gpu/drm/radeon/radeon_pm.c | 16 +-
drivers/gpu/drm/radeon/radeon_ring.c | 410 ++++-
drivers/gpu/drm/radeon/radeon_sa.c | 84 +-
drivers/gpu/drm/radeon/radeon_semaphore.c | 71 +-
drivers/gpu/drm/radeon/radeon_test.c | 95 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 48 +-
drivers/gpu/drm/radeon/rs400.c | 21 +-
drivers/gpu/drm/radeon/rs600.c | 44 +-
drivers/gpu/drm/radeon/rs690.c | 21 +-
drivers/gpu/drm/radeon/rv515.c | 20 +-
drivers/gpu/drm/radeon/rv770.c | 38 +-
drivers/gpu/drm/radeon/si.c | 176 +-
drivers/gpu/drm/radeon/sid.h | 1 +
drivers/gpu/drm/savage/savage_bci.c | 9 +-
drivers/gpu/drm/savage/savage_drv.c | 2 +-
drivers/gpu/drm/sis/sis_drv.c | 3 +-
drivers/gpu/drm/sis/sis_mm.c | 19 +-
drivers/gpu/drm/tdfx/tdfx_drv.c | 1 -
drivers/gpu/drm/udl/udl_encoder.c | 2 +-
drivers/gpu/drm/udl/udl_modeset.c | 46 +-
drivers/gpu/drm/via/via_drv.c | 4 +-
drivers/gpu/drm/via/via_mm.c | 13 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 +-
drivers/staging/omapdrm/omap_crtc.c | 2 +-
drivers/staging/omapdrm/omap_encoder.c | 2 +-
include/drm/drmP.h | 19 +-
include/drm/drm_crtc.h | 2 -
include/drm/drm_crtc_helper.h | 4 +-
include/drm/drm_encoder_slave.h | 2 +-
include/drm/drm_mm.h | 93 +-
include/drm/drm_pciids.h | 42 -
include/drm/i915_drm.h | 34 +-
include/drm/intel-gtt.h | 8 +
include/drm/nouveau_drm.h | 94 +-
include/drm/sis_drm.h | 8 +-
include/drm/ttm/ttm_bo_driver.h | 3 -
include/linux/pci_regs.h | 5 +
189 files changed, 7925 insertions(+), 3723 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_gem_context.c
create mode 100644 drivers/gpu/drm/nouveau/nouveau_abi16.c
create mode 100644 drivers/gpu/drm/nouveau/nouveau_abi16.h
rename drivers/gpu/drm/nouveau/{nouveau_object.c => nouveau_gpuobj.c} (93%)
