* [PULL] drm-intel-next
@ 2012-08-31 9:03 Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-08-31 9:03 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
New stuff for -next. Highlights:
- prep patches for the modeset rework. Note that one of those patches
touches the fb helper in the common drm code.
- hasw hdmi audio support (Wang Xingchao)
- improved instdone dumping for gen7 (Ben)
- unbound tracking and a few follow-up patches from Chris
- dma_buf->begin/end_cpu_access plus fix for drm/udl (Dave)
- improve mmio error reporting for hsw
- prep patch for WQ_NON_REENTRANT removal (Tejun Heo)
I've expected a conflict with the raw_edid removal, but on second look
the conflicting patch went through -fixes and you've already resolved it.
I've also included a fixup on top of what QA tested to avoid a conflict
with linux-next (the NO_KSWAP removal).
Cheers, Daniel
The following changes since commit a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4:
Merge tag 'v3.6-rc2' into drm-intel-next (2012-08-17 09:01:08 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel for-airlied
for you to fetch changes up to d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:
drm/i915: Remove __GFP_NO_KSWAPD (2012-08-27 17:11:38 +0200)
----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Add ERR_INT to gen7 error state
drm/i915: Find unclaimed MMIO writes.
drm/i915: Extract reading INSTDONE
drm/i915: Add new INSTDONE registers
drm/i915: Use new INSTDONE registers (Gen7+)
Chris Wilson (13):
drm/i915: Track unbound pages
drm/i915: Add some sanity checks to unbound tracking
drm/i915: Show (count, size) of purgeable objects in i915_gem_objects
drm/i915: Show pin count in debugfs
drm/i915: Try harder to allocate an mmap_offset
drm/i915: Cantiga+ cannot handle a hsync front porch of 0
drm/i915: Only pwrite through the GTT if there is space in the aperture
drm/i915: Protect private gem objects from truncate (such as imported dmabuf)
drm/i915: Extract general object init routine
drm/i915: Use cpu relocations if the object is in the GTT but not mappable
drm/i915: Juggle code order to ease flow of the next patch
drm/i915: Use a non-blocking wait for set-to-domain ioctl
drm/i915: Avoid unbinding due to an interrupted pin_and_fence during execbuffer
Damien Lespiau (1):
drm/i915: Don't hardcode the number of pipes in the error state dump
Daniel Vetter (11):
drm/i915: add missing gen2 pipe A quirk entries
drm/i915/ns2501: kill pll A enabling hack
drm/i915: rip out the overlay pipe A workaround
drm/i915: prepare load-detect pipe code for dpms changes
drm/i915: drop intel_encoder argument to load_detect_pipe functions
drm/i915: simplify dvo dpms interface
drm/i915: kill a few unused things in dev_priv
drm/i915: extract ironlake_fdi_pll_disable
drm/fb-helper: don't clobber output routing in setup_crtcs
drm/i915: move functions around
drm/i915: disable rc6 on ilk when vt-d is enabled
Dave Airlie (2):
drm/i915: implement dma buf begin_cpu_access (v2)
drm/udl: call begin/end cpu access at more appropriate time
Keith Packard (1):
drm/i915: Allow VGA on CRTC 2
Sedat Dilek (1):
drm/i915: Remove __GFP_NO_KSWAPD
Tejun Heo (1):
i915: use alloc_ordered_workqueue() instead of explicit UNBOUND w/ max_active = 1
Wang Xingchao (4):
drm/i915: HSW audio registers definition
drm/i915: write eld info for HDMI audio
drm/i915: ironlake_write_eld code cleanup
drm/i915: Haswell HDMI audio initialization
Xu, Anhua (2):
drm/i915: fix wrong order of parameters in port checking functions
drm/i915: fix reassignment of variable "intel_dp->DP"
drivers/gpu/drm/drm_fb_helper.c | 6 -
drivers/gpu/drm/i915/dvo.h | 9 +-
drivers/gpu/drm/i915/dvo_ch7017.c | 8 +-
drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +-
drivers/gpu/drm/i915/dvo_ivch.c | 8 +-
drivers/gpu/drm/i915/dvo_ns2501.c | 21 +-
drivers/gpu/drm/i915/dvo_sil164.c | 4 +-
drivers/gpu/drm/i915/dvo_tfp410.c | 4 +-
drivers/gpu/drm/i915/i915_debugfs.c | 40 +-
drivers/gpu/drm/i915/i915_dma.c | 31 +-
drivers/gpu/drm/i915/i915_drv.c | 4 +
drivers/gpu/drm/i915/i915_drv.h | 39 +-
drivers/gpu/drm/i915/i915_gem.c | 1100 +++++++++++++++-------------
drivers/gpu/drm/i915/i915_gem_context.c | 4 +-
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 37 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 19 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 126 ++--
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 76 +-
drivers/gpu/drm/i915/i915_reg.h | 79 ++
drivers/gpu/drm/i915/i915_trace.h | 10 +-
drivers/gpu/drm/i915/intel_crt.c | 8 +-
drivers/gpu/drm/i915/intel_ddi.c | 6 +-
drivers/gpu/drm/i915/intel_display.c | 254 ++++---
drivers/gpu/drm/i915/intel_dp.c | 2 -
drivers/gpu/drm/i915/intel_drv.h | 6 +-
drivers/gpu/drm/i915/intel_dvo.c | 4 +-
drivers/gpu/drm/i915/intel_overlay.c | 60 +-
drivers/gpu/drm/i915/intel_pm.c | 7 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +-
drivers/gpu/drm/i915/intel_tv.c | 7 +-
drivers/gpu/drm/udl/udl_fb.c | 22 +-
drivers/gpu/drm/udl/udl_gem.c | 7 -
include/drm/i915_drm.h | 1 +
34 files changed, 1133 insertions(+), 888 deletions(-)
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2013-04-15 7:56 [pull] drm-intel-next Daniel Vetter
@ 2013-04-15 9:43 ` Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2013-04-15 9:43 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
On Mon, Apr 15, 2013 at 09:56:29AM +0200, Daniel Vetter wrote:
> Hi Dave,
>
> Since I expect Linus to open the merge window in about a week I guess this
> is the last i915 feature pull for 3.10. Highlights:
> Updated testing tree for -next. Highlights:
> - Corner case fixes discovered with static analyzers (Damien).
> - More fixes to combat unclaimed register errors on Haswell (Paulo).
> - Some small fixes to the gpu turbo code (Rodrigo+Ben), Ben has more
> fixes for overclocking support pending.
> - More prep work for fastboot from Chris.
> - VT-switchless suspend/resume from Jesse.
> - The prep work of Egbert Eich's hpd irq storm handling. Hopefully we can
> squeeze in the actual storm handling code for 3.10 ...
> - More convenience helpers for Imre's sg iterator. Core parts acked by
> Andrew Morton.
> - A bit of backlight code cleanup from Jani.
> - Fixed ilk gpu reset (Jesse).
> - Reduced color range handling fixes for VLV (Ville).
>
> The big item here is though the introduction of pipe_config to properly
> pre-compute the desired modeset state before touching the hw. Together
> with some very basic support to read out the current config from the hw
> and compare the state with the sw tracking. This is all prep work for more
> reliable fastboot, atomic modesets and other cool features. Stuff
> converted to the new world includes:
> - Most simple pipe attributes (reduce color range, pixel multiplier).
> - Pipe bpp/dither handling.
> - Some convenience flags like ->has_pch_encoder to simplify the code flow.
> - (Almost) DP clock handling, had to be reverted since part of a prep
> patch was lost in rebasing ...
> Expect a lot of patches for this throughout 3.11, there's tons of work
> till we have all state properly tracked for fastbooting to woExpect a lot
> of patches for this throughout 3.11, there's tons of work till we have all
> state properly tracked for fastbooting to work.
>
> For 3.10 I have a bunch of fixes queued up and I plan to send them all out
> at the end of this week. I need to shuffle patches in my -next queue a bit
> so that we don't but feature-y stuff in there, too. The main thing I'd
> like to sneak in is Egbert's hpd irq storm handling, which should be
> pretty low-risk since all the infrastructure work has landed already. I
> also have the oops fix pending, but that only mustered review before the
> w/e and giving how hairy that part of our modeset code is, I want to give
> it some more testing before forwarding.
>
> Note: annarchy.fd.o seems to run out of disk space, so couldn't push the
> usual for-airlied branch. Tag should work though.
>
> Note 2: I've had to do a backmerge since conflicts grew too ugly, but the
> upstream -rc I've backmerged is already in your drm-next.
Jani pointed out that the pull request below doesn't match my changelog
overview above. And indeed, since git.fd.o refused to cooperate my script
lost track of things. Bad me for not properly checking things. The below
pull should actually match what I want ...
Cheers, Daniel
The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-04-06
for you to fetch changes up to bae3699182027525d92b97d904578a533264b242:
drm/i915: info level for simulated gpu hang dmesg notice (2013-04-06 16:07:21 +0200)
----------------------------------------------------------------
Ben Widawsky (1):
drm/i915: Don't overclock on Haswell
Chris Wilson (4):
drm/i915: Always call fence-lost prior to removing the fence
drm/i915: Introduce i915_gem_object_create_stolen_for_preallocated
drm/i915: Apply alignment restrictions on scanout surfaces for VT-d
drm/i915: Skip modifying PCH DREF if not changing clock sources
Christian Lamparter (1):
drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
Damien Lespiau (5):
drm/i915: Error out if we are trying to use VGA with SPLL already in use
drm/i915: Cleanup if the EDP transcoder has a bobug input value
drm/i915: Rename intel_ddi_enable_pipe_func() to transcoder_func()
drm/i915: Use BUG() in a case of a programming error
drm/i915: Warn if a pipe is enabled with a bogus port
Daniel Vetter (33):
drm/i915: implement ibx_hpd_irq_setup
drm/i915: clear crt hotplug compare voltage field before setting
drm/i915: wire up SDVO hpd support on cpt/ppt
drm/i915: introduce struct intel_crtc_config
drm/i915: compute pipe_config earlier
drm/i915: add pipe_config->timings_set
drm/i915: add pipe_config->pixel_multiplier
drm/i915: drop helper vtable for sdvo encoder
drm/i915: add pipe_config->has_pch_encoder
drm/i915: add pipe_config->limited_color_range
drm/i915: introduce pipe_config->dither|pipe_bpp
drm/i915: precompute pipe bpp before touching the hw
drm/i915: convert DP autodither code to new infrastructure
drm/i915: clean up plane bpp confusion
drm/i915: clean up pipe bpp confusion
drm/i915: fold wait_for_atomic_us into wait_for_atomic
drm/i915: fix up _wait_for macro
drm/i915: check fb->pixel_format instead of bits_per_pixel
drm/i915: fixup fb bpp computation in pipe_config_set_bpp
drm/i915: Fix sdvo connector get_hw_state function
Merge tag 'v3.9-rc5' into drm-intel-next-queued
drm/i915: clear up the fdi/dp set_m_n confusion
drm/i915: move dp_m_n computation to dp_encoder->compute_config
drm/i915: track dp target_clock in pipe_config
drm/i915: remove leaky eDP functions
drm/i915: rip out superflous is_dp&is_cpu_edp tracking
drm/i915: add hw state readout/checking for pipe_config
drm/i915: hw readout support for ->has_pch_encoders
drm/i915: create pipe_config->dpll for clock state
drm/i915: extract i9xx_set_pipeconf
Revert "drm/i915: fix DP get_hw_state return value"
drm/i915: revert eDP bpp clamping code changes
drm/i915: info level for simulated gpu hang dmesg notice
Egbert Eich (5):
DRM/i915: Remove valleyview_hpd_irq_setup.
DRM/I915: Add enum hpd_pin to intel_encoder.
DRM/i915: Convert HPD interrupts to make use of HPD pin assignment in encoders (v2)
DRM/i915: Remove i965_hpd_irq_setup.
DRM/i915: Get rid if the 'hotplug_supported_mask' in struct drm_i915_private.
Imre Deak (2):
lib/scatterlist: sg_page_iter: support sg lists w/o backing pages
Revert "drm/i915: set dummy page for stolen objects"
Jani Nikula (3):
drm/i915: keep backlight_level and backlight device brightness in sync
drm/i915: return actual brightness to .get_brightness callback
drm/i915: group backlight related stuff into a struct
Jesse Barnes (14):
drm: add initial_config function to fb helper
drm/i915: add sprite restore function v3
drm/i915: restore cursor and sprite state when forcing a config restore v2
drm/i915: enable VT switchless resume v3
drm/i915: emit a hotplug event on resume
drm/i915: fix ILK GPU reset for render
drm/i915: fix DP get_hw_state return value
drm/i915: fix DDI get_hw_state return value
drm/i915: sprite support for ValleyView v4
drm/i915: add sprite assertion function for VLV
drm/i915/dp: fix up VLV DP handling v2
drm/i915: panel power sequencing for VLV eDP v2
drm/i915: add Punit read/write routines for VLV v2
drm/i915: drop DPFLIPSTAT enables on VLV v3
Paulo Zanoni (4):
drm/i915: fix DSPADDR Gen check
drm/i915: there's no DSPPOS register on gen4+
drm/i915: there's no PIPESTAT on HAS_PCH_SPLIT platforms
drm/i915: remove "inline" keyword from ironlake_disable_display_irq
Rodrigo Vivi (1):
drm/i915: HSW PM Frequency bits fix
Ville Syrjälä (3):
drm/i915: Wait for vblank between disabling a sprite and unpinning the fb
drm/i915: Set PIPECONF color range bit on Valleyview
drm/i915: Don't use the HDMI port color range bit on Valleyview
drivers/gpu/drm/drm_cache.c | 7 +-
drivers/gpu/drm/drm_fb_helper.c | 23 +-
drivers/gpu/drm/drm_prime.c | 8 +-
drivers/gpu/drm/i915/i915_debugfs.c | 423 +++------
drivers/gpu/drm/i915/i915_dma.c | 29 +-
drivers/gpu/drm/i915/i915_drv.c | 170 ++--
drivers/gpu/drm/i915/i915_drv.h | 72 +-
drivers/gpu/drm/i915/i915_gem.c | 89 +-
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 77 +-
drivers/gpu/drm/i915/i915_gem_stolen.c | 65 ++
drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +-
drivers/gpu/drm/i915/i915_irq.c | 457 ++++++----
drivers/gpu/drm/i915/i915_reg.h | 260 ++++--
drivers/gpu/drm/i915/i915_suspend.c | 15 +-
drivers/gpu/drm/i915/i915_sysfs.c | 16 +-
drivers/gpu/drm/i915/intel_crt.c | 16 +-
drivers/gpu/drm/i915/intel_ddi.c | 62 +-
drivers/gpu/drm/i915/intel_display.c | 1355 ++++++++++++++++------------
drivers/gpu/drm/i915/intel_dp.c | 504 +++++------
drivers/gpu/drm/i915/intel_drv.h | 145 +--
drivers/gpu/drm/i915/intel_fb.c | 5 +-
drivers/gpu/drm/i915/intel_hdmi.c | 157 ++--
drivers/gpu/drm/i915/intel_lvds.c | 48 +-
drivers/gpu/drm/i915/intel_panel.c | 44 +-
drivers/gpu/drm/i915/intel_pm.c | 164 +++-
drivers/gpu/drm/i915/intel_sdvo.c | 119 +--
drivers/gpu/drm/i915/intel_sprite.c | 243 ++++-
drivers/gpu/drm/i915/intel_tv.c | 14 +-
drivers/video/fbmem.c | 7 +
include/drm/drm_fb_helper.h | 4 +
include/linux/fb.h | 2 +
include/linux/pm.h | 13 +
include/linux/scatterlist.h | 28 +-
kernel/power/console.c | 116 +++
lib/scatterlist.c | 4 +-
37 files changed, 2853 insertions(+), 1975 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* [pull] drm-intel-next
@ 2013-04-15 7:56 Daniel Vetter
2013-04-15 9:43 ` Daniel Vetter
0 siblings, 1 reply; 31+ messages in thread
From: Daniel Vetter @ 2013-04-15 7:56 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
Since I expect Linus to open the merge window in about a week I guess this
is the last i915 feature pull for 3.10. Highlights:
Updated testing tree for -next. Highlights:
- Corner case fixes discovered with static analyzers (Damien).
- More fixes to combat unclaimed register errors on Haswell (Paulo).
- Some small fixes to the gpu turbo code (Rodrigo+Ben), Ben has more
fixes for overclocking support pending.
- More prep work for fastboot from Chris.
- VT-switchless suspend/resume from Jesse.
- The prep work of Egbert Eich's hpd irq storm handling. Hopefully we can
squeeze in the actual storm handling code for 3.10 ...
- More convenience helpers for Imre's sg iterator. Core parts acked by
Andrew Morton.
- A bit of backlight code cleanup from Jani.
- Fixed ilk gpu reset (Jesse).
- Reduced color range handling fixes for VLV (Ville).
The big item here is though the introduction of pipe_config to properly
pre-compute the desired modeset state before touching the hw. Together
with some very basic support to read out the current config from the hw
and compare the state with the sw tracking. This is all prep work for more
reliable fastboot, atomic modesets and other cool features. Stuff
converted to the new world includes:
- Most simple pipe attributes (reduce color range, pixel multiplier).
- Pipe bpp/dither handling.
- Some convenience flags like ->has_pch_encoder to simplify the code flow.
- (Almost) DP clock handling, had to be reverted since part of a prep
patch was lost in rebasing ...
Expect a lot of patches for this throughout 3.11, there's tons of work
till we have all state properly tracked for fastbooting to woExpect a lot
of patches for this throughout 3.11, there's tons of work till we have all
state properly tracked for fastbooting to work.
For 3.10 I have a bunch of fixes queued up and I plan to send them all out
at the end of this week. I need to shuffle patches in my -next queue a bit
so that we don't but feature-y stuff in there, too. The main thing I'd
like to sneak in is Egbert's hpd irq storm handling, which should be
pretty low-risk since all the infrastructure work has landed already. I
also have the oops fix pending, but that only mustered review before the
w/e and giving how hairy that part of our modeset code is, I want to give
it some more testing before forwarding.
Note: annarchy.fd.o seems to run out of disk space, so couldn't push the
usual for-airlied branch. Tag should work though.
Note 2: I've had to do a backmerge since conflicts grew too ugly, but the
upstream -rc I've backmerged is already in your drm-next.
Cheers, Daniel
The following changes since commit a937536b868b8369b98967929045f1df54234323:
Linux 3.9-rc3 (2013-03-17 15:59:32 -0700)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-03-23
for you to fetch changes up to e3dff585508636c8d2915cc1595e04f16ccd66ba:
drm/i915: Implement WaSwitchSolVfFArbitrationPriority (2013-03-23 12:18:06 +0100)
----------------------------------------------------------------
Ben Widawsky (9):
drm/i915: Created a sized object error dump
drm/i915: exclude CCID for platforms without it
drm/i915: Capture current context on error
drm/i915: Remove unused file arg from execbuf
drm/i915: Remove unneeded dev argument
drm/i915: Move num_pipes to intel info
drm/i915: Introduce GEN7_FEATURES for device info
drm/i915: Correct sandybrige overclocking
drm/i915: Implement WaSwitchSolVfFArbitrationPriority
Chris Wilson (1):
drm/i915: Resurrect ring kicking for semaphores, selectively
Damien Lespiau (1):
drm/i915: Remove platforms in the preliminary_hw_support description
Daniel Vetter (4):
drm/i915: gen2 has no tv out support
Merge tag 'v3.9-rc3' into drm-intel-next-queued
style nit: Align function parameter continuation properly.
drm/i915: fixup pd vs pt confusion in gen6 ppgtt code
Imre Deak (5):
drm: handle compact dma scatter lists in drm_clflush_sg()
drm/i915: set dummy page for stolen objects
drm/i915: handle walking compact dma scatter lists
drm/i915: create compact dma scatter lists for gem objects
drm/i915: use for_each_sg_page for setting up the gtt ptes
Jani Nikula (2):
drm/i915: add \n to the end of sysfs attributes
drm/i915: reduce power in the ilk rc6 enable error message
Jesse Barnes (18):
PM: make VT switching to the suspend console optional v3
fb: add support for drivers not needing VT switch at suspend/resume time
drm/i915: don't restore LVDS enable state blindly v2
drm/i915: remove disabled memset of framebuffer from intel_fb
drm/i915: don't init LVDS on VLV
drm/i915: VLV has force wake
drm/i915/dp: don't use ILK paths on VLV
drm/i915: use gen6 stolen check on VLV
drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV
drm/i915: allow force wake at init time on VLV v2
drm/i915: don't use plane pipe select on VLV
drm/i915: add media well to VLV force wake routines v2
drm/i915: use VLV DIP routines on VLV v2
drm/i915: add more VLV IDs
drm/i915: fix WaDisablePSDDualDispatchEnable on VLV v2
drm/i915: set conservative clock gating values on VLV v2
drm/i915: DSPFW and BLC regs are in the display offset range
drm/i915: VLV doesn't have HDMI on port C
Kees Cook (2):
drm/i915: use simple attribute in debugfs routines
drm/i915: clarify reasoning for the access_ok call
Mihnea Dobrescu-Balaur (1):
gpu: don't cast kzalloc() return value
Mika Kuoppala (1):
drm/i915: remove obsolete obj assignment in page flip
Paulo Zanoni (19):
drm/i915: use HAS_DDI on intel_hdmi.c and intel_display.c
drm/i915: wait_event_timeout's timeout is in jiffies
drm/i915: add aux_ch_ctl_reg to struct intel_dp
drm/i915: rename sdvox_reg to hdmi_reg on HDMI context
drm/i915: create functions for the "unclaimed register" checks
drm/i915: use FPGA_DBG for the "unclaimed register" checks
drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init
drm/i915: clarify confusion between SDVO and HDMI registers
drm/i915: unify the definitions of the HDMI/SDVO register
drm/i915: remove duplicated SDVO/HDMI bit definitions
drm/i915: rename some HDMI bit definitions
drm/i915: disable sound first on intel_disable_ddi
drm/i915: capture the correct cursor registers on IVB
drm/i915: there's no DSPSIZE register on gen4+
drm/i915: there's no DSPADDR register on Haswell
drm/i915: add HAS_POWER_WELL
drm/i915: reorganize intel_lvds_supported
drm/i915: don't save/restore PCH_LVDS on LPT
drm/i915: add missing space in error message
Rahul Sharma (1):
drm: modify pages_to_sg prime helper to create optimized SG table
Rodrigo Vivi (1):
drm/i915: Use cpu_transcoder for HSW_TVIDEO_DIP_* instead of pipe
Ville Syrjälä (15):
drm/i915: Really wait for pending flips when panning
drm/i915: Finish page flips and update primary planes after a GPU reset
drm/i915: Eliminate race from gen2/3 page flip interrupt handling
drm/i915: Fix races in gen4 page flip interrupt handling
drm/i915: Refactor gen2 to gen4 vblank interrupt handling
drm/i915: Kill pipestat[] cache
drm/i915: Add to_user_ptr()
drm/i915: Document the find_pll() function
drm/i915: Remove a stale and misplaced comment
drm/i915: Kill a few pointless comments
drm/i915: Use FORCEWAKE_KERNEL instead of hardcoded number in MT forcewake ACK
drm/i915: Use '1' instead of FORCEWAKE_KERNEL for ST force wake
drm/i915: Single thread force wake isn't used on HSW anymore
drm/i915: Kill a strange comment about DPMS functions
drm/i915: Set the VIC in AVI infoframe for SDVO
drivers/gpu/drm/drm_cache.c | 7 +-
drivers/gpu/drm/drm_prime.c | 8 +-
drivers/gpu/drm/i915/i915_debugfs.c | 423 ++++++++--------------------
drivers/gpu/drm/i915/i915_dma.c | 27 +-
drivers/gpu/drm/i915/i915_drv.c | 132 ++++-----
drivers/gpu/drm/i915/i915_drv.h | 30 +-
drivers/gpu/drm/i915/i915_gem.c | 78 ++---
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +--
drivers/gpu/drm/i915/i915_gem_gtt.c | 79 ++----
drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +-
drivers/gpu/drm/i915/i915_irq.c | 249 +++++++++++-----
drivers/gpu/drm/i915/i915_reg.h | 142 +++++-----
drivers/gpu/drm/i915/i915_suspend.c | 15 +-
drivers/gpu/drm/i915/i915_sysfs.c | 16 +-
drivers/gpu/drm/i915/intel_ddi.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 194 ++++++++-----
drivers/gpu/drm/i915/intel_dp.c | 88 +++---
drivers/gpu/drm/i915/intel_drv.h | 7 +-
drivers/gpu/drm/i915/intel_fb.c | 4 +-
drivers/gpu/drm/i915/intel_hdmi.c | 114 ++++----
drivers/gpu/drm/i915/intel_lvds.c | 7 +-
drivers/gpu/drm/i915/intel_panel.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 65 +++--
drivers/gpu/drm/i915/intel_sdvo.c | 50 ++--
drivers/video/fbmem.c | 7 +
include/linux/fb.h | 2 +
include/linux/pm.h | 13 +
kernel/power/console.c | 116 ++++++++
30 files changed, 1037 insertions(+), 921 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2013-04-02 9:34 Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2013-04-02 9:34 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
So I've figured we should get drm-next for 3.10 started ;-)
Highlights:
- Imre's for_each_sg_pages rework (now also with the stolen mem backed
case fixed with a hack) plus the drm prime sg list coalescing patch from
Rahul Sharma. I have some follow-up cleanups pending, already acked by
Andrew Morton.
- Some prep-work for the crazy no-pch/display-less platform by Ben.
- Some vlv patches, by far not all (Jesse et al).
- Clean up the HDMI/SDVO #define confusion (Paulo)
- gen2-4 vblank fixes from Ville.
- Unclaimed register warning fixes for hsw (Paulo). More still to come ...
- Complete pageflips which have been stuck in a gpu hang, should prevent
stuck gl compositors (Ville).
- pm patches for vt-switchless resume (Jesse). Note that the i915 enabling
is not (yet) included, that took a bit longer to settle. PM patches are
acked by Rafael Wysocki.
- Minor fixlets all over from various people.
All together it's been pretty quiet thus far.
Cheers, Daniel
The following changes since commit a937536b868b8369b98967929045f1df54234323:
Linux 3.9-rc3 (2013-03-17 15:59:32 -0700)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-03-23
for you to fetch changes up to e3dff585508636c8d2915cc1595e04f16ccd66ba:
drm/i915: Implement WaSwitchSolVfFArbitrationPriority (2013-03-23 12:18:06 +0100)
----------------------------------------------------------------
Ben Widawsky (9):
drm/i915: Created a sized object error dump
drm/i915: exclude CCID for platforms without it
drm/i915: Capture current context on error
drm/i915: Remove unused file arg from execbuf
drm/i915: Remove unneeded dev argument
drm/i915: Move num_pipes to intel info
drm/i915: Introduce GEN7_FEATURES for device info
drm/i915: Correct sandybrige overclocking
drm/i915: Implement WaSwitchSolVfFArbitrationPriority
Chris Wilson (1):
drm/i915: Resurrect ring kicking for semaphores, selectively
Damien Lespiau (1):
drm/i915: Remove platforms in the preliminary_hw_support description
Daniel Vetter (4):
drm/i915: gen2 has no tv out support
Merge tag 'v3.9-rc3' into drm-intel-next-queued
style nit: Align function parameter continuation properly.
drm/i915: fixup pd vs pt confusion in gen6 ppgtt code
Imre Deak (5):
drm: handle compact dma scatter lists in drm_clflush_sg()
drm/i915: set dummy page for stolen objects
drm/i915: handle walking compact dma scatter lists
drm/i915: create compact dma scatter lists for gem objects
drm/i915: use for_each_sg_page for setting up the gtt ptes
Jani Nikula (2):
drm/i915: add \n to the end of sysfs attributes
drm/i915: reduce power in the ilk rc6 enable error message
Jesse Barnes (18):
PM: make VT switching to the suspend console optional v3
fb: add support for drivers not needing VT switch at suspend/resume time
drm/i915: don't restore LVDS enable state blindly v2
drm/i915: remove disabled memset of framebuffer from intel_fb
drm/i915: don't init LVDS on VLV
drm/i915: VLV has force wake
drm/i915/dp: don't use ILK paths on VLV
drm/i915: use gen6 stolen check on VLV
drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV
drm/i915: allow force wake at init time on VLV v2
drm/i915: don't use plane pipe select on VLV
drm/i915: add media well to VLV force wake routines v2
drm/i915: use VLV DIP routines on VLV v2
drm/i915: add more VLV IDs
drm/i915: fix WaDisablePSDDualDispatchEnable on VLV v2
drm/i915: set conservative clock gating values on VLV v2
drm/i915: DSPFW and BLC regs are in the display offset range
drm/i915: VLV doesn't have HDMI on port C
Kees Cook (2):
drm/i915: use simple attribute in debugfs routines
drm/i915: clarify reasoning for the access_ok call
Mihnea Dobrescu-Balaur (1):
gpu: don't cast kzalloc() return value
Mika Kuoppala (1):
drm/i915: remove obsolete obj assignment in page flip
Paulo Zanoni (19):
drm/i915: use HAS_DDI on intel_hdmi.c and intel_display.c
drm/i915: wait_event_timeout's timeout is in jiffies
drm/i915: add aux_ch_ctl_reg to struct intel_dp
drm/i915: rename sdvox_reg to hdmi_reg on HDMI context
drm/i915: create functions for the "unclaimed register" checks
drm/i915: use FPGA_DBG for the "unclaimed register" checks
drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init
drm/i915: clarify confusion between SDVO and HDMI registers
drm/i915: unify the definitions of the HDMI/SDVO register
drm/i915: remove duplicated SDVO/HDMI bit definitions
drm/i915: rename some HDMI bit definitions
drm/i915: disable sound first on intel_disable_ddi
drm/i915: capture the correct cursor registers on IVB
drm/i915: there's no DSPSIZE register on gen4+
drm/i915: there's no DSPADDR register on Haswell
drm/i915: add HAS_POWER_WELL
drm/i915: reorganize intel_lvds_supported
drm/i915: don't save/restore PCH_LVDS on LPT
drm/i915: add missing space in error message
Rahul Sharma (1):
drm: modify pages_to_sg prime helper to create optimized SG table
Rodrigo Vivi (1):
drm/i915: Use cpu_transcoder for HSW_TVIDEO_DIP_* instead of pipe
Ville Syrjälä (15):
drm/i915: Really wait for pending flips when panning
drm/i915: Finish page flips and update primary planes after a GPU reset
drm/i915: Eliminate race from gen2/3 page flip interrupt handling
drm/i915: Fix races in gen4 page flip interrupt handling
drm/i915: Refactor gen2 to gen4 vblank interrupt handling
drm/i915: Kill pipestat[] cache
drm/i915: Add to_user_ptr()
drm/i915: Document the find_pll() function
drm/i915: Remove a stale and misplaced comment
drm/i915: Kill a few pointless comments
drm/i915: Use FORCEWAKE_KERNEL instead of hardcoded number in MT forcewake ACK
drm/i915: Use '1' instead of FORCEWAKE_KERNEL for ST force wake
drm/i915: Single thread force wake isn't used on HSW anymore
drm/i915: Kill a strange comment about DPMS functions
drm/i915: Set the VIC in AVI infoframe for SDVO
drivers/gpu/drm/drm_cache.c | 7 +-
drivers/gpu/drm/drm_prime.c | 8 +-
drivers/gpu/drm/i915/i915_debugfs.c | 423 ++++++++--------------------
drivers/gpu/drm/i915/i915_dma.c | 27 +-
drivers/gpu/drm/i915/i915_drv.c | 132 ++++-----
drivers/gpu/drm/i915/i915_drv.h | 30 +-
drivers/gpu/drm/i915/i915_gem.c | 78 ++---
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +--
drivers/gpu/drm/i915/i915_gem_gtt.c | 79 ++----
drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +-
drivers/gpu/drm/i915/i915_irq.c | 249 +++++++++++-----
drivers/gpu/drm/i915/i915_reg.h | 142 +++++-----
drivers/gpu/drm/i915/i915_suspend.c | 15 +-
drivers/gpu/drm/i915/i915_sysfs.c | 16 +-
drivers/gpu/drm/i915/intel_ddi.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 194 ++++++++-----
drivers/gpu/drm/i915/intel_dp.c | 88 +++---
drivers/gpu/drm/i915/intel_drv.h | 7 +-
drivers/gpu/drm/i915/intel_fb.c | 4 +-
drivers/gpu/drm/i915/intel_hdmi.c | 114 ++++----
drivers/gpu/drm/i915/intel_lvds.c | 7 +-
drivers/gpu/drm/i915/intel_panel.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 65 +++--
drivers/gpu/drm/i915/intel_sdvo.c | 50 ++--
drivers/video/fbmem.c | 7 +
include/linux/fb.h | 2 +
include/linux/pm.h | 13 +
kernel/power/console.c | 116 ++++++++
30 files changed, 1037 insertions(+), 921 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2013-03-15 2:11 ` Stéphane Marchesin
@ 2013-03-17 19:46 ` Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2013-03-17 19:46 UTC (permalink / raw)
To: Stéphane Marchesin
Cc: Dave Airlie, Intel Graphics Development, DRI Development, LKML
On Fri, Mar 15, 2013 at 3:11 AM, Stéphane Marchesin
<stephane.marchesin@gmail.com> wrote:
>> drm/i915: read out the modeset hw state at load and resume time
> This commit regresses modeset on the samsung series 5 chromebook (it
> is basically a pineview machine with an lvds panel). I don't seem to
> be able to set any mode on it any longer.
Does that mean the kernel refuses to set the mode, or that you get a
black screen?
For starters I guess we need:
- drm.debug=0xe dmesg from just before that commit
- same for latest 3.9-rc kernels, presuming it's not broken there
Latest upstream has a minor chance to work better I think since we've
improved the pfit handling in the setup and teardown sequence a bit.
Generally lvds has been hit&miss on way too many machines
unfortunately with things randomly breaking and getting fixed again
(e.g. one of Chris' machines works again with the new code ...). And
the commit above doesn't really change much in the code itself but it
does change the order (and timing) of the different enable/disable
codepaths.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2012-09-13 14:18 Daniel Vetter
2012-09-17 23:09 ` Daniel Vetter
@ 2013-03-15 2:11 ` Stéphane Marchesin
2013-03-17 19:46 ` Daniel Vetter
1 sibling, 1 reply; 31+ messages in thread
From: Stéphane Marchesin @ 2013-03-15 2:11 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie, Intel Graphics Development,
DRI Development, LKML
On Thu, Sep 13, 2012 at 7:18 AM, Daniel Vetter <daniel@ffwll.ch> wrote:
> Hi Dave,
>
> The big ticket item here is the new i915 modeset infrastructure.
> Shockingly it didn't not blow up all over the place (i.e. I've managed to
> fix the ugly issues before merging). 1-2 smaller corner cases broke, but
> we have patches. Also, there's tons of patches on top of this that clean
> out cruft and fix a few bugs that couldn't be fixed with the crtc helper
> based stuff. So more stuff to come ;-)
>
> Also a few other things:
> - Tiny fix in the fb helper to go through the official dpms interface
> instead of calling the crtc helper code.
> - forcewake code frobbery from Ben, code should be more in-line with
> what Windows does now.
> - fixes for the render ring flush on hsw (Paulo)
> - gpu frequency tracepoint
> - vlv forcewake changes to better align it with our understanding of the
> forcewake magic.
> - a few smaller cleanups
>
> Cheers, Daniel
>
>
> The following changes since commit d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:
>
> drm/i915: Remove __GFP_NO_KSWAPD (2012-08-27 17:11:38 +0200)
>
> are available in the git repository at:
>
> git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-09-09
>
> for you to fetch changes up to e04190e0ecb236c51af181c18c545ea076fb9cca:
>
> drm/fb helper: don't call drm_helper_connector_dpms directly (2012-09-08 00:51:15 +0200)
>
> ----------------------------------------------------------------
>
> Ben Widawsky (5):
> drm/i915: Extract forcewake ack timeout
> drm/i915: use cpu_relax() in wait_for_atomic
> drm/i915: Change forcewake timeout to 2ms
> drm/i915: Never read FORCEWAKE
> drm/i915: Enable some sysfs stuff without CONFIG_PM
>
> Chris Wilson (1):
> drm/i915: Convert remaining debugfs iterators over rings to for_each_ring()
>
> Daniel Vetter (66):
> drm/ips: move drps/ips/ilk related variables into dev_priv->ips
> drm/i915: add a tracepoint for gpu frequency changes
> drm/i915: align vlv forcewake with common lore
> drm/i915: differ error message between forcwake timeouts
> drm/i915: add crtc->enable/disable vfuncs insted of dpms
> drm/i915: rip out crtc prepare/commit indirection
> drm/i915: add direct encoder disable/enable infrastructure
> drm/i915/hdmi: convert to encoder->disable/enable
> drm/i915/tv: convert to encoder enable/disable
> drm/i915/lvds: convert to encoder disable/enable
> drm/i915/dp: convert to encoder disable/enable
> drm/i915/crt: convert to encoder disable/enable
> drm/i915/sdvo: convert to encoder disable/enable
> drm/i915/dvo: convert to encoder disable/enable
> drm/i915: convert dpms functions of dvo/sdvo/crt
> drm/i915: rip out encoder->disable/enable checks
> drm/i915: clean up encoder_prepare/commit
> drm/i915: copy&paste drm_crtc_helper_set_config
> drm/i915: call set_base directly
> drm/i915: inline intel_best_encoder
> drm/i915: copy&paste drm_crtc_helper_set_mode
> drm/i915: simplify intel_crtc_prepare_encoders
> drm/i915: rip out encoder->prepare/commit
> drm/i915: call crtc functions directly
> drm/i915: WARN when trying to enabled an unused crtc
> drm/i915: Add interfaces to read out encoder/connector hw state
> drm/i915/dp: implement get_hw_state
> drm/i915/hdmi: implement get_hw_state
> drm/i915/tv: implement get_hw_state
> drm/i915/lvds: implement get_hw_state
> drm/i915/crt: implement get_hw_state
> drm/i915/sdvo: implement get_hw_state
> drm/i915/dvo: implement get_hw_state
> drm/i915: read out the modeset hw state at load and resume time
Hi Daniel,
This commit regresses modeset on the samsung series 5 chromebook (it
is basically a pineview machine with an lvds panel). I don't seem to
be able to set any mode on it any longer.
Any idea?
Stéphane
> drm/i915: check connector hw/sw state
> drm/i915: rip out intel_crtc->dpms_mode
> drm/i915: rip out intel_dp->dpms_mode
> drm/i915: ensure the force pipe A quirk is actually followed
> drm/i915: introduce struct intel_set_config
> drm/i915: extract modeset config save/restore code
> drm/i915: extract intel_set_config_compute_mode_changes
> drm/i915: extract intel_set_config_update_output_state
> drm/i915: implement crtc helper semantics relied upon by the fb helper
> drm/i915: don't update the fb base if there is no fb
> drm/i915: convert pointless error checks in set_config to BUGs
> drm/i915: don't save all the encoder/crtc state in set_config
> drm/i915: stage modeset output changes
> drm/i915: push crtc->fb update into pipe_set_base
> drm/i915: remove crtc disabling special case
> drm/i915: move output commit and crtc disabling into set_mode
> drm/i915: extract adjusted mode computation
> drm/i915: use staged outuput config in tv->mode_fixup
> drm/i915: use staged outuput config in lvds->mode_fixup
> drm/i915: compute masks of crtcs affected in set_mode
> drm/i915: implement new set_mode code flow
> drm/i915: push commit_output_state past crtc disabling
> drm/i915: s/intel_encoder_disable/intel_encoder_noop
> drm/i915: WARN if the pipe won't turn off
> drm/i915: switch the load detect code to the staged modeset config
> drm/i915: push commit_output_state past the crtc/encoder preparing
> drm/i915: disable all crtcs at suspend time
> drm/i915: no longer call drm_helper_resume_force_mode
> drm/i915: add tons of modeset state checks
> drm/i915: improve modeset state checking after dpms calls
> Merge the modeset-rework, basic conversion into drm-intel-next
> drm/fb helper: don't call drm_helper_connector_dpms directly
>
> Jani Nikula (2):
> drm/i915: only enable sdvo hotplug irq if needed
> drm/i915: fix sdvo hotplug support check and activation
>
> Paulo Zanoni (3):
> drm/i915: add gen7_render_ring_flush
> drm/i915: add workarounds directly to gen6_render_ring_flush
> drm/i915: add workarounds to gen7_render_ring_flush
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2012-11-16 17:47 ` Alex Deucher
@ 2012-11-16 17:49 ` Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-11-16 17:49 UTC (permalink / raw)
To: Alex Deucher
Cc: Dave Airlie, Intel Graphics Development, DRI Development, LKML
On Fri, Nov 16, 2012 at 6:47 PM, Alex Deucher <alexdeucher@gmail.com> wrote:
> Hey, I don't see the drm HPD fixes. Are you planning to put them in
> another pull request? It would be nice to get them upstream for 3.8
Since they only refine the drm helpers in the core, I've figured
there's no need to merge them through the intel tree.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2012-11-16 17:17 [pull] drm-intel-next Daniel Vetter
@ 2012-11-16 17:47 ` Alex Deucher
2012-11-16 17:49 ` Daniel Vetter
0 siblings, 1 reply; 31+ messages in thread
From: Alex Deucher @ 2012-11-16 17:47 UTC (permalink / raw)
To: Dave Airlie, Intel Graphics Development, DRI Development, LKML
On Fri, Nov 16, 2012 at 12:17 PM, Daniel Vetter <daniel@ffwll.ch> wrote:
> Hi Dave,
>
> Highlights of this -next round:
> - ivb fdi B/C fixes
> - hsw sprite/plane offset fixes from Damien
> - unified dp/hdmi encoder for hsw, finally external dp support on hsw
> (Paulo)
> - kill-agp and some other prep work in the gtt code from Ben
> - some fb handling fixes from Ville
> - massive pile of patches to align hsw VGA with the spec and make it
> actually work (Paulo)
> - pile of workarounds from Jesse, mostly for vlv, but also some other
> related platforms
> - start of a dev_priv reorg, that thing grew out of bounds and chaotic
> - small bits&pieces all over the place, down to better error handling for
> load-detect on gen2 (Chris, Jani, Mika, Zhenyu, ...)
>
> On top of the previous pile (just copypasta):
> - tons of hsw dp prep patches form Paulo
> - round scheduled work items and timers to nearest second (Chris)
> - some hw workarounds (Jesse&Damien)
> - vlv dp support and related fixups (Vijay et al.)
> - basic haswell dp support, not yet wired up for external ports (Paulo)
> - edp support (Paulo)
> - tons of refactorings to prepare for the above (Paulo)
> - panel rework, unifiying code between lvds and edp panels (Jani)
> - panel fitter scaling modes (Jani + Yuly Novikov)
> - panel power improvements, should now work without the BIOS setting it up
> - extracting some dp helpers from radeon/i915 and move them to
> drm_dp_helper.c
> - randome pile of workarounds (Damien, Ben, ...)
> - some cleanups for the register restore code for suspend/resume
> - secure batchbuffer support, should enable tear-free blits on gen6+
> Chris)
> - random smaller fixlets and cleanups.
>
> Note that I've done a tiny bit of history rectifying on this -next pull
> (just to make a debug dmesg output correct), and applied a bugfix for a
> regression that Chris caught (introduced much earlier in this patch-pile).
>
> Cheers, Daniel
Hey, I don't see the drm HPD fixes. Are you planning to put them in
another pull request? It would be nice to get them upstream for 3.8
Alex
^ permalink raw reply [flat|nested] 31+ messages in thread
* [pull] drm-intel-next
@ 2012-11-16 17:17 Daniel Vetter
2012-11-16 17:47 ` Alex Deucher
0 siblings, 1 reply; 31+ messages in thread
From: Daniel Vetter @ 2012-11-16 17:17 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
Highlights of this -next round:
- ivb fdi B/C fixes
- hsw sprite/plane offset fixes from Damien
- unified dp/hdmi encoder for hsw, finally external dp support on hsw
(Paulo)
- kill-agp and some other prep work in the gtt code from Ben
- some fb handling fixes from Ville
- massive pile of patches to align hsw VGA with the spec and make it
actually work (Paulo)
- pile of workarounds from Jesse, mostly for vlv, but also some other
related platforms
- start of a dev_priv reorg, that thing grew out of bounds and chaotic
- small bits&pieces all over the place, down to better error handling for
load-detect on gen2 (Chris, Jani, Mika, Zhenyu, ...)
On top of the previous pile (just copypasta):
- tons of hsw dp prep patches form Paulo
- round scheduled work items and timers to nearest second (Chris)
- some hw workarounds (Jesse&Damien)
- vlv dp support and related fixups (Vijay et al.)
- basic haswell dp support, not yet wired up for external ports (Paulo)
- edp support (Paulo)
- tons of refactorings to prepare for the above (Paulo)
- panel rework, unifiying code between lvds and edp panels (Jani)
- panel fitter scaling modes (Jani + Yuly Novikov)
- panel power improvements, should now work without the BIOS setting it up
- extracting some dp helpers from radeon/i915 and move them to
drm_dp_helper.c
- randome pile of workarounds (Damien, Ben, ...)
- some cleanups for the register restore code for suspend/resume
- secure batchbuffer support, should enable tear-free blits on gen6+
Chris)
- random smaller fixlets and cleanups.
Note that I've done a tiny bit of history rectifying on this -next pull
(just to make a debug dmesg output correct), and applied a bugfix for a
regression that Chris caught (introduced much earlier in this patch-pile).
Cheers, Daniel
The following changes since commit 6f0c0580b70c89094b3422ba81118c7b959c7556:
Linux 3.7-rc2 (2012-10-20 12:11:32 -0700)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel for-airlied
for you to fetch changes up to 6b8294a4d392c2c9f8867e8505511f3fc9419ba7:
drm/i915: Restore physical HWS_PGA after resume (2012-11-16 13:47:40 +0100)
----------------------------------------------------------------
Adam Jackson (6):
drm: Export drm_probe_ddc()
drm/dp: Update DPCD defines
drm/i915/dp: Fetch downstream port info if needed during DPCD fetch
drm/i915/dp: Be smarter about connection sense for branch devices
drm/dp: Document DP spec versions for various DPCD registers
drm/dp: Make sink count DP 1.2 aware
Ben Widawsky (16):
drm/i915: Extract PCU communication
drm/i915: Workaround to bump rc6 voltage to 450
drm/i915: Add rc6vids to debugfs
drm/i915: No LLC_MLC for HSW.
drm/i915: Add dev to ppgtt
drm/i915: introduce gtt_pte_t
drm/i915: Extract PPGTT pte encoding
drm/i915: move more pte encoding to pte encode
drm/i915: Stop using AGP layer for GEN6+
drm/i915: Calculate correct stolen size for GEN7+
drm/i915: Kill off now unused gen6+ AGP code
drm/i915: flush system agent TLBs on SNB
drm/i915: Move the remaining gtt code
drm/i915: Missed lock change with rps lock
drm/i915: Fix sparse warnings in from AGP kill code
drm/i915: Allocate the proper size for contexts.
Chris Wilson (11):
drm/i915: Align the hangcheck wakeup to the nearest second
drm/i915: Align the retire_requests worker to the nearest second
drm/i915: Allow DRM_ROOT_ONLY|DRM_MASTER to submit privileged batchbuffers
drm/i915: Document the multi-threaded FORCEWAKE bits
drm/i915: Clear FORCEWAKE when taking over from BIOS
drm/i915: Always calculate 8xx WM values based on a 32-bpp framebuffer
drm/i915: Clear unused fields of mode for framebuffer creation
drm/i915: Update load-detect failure paths for modeset-rework
drm/i915/i2c: Track users of GMBUS force-bit
drm/i915: Report amount of usable graphics memory in MiB
drm/i915: Restore physical HWS_PGA after resume
Damien Lespiau (15):
drm/i915: Remove the disabling of VHR unit clock gating for HSW
drm/i915: Document that we are implementing WaDisableBackToBackFlipFix
drm/i915: Remove the WaDisableBackToBackFlipFix w/a for Haswell
drm/i915: Fix the SCC/SSC typo in the SPLL bits definition
drm/i915: Consolidate ILK_DSPCLK_GATE and PCH_DSPCLK_GATE
drm/i915: Program DSPCLK_GATE_D only once on Ironlake
drm/i915: Don't program DSPCLK_GATE_D twice on IVB and VLV
drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler
drm/i915: VLV does not have a sprite scaler
drm/i915/tv: Use intel_flush_display_plane() to flush the primary plane
drm/i915: Error out when trying to set a y-tiled as a sprite
drm/i915: Fix primary plane offset on HSW
drm/i915: Fix sprite offset on HSW
drm/i915: adjust sprite base address
drm/i915: Flush using only the correct base address register
Daniel Vetter (48):
drm/i915: s/DRM_IRQ_ARGS/int irq, void *arg
drm/i915: move hpd handling to (ibx|cpt)_irq_handler
drm/i915: don't save/restore DP regs for kms
drm/i915: don't save/restore irq regs for kms
drm/i915: don't save/restore HWS_PGA reg for kms
drm/i915/crt: don't set HOTPLUG bits on !PCH
drm/i915/crt: explicitly set up HOTPLUG_BITS on resume
drm/i915: don't save/restor ADPA for kms
drm/i915: unconditionally use mt forcewake on hsw/ivb
Merge tag 'v3.7-rc2' into drm-intel-next-queued
drm: rename drm_dp_i2c_helper.c to drm_dp_helper.c
drm: dp helper: extract drm_dp_channel_eq_ok
drm: dp helper: extract drm_dp_clock_recovery_ok
drm: extract helpers to compute new training values from sink request
drm: extract dp link train delay functions from radeon
drm/i915: use the new dp train delay helpers
drm: extract dp link bw helpers
drm: extract drm_dp_max_lane_count helper
drm/i915/dp: actually nack test request
drm/i915: make edp panel power sequence setup more robust
drm/i915: enable/disable backlight for eDP
drm/i915/eDP: compute the panel power clock divisor from the pch rawclock
drm/i915/dp: compute the pch dp aux divider from the rawclk
drm/i915: extract intel_dp_init_panel_power_sequencer
drm/i915: shut up spurious message in intel_dp_get_hw_state
drm/i915: Write the FDI RX TU size reg at the right time
drm/i915: clarify why we need to enable fdi plls so early
drm/i915: set FDI_RX_MISC to recommended values on CPT/PPT
drm/i915: add comment about pch pll enabling rules
drm/i915: BUG on impossible pch dp port
drm/i915: add ->display.modeset_global_resources callback
drm/i915: check fdi B/C lane sharing constraint
drm/i915: implement WaIssueDummyWriteToWakeupFromRC6
drm/i915: implement WaDisableRenderCachePipelinedFlush
drm/i915: move encoder->mode_set calls to crtc_mode_set
drm: add helper to sort panels to the head of the connector list
drm/i915: move panel connectors to the front
drm/i915: check whether the pch is the soulmate of the cpu
drm/i915: drop unnecessary check from fdi_link_train code
drm/i915: CPT+ pch transcoder workaround
drm/i915: implement WADP0ClockGatingDisable
drm/i915: kill pch_init_clock_gating indirection
drm/i915: move the suspend/resume register file out of dev_priv
drm/i915: move dev_priv->(rps|ips) out of line
drm/i915: move pwrctx/renderctx to the other ilk power state
drm/i915: move dri1 dungeon out of dev_priv
drm/i915: extract l3_parity substruct from dev_priv
drm/i915: drop the double-OP_STOREDW usage in blt_ring_flush
Gajanan Bhat (1):
drm/i915: Add eDP support for Valleyview
Jani Nikula (18):
drm/i915: add debug logging to ASLE backlight set requests
drm/i915/lvds: Rename intel_lvds to intel_lvds_encoder
drm/i915/lvds: Introduce intel_lvds_connector
drm/i915/lvds: Move the acpi_lid_notifier from drm_i915_private to the connector
drm/i915: Backlight setup requires connector so pass it as parameter
drm/i915/lvds: Move some connector specific info across from the encoder
drm/i915/dp: Initialize eDP fixed mode in intel_dp_init
drm/i915: Create generic intel_panel for LVDS and eDP
drm/i915: Move the fixed mode to intel_panel
drm/i915: Do not free the passed EDID in intel_connector_update_modes()
drm/i915: Move cached EDID to intel_connector
drm/i915: remove an extra #define for DP_RECEIVER_CAP_SIZE
drm/i915/sdvo: force GPIO bit-banging also on default pin
drm/i915/sdvo: restore i2c adapter config on intel_sdvo_init() failures
drm/i915: debug print all of the DPCD we have
drm/i915/lvds: move fitting mode from intel_lvds_connector to intel_panel
drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again
drm/i915: remove HAS_eDP as unnecessary and inconsistent indirection
Jesse Barnes (15):
drm/i915: limit VLV IRQ enables to those we use
drm/i915: implement WaForceL3Serialization on VLV and IVB
drm/i915: implement WaDisableEarlyCull for VLV and IVB
drm/i915: implement WaDisableL3CacheAging on VLV
drm/i915: implement WaDisableDopClockGatingisable on VLV and IVB
drm/i915: implement WaForceL3Serialization on VLV and IVB
drm/i915: implement WaDisableVLVClockGating_VBIIssue on VLV
drm/i915: implement WaDisablePSDDualDispatchEnable on IVB & VLV
drm/i915: TLB invalidation with MI_FLUSH_DW requires a post-sync op v3
drm/i915: PIPE_CONTROL TLB invalidate requires CS stall
drm/i915: add clock gating regs to VLV offset check function
drm/i915: don't block resume on fb console resume v2
drm/i915: put ring frequency and turbo setup into a work queue v5
drm/i915: protect RPS/RC6 related accesses (including PCU) with a new mutex
drm/i915: don't rewrite the GTT on resume v4
Mika Kuoppala (2):
drm/i915: remove unused mem_block struct definition
drm/i915/ringbuffer: exclude last 2 cachelines on 845g on all callpaths
Paulo Zanoni (83):
drm/i915: don't recheck for invalid pipe bpp
drm/i915: extract set_m_n from ironlake_crtc_mode_set
drm/i915: extract compute_dpll from ironlake_crtc_mode_set
drm/i915: remove unused variables from ironlake_crtc_mode_set
drm/i915: extract intel_set_pipe_timings from crtc_mode_set
drm/i915: rewrite the LCPLL code
drm/i915: enable and disable DDI_FUNC_CTL at the right time
drm/i915: enable and disable PIPE_CLK_SEL at the right time
drm/i915: add haswell_crtc_mode_set
drm/i915: add proper CPU/PCH checks to crtc_mode_set functions
drm/i915: add haswell_set_pipeconf
drm/i915: completely rewrite the Haswell PLL handling code
drm/i915: don't rely on previous values set on DDI_BUF_CTL
drm/i915: don't implement WaDisableEarlyCull for Haswell
drm/i915: disable DDI_BUF_CTL at the correct time
drm/i915: pipe and planes should be disabled on haswell_crtc_mode_set
drm/i915: add DP support to intel_ddi_enable_pipe_func
drm/i915: add intel_ddi_set_pipe_settings
drm/i915: add DP support to intel_ddi_pll_mode_set
drm/i915: add basic Haswell DP link train bits
drm/i915: use TU_SIZE macro at intel_dp_set_m_n
drm/i915: fix DP AUX register definitions on Haswell
drm/i915: add DP support to intel_ddi_get_encoder_port
drm/i915: add DP support to intel_ddi_get_hw_state
drm/i915: add DP support to intel_enable_ddi
drm/i915: add DP support to intel_ddi_mode_set
drm/i915: add DP support to intel_ddi_disable_port
drm/i915: fix Haswell DP M/N registers
drm/i915: implement Haswell DP link train sequence
drm/i915: set the correct function pointers for Haswell DP
drm/i915: fork a Haswell version of ironlake_crtc_{enable, disable}
drm/i915: fix checks inside ironlake_crtc_{enable, disable}
drm/i915: fix checks inside haswell_crtc_{enable, disable}
drm/i915: simplify intel_crtc_driving_pch
drm/i915: don't call Haswell PCH code when we can't or don't need
drm/i915: add TRANSCODER_EDP
drm/i915: convert PIPE_CLK_SEL to transcoder
drm/i915: convert DDI_FUNC_CTL to transcoder
drm/i915: check TRANSCODER_EDP on intel_modeset_setup_hw_state
drm/i915: convert PIPECONF to use transcoder instead of pipe
drm/i915: convert PIPE_MSA_MISC to transcoder
drm/i915: convert CPU M/N timings to transcoder
drm/i915: convert pipe timing definitions to transcoder
drm/i915: implement workaround for VTOTAL when using TRANSCODER_EDP
drm/i915: select the correct pipe when using TRANSCODER_EDP
drm/i915: set the correct eDP aux channel clock divider on DDI
drm/i915: set/unset the DDI eDP backlight
drm/i915: turn the eDP DDI panel on/off
drm/i915: enable DDI eDP
drm/i915: simplify assignments inside intel_dp.c
drm/i915: add intel_dp_to_dev and intel_hdmi_to_dev
drm/i915: create intel_digital_port and use it
drm/i915: split intel_hdmi_init into encoder and connector pieces
drm/i915: split intel_dp_init into encoder and connector pieces
drm/i915: reset intel_encoder->type when DP or HDMI is detected
drm/i915: add port field to intel_digital_port
drm/i915: add intel_ddi_connector_get_hw_state
drm/i915: create the DDI encoder
drm/i915: don't set ADPA pipe select on LPT
drm/i915: use intel_ddi_get_hw_state on CRT encoder too
drm/i915: add lpt_pch_enable
drm/i915: remove Haswell/LPT bits from ironlake_pch_enable
drm/i915: remove ironlake bits from lpt_pch_enable
drm/i915: rename intel_enable_pch_pll to ironlake_enable_pch_pll
drm/i915: don't call ironlake_enable_pch_pll on lpt_pch_enable
drm/i915: don't assert_panel_unlocked on LPT
drm/i915: use the CPU and PCH transcoders on lpt_pch_enable
drm/i915: rename intel_{en, dis}able_transcoder
drm/i915: fork lpt version of ironlake_{en, dis}able_pch_transcoder
drm/i915: remove Haswell code from ironlake_enable_pch_transcoder
drm/i915: remove IBX code from lpt_enable_pch_transcoder
drm/i915: don't assert_pch_pll_enabled on lpt_enable_pch_transcoder
drm/i915: use CPU and PCH transcoders on lpt_enable_pch_transcoder
drm/i915: don't rely on previous values when setting LPT TRANSCONF
drm/i915: don't assert_pch_ports_disabled on LPT
drm/i915: use PIPECONF_INTERLACE_MASK_HSW on lpt_enable_pch_transcoder
drm/i915: use CPU and PCH transcoders on lpt_disable_pch_transcoder
drm/i915: implement timing override workarounds on LPT
drm/i915: don't call intel_disable_pch_pll on Haswell/LPT
drm/i915: don't assert disabled FDI before disabling the FDI
drm/i915: set the correct number of FDI lanes on Haswell
drm/i915: fix Haswell FDI link training code
drm/i915: fix Haswell FDI link disable path
Vijay Purushothaman (6):
drm/i915: Set aux clk to 100MHz for Valleyview
drm/i915: Fix SDVO IER and status bits for Valleyview
drm/i915: Add Valleyview lane control definitions
drm/i915: Program correct m n tu register for Valleyview
drm/i915: Enable DisplayPort in Valleyview
drm/i915: Fixup HDMI output on Valleyview
Ville Syrjälä (7):
drm/i915: Fix display pixel format handling
drm/i915: Check framebuffer stride more thoroughly
drm/i915: Check the framebuffer offset
drm/i915: pixel_size == cpp
drm/i915: Bad pixel formats can't reach the sprite code
drm/i915: Introduce intel_crtc_update_sarea_pos()
drm/i915: Add SURFLIVE register definitions
Wei Yongjun (1):
drm/i915: remove duplicated include from intel_modes.c
Yuly Novikov (2):
drm/i915/dp: allow configuring eDP panel fitting scaling mode
drm/i915/dp: change eDP default scaling mode to respect aspect ratio
Zhenyu Wang (1):
drm/i915: Fix HSW power well control state read
drivers/char/agp/intel-agp.h | 91 --
drivers/char/agp/intel-gtt.c | 320 +---
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/drm_crtc_helper.c | 18 +
.../drm/{drm_dp_i2c_helper.c => drm_dp_helper.c} | 125 +-
drivers/gpu/drm/i915/i915_debugfs.c | 52 +-
drivers/gpu/drm/i915/i915_dma.c | 86 +-
drivers/gpu/drm/i915/i915_drv.c | 105 +-
drivers/gpu/drm/i915/i915_drv.h | 443 +++---
drivers/gpu/drm/i915/i915_gem.c | 94 +-
drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 27 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 418 ++++-
drivers/gpu/drm/i915/i915_irq.c | 80 +-
drivers/gpu/drm/i915/i915_reg.h | 293 ++--
drivers/gpu/drm/i915/i915_suspend.c | 763 +++++-----
drivers/gpu/drm/i915/i915_sysfs.c | 43 +-
drivers/gpu/drm/i915/i915_trace.h | 10 +-
drivers/gpu/drm/i915/intel_crt.c | 47 +-
drivers/gpu/drm/i915/intel_ddi.c | 1063 ++++++++++---
drivers/gpu/drm/i915/intel_display.c | 1592 +++++++++++++++-----
drivers/gpu/drm/i915/intel_dp.c | 959 +++++++-----
drivers/gpu/drm/i915/intel_drv.h | 113 +-
drivers/gpu/drm/i915/intel_hdmi.c | 131 +-
drivers/gpu/drm/i915/intel_i2c.c | 9 +-
drivers/gpu/drm/i915/intel_lvds.c | 215 +--
drivers/gpu/drm/i915/intel_modes.c | 7 +-
drivers/gpu/drm/i915/intel_opregion.c | 2 +
drivers/gpu/drm/i915/intel_panel.c | 52 +-
drivers/gpu/drm/i915/intel_pm.c | 464 +++---
drivers/gpu/drm/i915/intel_ringbuffer.c | 119 +-
drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +-
drivers/gpu/drm/i915/intel_sdvo.c | 33 +-
drivers/gpu/drm/i915/intel_sprite.c | 101 +-
drivers/gpu/drm/i915/intel_tv.c | 7 +-
drivers/gpu/drm/radeon/atombios_dp.c | 149 +-
drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
include/drm/drm_crtc_helper.h | 2 +
include/drm/drm_dp_helper.h | 31 +
include/drm/intel-gtt.h | 7 +-
include/uapi/drm/i915_drm.h | 6 +
41 files changed, 5120 insertions(+), 2969 deletions(-)
rename drivers/gpu/drm/{drm_dp_i2c_helper.c => drm_dp_helper.c} (64%)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [pull] drm-intel-next
2012-09-13 14:18 Daniel Vetter
@ 2012-09-17 23:09 ` Daniel Vetter
2013-03-15 2:11 ` Stéphane Marchesin
1 sibling, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-09-17 23:09 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
On Thu, Sep 13, 2012 at 04:18:41PM +0200, Daniel Vetter wrote:
> Hi Dave,
>
> The big ticket item here is the new i915 modeset infrastructure.
> Shockingly it didn't not blow up all over the place (i.e. I've managed to
> fix the ugly issues before merging). 1-2 smaller corner cases broke, but
> we have patches. Also, there's tons of patches on top of this that clean
> out cruft and fix a few bugs that couldn't be fixed with the crtc helper
> based stuff. So more stuff to come ;-)
>
> Also a few other things:
> - Tiny fix in the fb helper to go through the official dpms interface
> instead of calling the crtc helper code.
> - forcewake code frobbery from Ben, code should be more in-line with
> what Windows does now.
> - fixes for the render ring flush on hsw (Paulo)
> - gpu frequency tracepoint
> - vlv forcewake changes to better align it with our understanding of the
> forcewake magic.
> - a few smaller cleanups
Updated pull request with the 2 bugfixers cherry-picked from my -next
queue on top. Since I'll be travelling around for the next two weeks,
rebasing things around will take a bit longer.
Cheers, Daniel
The following changes since commit 85f9e50d815a70780699752c4f2dc1198c2c0b61:
drm/i915: move i915_get_extra_insdone out of CONFIG_DEBUG_FS block (2012-09-03 18:06:37 +1000)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel for-airlied
for you to fetch changes up to 3b7a89fce3e3dc96b549d6d829387b4439044d0d:
drm/i915: fix OOPS in lid_notify (2012-09-18 00:59:37 +0200)
----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout
drm/i915: use cpu_relax() in wait_for_atomic
drm/i915: Change forcewake timeout to 2ms
drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff without CONFIG_PM
Chris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings to for_each_ring()
Daniel Vetter (68):
drm/ips: move drps/ips/ilk related variables into dev_priv->ips
drm/i915: add a tracepoint for gpu frequency changes
drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts
drm/i915: add crtc->enable/disable vfuncs insted of dpms
drm/i915: rip out crtc prepare/commit indirection
drm/i915: add direct encoder disable/enable infrastructure
drm/i915/hdmi: convert to encoder->disable/enable
drm/i915/tv: convert to encoder enable/disable
drm/i915/lvds: convert to encoder disable/enable
drm/i915/dp: convert to encoder disable/enable
drm/i915/crt: convert to encoder disable/enable
drm/i915/sdvo: convert to encoder disable/enable
drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&paste drm_crtc_helper_set_config
drm/i915: call set_base directly
drm/i915: inline intel_best_encoder
drm/i915: copy&paste drm_crtc_helper_set_mode
drm/i915: simplify intel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc
drm/i915: Add interfaces to read out encoder/connector hw state
drm/i915/dp: implement get_hw_state
drm/i915/hdmi: implement get_hw_state
drm/i915/tv: implement get_hw_state
drm/i915/lvds: implement get_hw_state
drm/i915/crt: implement get_hw_state
drm/i915/sdvo: implement get_hw_state
drm/i915/dvo: implement get_hw_state
drm/i915: read out the modeset hw state at load and resume time
drm/i915: check connector hw/sw state
drm/i915: rip out intel_crtc->dpms_mode
drm/i915: rip out intel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed
drm/i915: introduce struct intel_set_config
drm/i915: extract modeset config save/restore code
drm/i915: extract intel_set_config_compute_mode_changes
drm/i915: extract intel_set_config_update_output_state
drm/i915: implement crtc helper semantics relied upon by the fb helper
drm/i915: don't update the fb base if there is no fb
drm/i915: convert pointless error checks in set_config to BUGs
drm/i915: don't save all the encoder/crtc state in set_config
drm/i915: stage modeset output changes
drm/i915: push crtc->fb update into pipe_set_base
drm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling into set_mode
drm/i915: extract adjusted mode computation
drm/i915: use staged outuput config in tv->mode_fixup
drm/i915: use staged outuput config in lvds->mode_fixup
drm/i915: compute masks of crtcs affected in set_mode
drm/i915: implement new set_mode code flow
drm/i915: push commit_output_state past crtc disabling
drm/i915: s/intel_encoder_disable/intel_encoder_noop
drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config
drm/i915: push commit_output_state past the crtc/encoder preparing
drm/i915: disable all crtcs at suspend time
drm/i915: no longer call drm_helper_resume_force_mode
drm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls
Merge the modeset-rework, basic conversion into drm-intel-next
drm/fb helper: don't call drm_helper_connector_dpms directly
drm/i915: correctly update crtc->x/y in set_base
drm/i915: fix OOPS in lid_notify
Jani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed
drm/i915: fix sdvo hotplug support check and activation
Paulo Zanoni (3):
drm/i915: add gen7_render_ring_flush
drm/i915: add workarounds directly to gen6_render_ring_flush
drm/i915: add workarounds to gen7_render_ring_flush
drivers/gpu/drm/drm_fb_helper.c | 2 +-
drivers/gpu/drm/i915/dvo.h | 6 +
drivers/gpu/drm/i915/dvo_ch7017.c | 13 +
drivers/gpu/drm/i915/dvo_ch7xxx.c | 13 +
drivers/gpu/drm/i915/dvo_ivch.c | 15 +
drivers/gpu/drm/i915/dvo_ns2501.c | 15 +
drivers/gpu/drm/i915/dvo_sil164.c | 16 +
drivers/gpu/drm/i915/dvo_tfp410.c | 14 +
drivers/gpu/drm/i915/i915_debugfs.c | 54 +-
drivers/gpu/drm/i915/i915_drv.c | 9 +-
drivers/gpu/drm/i915/i915_drv.h | 36 +-
drivers/gpu/drm/i915/i915_irq.c | 20 +-
drivers/gpu/drm/i915/i915_reg.h | 2 +
drivers/gpu/drm/i915/i915_sysfs.c | 15 +-
drivers/gpu/drm/i915/i915_trace.h | 15 +
drivers/gpu/drm/i915/intel_crt.c | 136 ++-
drivers/gpu/drm/i915/intel_ddi.c | 59 +-
drivers/gpu/drm/i915/intel_display.c | 1535 ++++++++++++++++++++++++++-----
drivers/gpu/drm/i915/intel_dp.c | 144 ++-
drivers/gpu/drm/i915/intel_drv.h | 67 +-
drivers/gpu/drm/i915/intel_dvo.c | 94 +-
drivers/gpu/drm/i915/intel_hdmi.c | 151 ++-
drivers/gpu/drm/i915/intel_lvds.c | 97 +-
drivers/gpu/drm/i915/intel_pm.c | 138 +--
drivers/gpu/drm/i915/intel_ringbuffer.c | 82 +-
drivers/gpu/drm/i915/intel_sdvo.c | 206 +++--
drivers/gpu/drm/i915/intel_tv.c | 61 +-
27 files changed, 2315 insertions(+), 700 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* [pull] drm-intel-next
@ 2012-09-13 14:18 Daniel Vetter
2012-09-17 23:09 ` Daniel Vetter
2013-03-15 2:11 ` Stéphane Marchesin
0 siblings, 2 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-09-13 14:18 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure.
Shockingly it didn't not blow up all over the place (i.e. I've managed to
fix the ugly issues before merging). 1-2 smaller corner cases broke, but
we have patches. Also, there's tons of patches on top of this that clean
out cruft and fix a few bugs that couldn't be fixed with the crtc helper
based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface
instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with
what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the
forcewake magic.
- a few smaller cleanups
Cheers, Daniel
The following changes since commit d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:
drm/i915: Remove __GFP_NO_KSWAPD (2012-08-27 17:11:38 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-09-09
for you to fetch changes up to e04190e0ecb236c51af181c18c545ea076fb9cca:
drm/fb helper: don't call drm_helper_connector_dpms directly (2012-09-08 00:51:15 +0200)
----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout
drm/i915: use cpu_relax() in wait_for_atomic
drm/i915: Change forcewake timeout to 2ms
drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff without CONFIG_PM
Chris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings to for_each_ring()
Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables into dev_priv->ips
drm/i915: add a tracepoint for gpu frequency changes
drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts
drm/i915: add crtc->enable/disable vfuncs insted of dpms
drm/i915: rip out crtc prepare/commit indirection
drm/i915: add direct encoder disable/enable infrastructure
drm/i915/hdmi: convert to encoder->disable/enable
drm/i915/tv: convert to encoder enable/disable
drm/i915/lvds: convert to encoder disable/enable
drm/i915/dp: convert to encoder disable/enable
drm/i915/crt: convert to encoder disable/enable
drm/i915/sdvo: convert to encoder disable/enable
drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&paste drm_crtc_helper_set_config
drm/i915: call set_base directly
drm/i915: inline intel_best_encoder
drm/i915: copy&paste drm_crtc_helper_set_mode
drm/i915: simplify intel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc
drm/i915: Add interfaces to read out encoder/connector hw state
drm/i915/dp: implement get_hw_state
drm/i915/hdmi: implement get_hw_state
drm/i915/tv: implement get_hw_state
drm/i915/lvds: implement get_hw_state
drm/i915/crt: implement get_hw_state
drm/i915/sdvo: implement get_hw_state
drm/i915/dvo: implement get_hw_state
drm/i915: read out the modeset hw state at load and resume time
drm/i915: check connector hw/sw state
drm/i915: rip out intel_crtc->dpms_mode
drm/i915: rip out intel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed
drm/i915: introduce struct intel_set_config
drm/i915: extract modeset config save/restore code
drm/i915: extract intel_set_config_compute_mode_changes
drm/i915: extract intel_set_config_update_output_state
drm/i915: implement crtc helper semantics relied upon by the fb helper
drm/i915: don't update the fb base if there is no fb
drm/i915: convert pointless error checks in set_config to BUGs
drm/i915: don't save all the encoder/crtc state in set_config
drm/i915: stage modeset output changes
drm/i915: push crtc->fb update into pipe_set_base
drm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling into set_mode
drm/i915: extract adjusted mode computation
drm/i915: use staged outuput config in tv->mode_fixup
drm/i915: use staged outuput config in lvds->mode_fixup
drm/i915: compute masks of crtcs affected in set_mode
drm/i915: implement new set_mode code flow
drm/i915: push commit_output_state past crtc disabling
drm/i915: s/intel_encoder_disable/intel_encoder_noop
drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config
drm/i915: push commit_output_state past the crtc/encoder preparing
drm/i915: disable all crtcs at suspend time
drm/i915: no longer call drm_helper_resume_force_mode
drm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls
Merge the modeset-rework, basic conversion into drm-intel-next
drm/fb helper: don't call drm_helper_connector_dpms directly
Jani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed
drm/i915: fix sdvo hotplug support check and activation
Paulo Zanoni (3):
drm/i915: add gen7_render_ring_flush
drm/i915: add workarounds directly to gen6_render_ring_flush
drm/i915: add workarounds to gen7_render_ring_flush
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 31+ messages in thread
* [pull] drm-intel-next
@ 2012-07-13 18:55 Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-07-13 18:55 UTC (permalink / raw)
To: Dave Airlie; +Cc: Intel Graphics Development, DRI Development, LKML
Hi Dave,
New pull for -next. Highlights:
- rc6/turbo support for hsw (Eugeni)
- improve corner-case of the reset handling code - gpu reset handling
should be rock-solid now
- support for fb offset > 4096 pixels on gen4+ (yeah, you need some fairly
big screens to hit that)
- the "Flush Me Harder" patch to fix the gen6+ fallout from disabling the
flushing_list
- no more /dev/agpgart on gen6+!
- HAS_PCH_xxx improvements from Paulo
- a few minor bits&pieces all over, most of it in thew hsw code
QA reported 2 regression, one due a bad cable (fixed by a walk to the next
radioshack) and one due to the HPD v2 patch - I owe you one for refusing
to take v2 for -fixes after v1 blew up on Linus' machine I guess ;-) The
later has a confirmed fix already queued up in my tree.
Regressions from the last pull are all fixed and some really good news:
We've finally fixed the last DP regression from 3.2. Although I'm vary of
that blowing up elseplaces, hence I prefer that we soak it in 3.6 a bit
before submitting it to stable.
Otherwise Chris is hunting down an obscure bug that got recently
introduced due to a funny interaction between two seemingly unrelated
patches, one improving our gpu death handling, the other preparing the
removal of the flushing_list. But he has patches already, although I'm
still complaining a bit about the commit messages ...
Wrt further pulls for 3.6 I'll merge feature-y stuff only at the end of
the current drm-intel-next cycle so that if this will miss 3.6 I can just
send you a pull for the bugfixes that are currently merged (or in the case
of Chris' patches, hopefully merged soon).
Yours, Daniel
PS: This pull will make the already existing conflict with Linus' tree a
bit more fun, but I think it should be still doable (the important thing
is to keep the revert from -fixes, but don't kill any other changes from
-next).
The following changes since commit 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24:
Merge tag 'v3.5-rc4' into drm-intel-next-queued (2012-06-25 19:10:36 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-07-06
for you to fetch changes up to 4acf518626cdad5bbf7aac9869bd4accbbfb4ad3:
drm/i915: program FDI_RX TP and FDI delays (2012-07-05 15:09:03 +0200)
----------------------------------------------------------------
Ben Widawsky (1):
drm/i915: linuxify create_hw_context()
Chris Wilson (2):
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
Daniel Vetter (15):
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
Eugeni Dodonov (11):
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
Jesper Juhl (1):
drm/i915/sprite: Fix mem leak in intel_plane_init()
Jesse Barnes (3):
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
Paulo Zanoni (5):
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
Ville Syrjälä (2):
drm/i915: Zero initialize mode_cmd
drm/i915: Reject page flips with changed format/offset/pitch
drivers/char/agp/intel-agp.c | 11 -
drivers/gpu/drm/i915/i915_dma.c | 9 +-
drivers/gpu/drm/i915/i915_drv.c | 172 ++------------
drivers/gpu/drm/i915/i915_drv.h | 28 ++-
drivers/gpu/drm/i915/i915_gem.c | 44 +++-
drivers/gpu/drm/i915/i915_gem_context.c | 50 ++--
drivers/gpu/drm/i915/i915_reg.h | 21 +-
drivers/gpu/drm/i915/i915_suspend.c | 5 +-
drivers/gpu/drm/i915/intel_ddi.c | 9 +
drivers/gpu/drm/i915/intel_display.c | 162 ++++++-------
drivers/gpu/drm/i915/intel_dp.c | 26 +-
drivers/gpu/drm/i915/intel_drv.h | 16 +-
drivers/gpu/drm/i915/intel_fb.c | 2 +-
drivers/gpu/drm/i915/intel_lvds.c | 6 +-
drivers/gpu/drm/i915/intel_pm.c | 396 +++++++++++++++++++++++++------
drivers/gpu/drm/i915/intel_ringbuffer.c | 34 +--
drivers/gpu/drm/i915/intel_sprite.c | 5 +-
drivers/gpu/drm/i915/intel_tv.c | 10 +-
18 files changed, 579 insertions(+), 427 deletions(-)
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
[not found] <20120506190931.GD4756@phenom.ffwll.local>
@ 2012-05-10 13:55 ` Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-05-10 13:55 UTC (permalink / raw)
To: Intel Graphics Development, Dave Airlie; +Cc: DRI Development, LKML
Hi Dave,
New drm-intel-next pull request.
Highlights:
- sparse fixes from Ben.
- tons of little cleanups from Chris all over: tiling_changed
clarification, deferred_free list removal, ...
- fix up irq handler on gen2 & gen3 + related cleanups from Chris
- prep work for wait_rendering_timeout from Ben with some nice
refactorings
- first set of infoframe fixes from Paulo for doubleclocked CEA modes
- improve pch pll handling from Jesse and Chris
- gpu hangman, this also contains the reset fix for gen4
- rps sanity check from Chris - this papers over issues when the gpu fails
to clock up on snb/ivb, and it is shockingly easy to hit. The code
prints a big WARN backtrace and restores the hw to a sane state. The
real fix is still in the works.
Atm I'm aware of 2 regressions in -next:
- One of the gmbus patches (not gmbus itself) regressed lvds detection on
a MacbookPro. I've analyzed the bug already and I think I know what's
going on, patch is awaiting test feedback.
- Just today QA reported that DP on ilk regressed. That bug is fresh of
the press and still awaiting detailed logfiles and the bisect result.
The only thing that's clear atm is that -fixes works and -next doesn't.
Otherwise 3.5 merge is winding down, I am queueing up a few things though
that I'd like to still sneak in:
- More infoframe fixes from Paulo (most already queued into my tree).
- Final pieces of the first cut at hsw support from Eugeni - all the
invasive pieces and code rework has landed already so not much harm
there.
- I'm working on some backlight fixes I'd like to land in 3.5, but not yet
all ready.
As discussed on irc this pull request is for the merged branch which
already resolves the conflicts with drm-next (due to the -rc6 backmerge).
Yours, Daniel
The following changes since commit 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd:
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next (2012-05-07 16:09:35 +0100)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-05-06-merged
for you to fetch changes up to 5e13a0c5ec05d382b488a691dfb8af015b1dea1e:
Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued (2012-05-08 13:39:59 +0200)
----------------------------------------------------------------
Ben Widawsky (11):
drm/i915: [sparse] __iomem fixes for opregion
drm/i915: [sparse] __iomem fixes for overlay
drm/i915: [sparse] __iomem fixes for gem
drm/i915: remove do_retire from i915_wait_request
drm/i915: move vbetool invoked ier stuff
drm/i915: kill waiting_seqno
drm/i915: drop polled waits from i915_wait_request
drm/i915: extract __wait_seqno from i915_wait_request
drm/i915: remove polled wait from throttle
drm/i915: use __wait_seqno for ring throttle
drm/i915: extract some common olr+wedge code
Chris Wilson (32):
drm/i915/sprite: Avoid incurring extra vblank stall when updating plane on IVB
drm/i915: Remove i915_gem_ringbuffer_(data|info) from debugfs
drm/i915: Clarify the semantics of tiling_changed
drm/i915: Only the zap the VMA after updating the tiling parameters
drm/i915: i8xx interrupt handler
drm/i915: Use a global lock for modifying global irq flags
drm/i915: Remove too early plane enable on pre-PCH hardware
drm/i915: Bump the inactive LRU on set-to-GTT-domain
drm/i915: Remove i915_gem_evict_inactive()
drm/i915: Remove the list of pinned inactive objects
drm/i915: Remove the deferred-free list
drm/i915: Split the stolen handling for GEM out of i915_dma.c
drm/i915: Move GEM initialisation from i915_dma.c to i915_gem.c
drm/i915: CR clock gating is recommend to be set on PineView
drm/i915: Unconditionally initialise the interrupt workers
drm/i915: Remove redundant initialisation of per-ring IRQ waitqueues
drm/i915: pending_flip_is_done is gen3, name it so
drm/i915: Duplicate and split the gen3/4 irq handler
drm/i915: Clear FlipDone semantics change for pageflipping on gen3
drm/i915: Remove gen3 irq code from gen4 irq routine
drm/i915: Remove gen4 irq code from gen3 irq routine
drm/i915: HWSTAM is only 16-bit on gen3
drm/i915: Cleanup gen3 irq uninstall
drm/i915: Handle PendingFlip on gen3 robustly
drm/i915: Inline I915_INTERRUPT_ENABLE_FIX
drm/i915: Remove unused and unloved vblank macros
drm/i915: Remove unused ring->irq_seqno
drm/i915: Only enable IPS polling for gen5
drm/i915: Remove unused dev_priv->vblank_pipe
drm/i915: Wait for the clocks to stabilise before updating PLLs
drm/i915: Periodically sanity check power management
drm/i915: Support pageflipping interrupts for all 3-pipes on IVB
Daniel Vetter (43):
drm/i915: print computed bpp in dp link configuration
drm/i915: [sparse] __iomem fixes for debugfs
drm/i915: re-add static qualifier to get_cxsr_latency
drm/i915: fixup tv load-detect on enabled but not active crtc
drm/i915: create macros to handle masked bits
drm/i915: implement Disable4x2SubspanOptimization w/a for ivb, too
drm/i915: properly check for MODESET for kms driver ioctls
drm/i915: disallow gem ums init ioctl for kms
drm/i915: rip out GEM drm feature checks
drm/i915: rip out dev_priv->has_gem
drm/i915: check for kms in dri1 ioctls
drm/i915: use the new masked bit macro some more
drm/i915: move dri1 vblank stubs to i915_dma.c
drm/i915: create dev_priv->dri1 dragon dungeon^W^W sub-struct
drm/i915 disallow physical batchbuffers for KMS
drm/i915: rip out dev_priv->tex_lru_log_granularity
drm/i915: remove LP_RING&friends from modeset code
drm/i915: kill intel_clear_scanline_wait
drm/i915: rip out dri1 breadcrumb updates from gen5+ irq handlers
drm/i915: move dri1 irq ioctl code to i915_dma.c
drm/i915: extract dri1 breadcrumb update from irq handler
drm/i915: move LP_RING&friends to i915_dma.c
drm/i915: disallow clip rects on gen5+
drm/i915: move the ips code to intel_pm.c
drm/i915: move rps/emon function declarations
drm/i915: kill pointless clearing of dev_priv->hws_map
drm/i915: rework legacy GFX HWS handling
drm/i915: fixup __iomem mixups in ringbuffer.c
drm/i915: move pnv|ilk_gem_mem_freq to intel_pm.c
drm/i915: rip out intel_dpio_write again
drm/i915: rip out unnecessary calls to drm_mode_set_crtcinfo
drm/i915: use mode values consistently when converting to sdvo dtd
drm/i915: add interface to simulate gpu hangs
drm/i915: rework dev->first_error locking
drm/i915: allow the existing error_state to be destroyed
drm/i915: simplify i915_reset a bit
drm/i915: extract intel_gpu_reset
drm/i915: make gpu hangman more resilient
drm/i915: kill flags parameter for reset functions
drm/i915: also reset the media engine on gen4/5
drm/i915: remove modeset reset from i915_reset
drm/i915: fix gen4 gpu reset
Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued
Jesse Barnes (1):
drm/i915: manage PCH PLLs separately from pipes
Paulo Zanoni (2):
drm/i915: rename AVI InfoFrame field 'PR' to 'YQ_CN_PR'
drm/i915: make DBLCLK modes work
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 270 ++++---
drivers/gpu/drm/i915/i915_dma.c | 1076 ++++++--------------------
drivers/gpu/drm/i915/i915_drv.c | 132 ++--
drivers/gpu/drm/i915/i915_drv.h | 122 ++-
drivers/gpu/drm/i915/i915_gem.c | 434 +++++------
drivers/gpu/drm/i915/i915_gem_debug.c | 16 -
drivers/gpu/drm/i915/i915_gem_evict.c | 42 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
drivers/gpu/drm/i915/i915_gem_stolen.c | 202 +++++
drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +-
drivers/gpu/drm/i915/i915_irq.c | 1136 ++++++++++++++++------------
drivers/gpu/drm/i915/i915_reg.h | 24 +-
drivers/gpu/drm/i915/i915_suspend.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 413 ++++++----
drivers/gpu/drm/i915/intel_dp.c | 19 +-
drivers/gpu/drm/i915/intel_drv.h | 24 +-
drivers/gpu/drm/i915/intel_hdmi.c | 8 +-
drivers/gpu/drm/i915/intel_opregion.c | 67 +-
drivers/gpu/drm/i915/intel_overlay.c | 209 ++---
drivers/gpu/drm/i915/intel_pm.c | 675 ++++++++++++++++-
drivers/gpu/drm/i915/intel_ringbuffer.c | 170 +++--
drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +-
drivers/gpu/drm/i915/intel_sdvo.c | 19 +-
drivers/gpu/drm/i915/intel_sprite.c | 29 +-
drivers/gpu/drm/i915/intel_tv.c | 5 +-
27 files changed, 2882 insertions(+), 2257 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_gem_stolen.c
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2012-01-05 3:35 Keith Packard
@ 2012-01-05 15:24 ` Daniel Vetter
0 siblings, 0 replies; 31+ messages in thread
From: Daniel Vetter @ 2012-01-05 15:24 UTC (permalink / raw)
To: Keith Packard; +Cc: Airlie, Dave, Intel drivers, linux-kernel, dri-devel
On Wed, Jan 04, 2012 at 07:35:41PM -0800, Keith Packard wrote:
>
> Here are the rest of the 3.3 pending changes.
>
> This has a bunch of small bug fixes and overlay plane support for i915.
>
> The following changes since commit 7a7e8734ac3235efafd34819b27fbdf5417e6d60:
>
> Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next (2012-01-03 09:45:12 +0000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux drm-intel-next
I'm not happy with Eric's missed IRQ workaround because
- it's incomplete, the BSD ring is similarly affected by these issues like
the blitter ring, but not handled by his patches.
- it does a busy-loop wait until the gpu signals completion - in normal
useage this can easily be a few msecs, especially since now semaphores
are enabled by defailt on Ivybridge. With offscreen benchmarking it can
easily reach seconds. This is imo unacceptable.
Furthermore
- Chris Wilson proposed an alternative approach quite a bit before these
patches have been created that combines the irq signalling path with a
short timer as a backup. This works really well because we only rarely
miss irqs. See
Message-Id: <1323978198-3501-1-git-send-email-chris@chris-wilson.co.uk>
- Meanwhile I've discovered a magic set of tricks that seem to completely
solve missed irq issues on both ivb and snb. This would render all this
ducttape irrelevant.
Imo the minimal right thing to do is to revert the patch "drm/i915: Make
the fallback IRQ wait not sleep". This will regress piglit throughput (and
anything else stupid enough to crazily ping-pong between the gpu and cpu)
quite a bit, but honestly that's not something our userbase cares about.
I'd also like to express my frustration with the general -next process for
drm/i915:
- This drm-intel-next tree is less than 24h ours old (if you look at when
it showed up at an official place where both our QA and the community
can pick it up and test it). I fear we'll ship yet another disaster like
the stack eating bug the vt-d/ilk w/a patch caused with an unbounded
recursion. Our QA actually caught it in testing, but there was simply
not enough time to fix things up before the buggy code landed in -linus.
- Because the drm-intel-next merge cycle started so late there has simply
not been enough time to include quite a few bugfixes for serious issues
like 20s delays in intial modeset, userspace-triggerable kernel OOPSes
and deadlocks and reproducible hard hw hangs. For most of these there
are testcases in intel-gpu-tools, and these issues span the entire set
of hw generations drm/i915 currently supports. But this late it's imo
no longer advisible to merge them, so we'll ship 3.3 with a bunch of
known (and sometimes longstanding) serious issues that have fixes.
Yours, Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2012-01-05 3:35 Keith Packard
2012-01-05 15:24 ` Daniel Vetter
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2012-01-05 3:35 UTC (permalink / raw)
To: Airlie, Dave; +Cc: linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 2606 bytes --]
Here are the rest of the 3.3 pending changes.
This has a bunch of small bug fixes and overlay plane support for i915.
The following changes since commit 7a7e8734ac3235efafd34819b27fbdf5417e6d60:
Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next (2012-01-03 09:45:12 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux drm-intel-next
Ben Widawsky (4):
drm/i915: relative_constants_mode race fix
drm/i915: Force sync command ordering (Gen6+)
drm/i915: Update GEN6_RP_CONTROL definitions
drm/i915: drpc debugfs update for gen6
Daniel Vetter (2):
drm/i915: kicking rings stuck on semaphores considered harmful
drm/i915: don't bail out of intel_wait_ring_buffer too early
Eric Anholt (5):
drm/i915: Set two chicken bits implicated in missed IRQs on Ivybridge.
drm/i915: Do the fallback non-IRQ wait in ring throttle, too.
drm/i915: Work around gen7 BLT ring synchronization issues.
drm/i915: Make the fallback IRQ wait not sleep.
drm/i915: Add support for resetting the SO write pointers on gen7.
Jesse Barnes (5):
drm/i915: add SNB and IVB video sprite support v6
drm/i915: track sprite coverage and disable primary plane if possible
drm/i915: add color key support v4
drm/i915: don't disable a PCH DPLL that's in use
drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeeded
Keith Packard (1):
drm/i915: Clean up multi-threaded forcewake patch
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 86 ++++-
drivers/gpu/drm/i915/i915_dma.c | 5 +
drivers/gpu/drm/i915/i915_drv.c | 7 -
drivers/gpu/drm/i915/i915_drv.h | 6 +-
drivers/gpu/drm/i915/i915_gem.c | 10 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 63 +++-
drivers/gpu/drm/i915/i915_irq.c | 7 -
drivers/gpu/drm/i915/i915_reg.h | 161 +++++++-
drivers/gpu/drm/i915/intel_display.c | 206 ++++++++-
drivers/gpu/drm/i915/intel_drv.h | 40 ++
drivers/gpu/drm/i915/intel_fb.c | 6 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 30 ++-
drivers/gpu/drm/i915/intel_sprite.c | 668 ++++++++++++++++++++++++++++
include/drm/i915_drm.h | 40 ++
15 files changed, 1290 insertions(+), 46 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_sprite.c
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-10-23 11:10 Martin
@ 2011-10-23 22:31 ` Keith Packard
0 siblings, 0 replies; 31+ messages in thread
From: Keith Packard @ 2011-10-23 22:31 UTC (permalink / raw)
To: Martin, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
On Sun, 23 Oct 2011 13:10:00 +0200, Martin <marogge@onlinehome.de> wrote:
> I always get my hopes high when I read something like this. Maybe my Clarkdale
> based workstation will eventually get fully stable and I can close my ancient
> bugzilla entries.
Let us know if it helps...
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
@ 2011-10-23 11:10 Martin
2011-10-23 22:31 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Martin @ 2011-10-23 11:10 UTC (permalink / raw)
To: linux-kernel
Keith Packard wrote:
>
> Here's a pile of new code for the 3.2 series.
[...]
> drm/i915: close PM interrupt masking races in the irq handler
> drm/i915: close PM interrupt masking races in the rps work func
I always get my hopes high when I read something like this. Maybe my Clarkdale
based workstation will eventually get fully stable and I can close my ancient
bugzilla entries.
Martin
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2011-10-23 7:27 Keith Packard
0 siblings, 0 replies; 31+ messages in thread
From: Keith Packard @ 2011-10-23 7:27 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 6710 bytes --]
Here's a pile of new code for the 3.2 series.
Overview:
* 3 pipe support for IVB.
* eDP fixes for SNB
* Interrupt race condition fixes
* Switch from MI_FLUSH to PIPECONTROL
* VT-d work-around for ILK
The following changes since commit 0ac225e56997ef89f46eb51b02799a685b78f214:
Merge branch 'drm-intel-fixes' into drm-intel-next (2011-09-28 14:44:38 -0700)
are available in the git repository at:
git://people.freedesktop.org/~keithp/linux drm-intel-next
Adam Jackson (8):
drm/i915: Remove "i2c_speed" nonsense from child device table
drm/i915: Fix multifunction SDVO detection
drm/i915: Rename intel_sdvo_hdmi_sink_detect
drm/i915: Remove redundant bit shifting from intel_gmbus_set_speed
drm/i915/dp: Fix the math in intel_dp_link_required
drm/i915/dp: Remove eDP special cases from bandwidth checks
drm/i915/dp: Introduce is_cpu_edp()
drm/i915/dp: Fix eDP on PCH DP on CPT/PPT
Andi Kleen (1):
i915: Move i915_read/write out of line
Ben Widawsky (3):
drm/i915: Remove early exit on i915_gpu_idle
drm/i915: ILK + VT-d workaround
drm: Add Panel Self Refresh DP addresses
Chris Wilson (1):
drm/i915: Defend against userspace creating a gem object with size==0
Daniel Vetter (7):
drm/i915: close PM interrupt masking races in the irq handler
drm/i915: close PM interrupt masking races in the rps work func
drm/i915: properly cancel rps_work on module unload v2
drm/i915: fix swizzling on gen6+
drm/i915: simplify swapin/out swizzle checking a bit
io-mapping: ensure io_mapping_map_atomic _is_ atomic
drm/i915: drop KM_USER0 argument to k(un)map_atomic
David Woodhouse (2):
intel-iommu: Workaround IOTLB hang on Ironlake GPU
intel-iommu: Export a flag indicating that the IOMMU is used for iGFX.
Jesse Barnes (19):
drm/i915: Use PIPE_CONTROL for flushing on gen6+.
drm/i915: always set FDI composite sync bit
drm/i915: PLL macro cleanup and pipe assertion check
drm/i915: support 3 pipes on IVB+
drm/i915: split refclk code out of ironlake_crtc_mode_set
drm/i915: use transcoder select bits on VGA and HDMI on CPT
drm/i915: fix PCH PLL assertion check for 3 pipes
drm/i915: add PLL sharing support to handle 3 pipes
drm/i915: fix debug output for 3 pipe configs
drm/i915: fix IVB cursor support
drm/i915: fix transcoder PLL select masking
drm/i915: export a CPT mode set verification function
drm/i915: set watermarks for third pipe on IVB
drm/i915: if transcoder disable fails, say which
drm/i915: remove transcoder PLL mashing from mode_set per specs
drm/i915: read full receiver capability field during DP hot plug
drm/i915: add DP test request handling
drm/i915: fix ILK+ infoframe support
drm/i915: use correct SPD type value
Keith Packard (30):
drm/i915: broken copyright encoding in intel_bios.c
drm/i915: Use DRM_DEBUG_KMS for all messages in intel_bios.c
drv/i915: Pull display_clock_mode out of VBT table
drm/i915: Document a few more BDB_GENERAL_FEATURES bits from PCH BIOS
drm/i915: Allow SSC parameter to override VBT value
drm/i915: Fix PCH SSC reference clock settings
drm/i915: Use CK505 as non-SSC source where available
drm/i915: All PCH refclks are 120MHz
drm/i915: Initialize PCH refclks at modeset init time
drm/i915: Enable digital port hotplug on PCH systems
drm/i915: Shut down PCH interrupts during irq_uninstall
drm/i915: Only use VBT panel mode on eDP if no EDID is found
drm/i915: Check eDP power when doing aux channel communications
drm/i915: Unlock PCH_PP_CONTROL always
drm/i915: Check for eDP inside edp panel on/off funcs
drm/i915: Turn force VDD back off when panel running in intel_dp_dpms
drm/i915: Ensure panel is on during DPMS off
drm/i915: Delay DP i2c initialization until panel power timings are computed
drm/i915: Wrap DP EDID fetch functions to enable eDP panel power
drm/i915: Enable eDP panel power during I2C initialization sequence
drm/i915: Ensure eDP powered up during DP_SET_POWER operation in dp_prepare
drm/i915: Correct eDP panel power sequencing delay computations
drm/i915: Move eDP panel fixed mode from dev_priv to intel_dp
drm/i915: edp_panel_on does not need to return a bool
drm/i915: Create helper functions to determine eDP power state
drm/i915: Disable eDP VDD in a delayed work proc instead of synchronously
drm/i915: Restrict ILK-specific eDP power hack to ILK
drm/i915: No need to wait for eDP power off delay if panel is on
Merge branch 'edp-training-fixes' into drm-intel-next
Merge branch 'fix-pch-refclk' into foo
Kenneth Graunke (2):
drm/i915: Remove implied length of 2 from GFX_OP_PIPE_CONTROL #define.
drm/i915: Rename PIPE_CONTROL bit defines to be less terse.
Takashi Iwai (1):
drm/i915/panel: Always record the backlight level again (but cleverly)
drivers/char/agp/intel-gtt.c | 28 ++
drivers/gpu/drm/i915/i915_dma.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 47 +++-
drivers/gpu/drm/i915/i915_drv.h | 31 +--
drivers/gpu/drm/i915/i915_gem.c | 16 +-
drivers/gpu/drm/i915/i915_gem_debug.c | 6 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 30 ++
drivers/gpu/drm/i915/i915_gem_tiling.c | 15 +-
drivers/gpu/drm/i915/i915_irq.c | 36 ++-
drivers/gpu/drm/i915/i915_reg.h | 65 +++-
drivers/gpu/drm/i915/intel_bios.c | 19 +-
drivers/gpu/drm/i915/intel_bios.h | 20 +-
drivers/gpu/drm/i915/intel_crt.c | 18 +-
drivers/gpu/drm/i915/intel_display.c | 409 +++++++++++++++------
drivers/gpu/drm/i915/intel_dp.c | 588 +++++++++++++++++++++++--------
drivers/gpu/drm/i915/intel_drv.h | 7 +-
drivers/gpu/drm/i915/intel_hdmi.c | 30 +-
drivers/gpu/drm/i915/intel_i2c.c | 8 +-
drivers/gpu/drm/i915/intel_lvds.c | 8 +-
drivers/gpu/drm/i915/intel_panel.c | 21 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 150 +++++++-
drivers/gpu/drm/i915/intel_sdvo.c | 21 +-
drivers/iommu/intel-iommu.c | 31 +-
include/drm/drm_dp_helper.h | 61 ++++
include/drm/intel-gtt.h | 2 +
include/linux/io-mapping.h | 4 +
26 files changed, 1244 insertions(+), 431 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2011-09-20 3:55 Keith Packard
0 siblings, 0 replies; 31+ messages in thread
From: Keith Packard @ 2011-09-20 3:55 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 2513 bytes --]
This is a single patch which cleans up almost all of the whitespace
errors in the i915 driver. It currently merges cleanly with your fdo
drm-core-next tree.
I've checked this patch quite carefully, examining the .o files with
objdump -s to make sure nothing significant changed. The only thing that
found was a couple of debug messages which had blank space before newlines.
The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb:
Linux 3.1-rc6 (2011-09-12 14:02:02 -0700)
are available in the git repository at:
git://people.freedesktop.org/~keithp/linux drm-intel-next
Akshay Joshi (1):
Drivers: i915: Fix all space related issues.
drivers/gpu/drm/i915/dvo_ch7017.c | 2 +-
drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +-
drivers/gpu/drm/i915/dvo_ivch.c | 6 +-
drivers/gpu/drm/i915/dvo_sil164.c | 2 +-
drivers/gpu/drm/i915/dvo_tfp410.c | 14 +-
drivers/gpu/drm/i915/i915_debugfs.c | 38 +-
drivers/gpu/drm/i915/i915_dma.c | 44 ++--
drivers/gpu/drm/i915/i915_drv.c | 16 +-
drivers/gpu/drm/i915/i915_drv.h | 70 ++--
drivers/gpu/drm/i915/i915_gem.c | 12 +-
drivers/gpu/drm/i915/i915_gem_debug.c | 2 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 6 +-
drivers/gpu/drm/i915/i915_mem.c | 14 +-
drivers/gpu/drm/i915/i915_reg.h | 8 +-
drivers/gpu/drm/i915/i915_suspend.c | 8 +-
drivers/gpu/drm/i915/i915_trace.h | 46 ++--
drivers/gpu/drm/i915/intel_acpi.c | 2 +-
drivers/gpu/drm/i915/intel_bios.c | 4 +-
drivers/gpu/drm/i915/intel_bios.h | 2 +-
drivers/gpu/drm/i915/intel_crt.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 222 ++++++------
drivers/gpu/drm/i915/intel_dp.c | 26 +-
drivers/gpu/drm/i915/intel_drv.h | 12 +-
drivers/gpu/drm/i915/intel_opregion.c | 90 +++---
drivers/gpu/drm/i915/intel_overlay.c | 146 ++++----
drivers/gpu/drm/i915/intel_panel.c | 6 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 76 ++--
drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +-
drivers/gpu/drm/i915/intel_sdvo.c | 228 +++++++-------
drivers/gpu/drm/i915/intel_sdvo_regs.h | 558 +++++++++++++++---------------
drivers/gpu/drm/i915/intel_tv.c | 58 ++--
32 files changed, 867 insertions(+), 867 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-08-10 16:20 ` Andy Lutomirski
@ 2011-08-10 16:34 ` Keith Packard
0 siblings, 0 replies; 31+ messages in thread
From: Keith Packard @ 2011-08-10 16:34 UTC (permalink / raw)
To: Andy Lutomirski
Cc: Dave Airlie, Intel drivers, linux-kernel, dri-devel, stable
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
On Wed, 10 Aug 2011 12:20:14 -0400, Andy Lutomirski <luto@MIT.EDU> wrote:
> Can you ack at least this one:
>
> > Revert and fix "drm/i915/dp: remove DPMS mode tracking from DP"
> (i.e. d2b996ac698aebb28557355857927b8b934bb4f9)
>
> for -stable? It fixes an annoying regression in 3.0.
I'm working on a set of patches for -stable; we've found a number of
small patches that fix some fairly serious regressions.
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-08-04 3:14 Keith Packard
@ 2011-08-10 16:20 ` Andy Lutomirski
2011-08-10 16:34 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Andy Lutomirski @ 2011-08-10 16:20 UTC (permalink / raw)
To: Keith Packard; +Cc: Dave Airlie, Intel drivers, linux-kernel, dri-devel, stable
On 08/03/2011 11:14 PM, Keith Packard wrote:
>
> Here's a pile of fixes on top of the stuff already in drm-core-next.
>
> * Pile of mode setting fixes which eliminate a selection of bugs and
> other annoyances. Eliminates the 'stripey' effect when going from
> two to one monitor, makes hot-plug work after suspend/resume, turns
> off the pipe/plane in DPMS off.
Can you ack at least this one:
> Revert and fix "drm/i915/dp: remove DPMS mode tracking from DP"
(i.e. d2b996ac698aebb28557355857927b8b934bb4f9)
for -stable? It fixes an annoying regression in 3.0.
Thanks,
Andy
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2011-08-04 3:14 Keith Packard
2011-08-10 16:20 ` Andy Lutomirski
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-08-04 3:14 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 5055 bytes --]
Here's a pile of fixes on top of the stuff already in drm-core-next.
* Pile of mode setting fixes which eliminate a selection of bugs and
other annoyances. Eliminates the 'stripey' effect when going from
two to one monitor, makes hot-plug work after suspend/resume, turns
off the pipe/plane in DPMS off.
* DP mode setting cleanups and pessimizations that should recover from
unexpected situations better.
* HDMI info frame changes, including the addition of SPD (source
product description) frames.
* RC6 enabled by default (again). Given that we don't understand why it
doesn't work, and that we've found and fixed at least a couple of
RC6-related bugs, maybe it works now? Prepare to see this reverted
before 3.1 if we get regression reports (sigh).
The following changes since commit 5a96a899bbdee86024ab9ea6d02b9e242faacbed
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-07-26 09:21:09 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Adam Jackson (10):
drm/i915/dp: Zero the DPCD data before connection probe
drm/i915/dp: Move DPCD dump to common code instead of PCH-only
drm/i915/dp: Read more DPCD registers on connection probe
drm/i915/dp: Better hexdump of DPCD
drm/i915/dp: Retry DPCD fetch on G4X too
drm/i915/dp: Explicitly request 8/10 channel coding
drm/i915/pch: Fix integer math bugs in panel fitting
drm/i915/dp: Explicitly disable symbol scrambling while training
drm/i915/dp: Don't turn CPT DP ports on too early
drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend
Jesse Barnes (15):
drm/i915: provide more error output when mode sets fail
drm/i915: load the LUT before pipe enable on ILK+
drm/i915: apply timing generator bug workaround on CPT and PPT
drm/i915: flush plane control changes on ILK+ as well
drm/i915: fix CB tuning check for ILK+
drm/i915/hdmi: send AVI info frames on ILK+ as well
drm/i915: add GPU max frequency control file
drm/i915: provide more error output when mode sets fail
drm/i915: apply phase pointer override on SNB+ too
drm/i915: don't use uninitialized EDID bpc values when picking pipe bpp
drm/i915/dp: wait for previous AUX channel activity to clear
drm: track CEA version number if present
drm/i915/hdmi: split infoframe setting from infoframe type code
drm/i915/hdmi: HDMI source product description infoframe support
drm/i915: allow cache sharing policy control
Keith Packard (14):
drm/i915: Skip GPU wait for scanout pin while wedged
drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri
drm/i915: Hold mode_config->mutex during hotplug processing
drm/i915: Fixup for 'Hold mode_config->mutex during hotplug'
drm/i915: Use dp_detect_common in hotplug helper function
drm/i915: Rename i915_dp_detect_common to intel_dp_get_dpcd
drm/i915: In intel_dp_init, replace read of DPCD with intel_dp_get_dpcd
drm/i915: DP_PIPE_ENABLED must check transcoder on CPT
Revert and fix "drm/i915/dp: remove DPMS mode tracking from DP"
drm/i915: Set crtc DPMS mode to ON in intel_crtc_mode_set
drm/i915: Flush other plane register writes
drm/i915: Ignore GPU wedged errors while pinning scanout buffers
Revert "drm/i915/dp: Zero the DPCD data before connection probe"
drm/i915: Try enabling RC6 by default (again)
Michel Alexandre Salim (1):
drm/i915: Add quirk to disable SSC on Sony Vaio Y2
Ole Henrik Jahren (1):
drm/i915: Fix typo in DRM_I915_OVERLAY_PUT_IMAGE ioctl define
Pieterjan Camerlynck (1):
i915: add Dell OptiPlex FX170 to intel_no_lvds
drivers/gpu/drm/drm_edid.c | 9 ++
drivers/gpu/drm/i915/i915_debugfs.c | 189 +++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_dma.c | 6 +-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 3 +
drivers/gpu/drm/i915/i915_reg.h | 36 ++++++-
drivers/gpu/drm/i915/i915_suspend.c | 2 +
drivers/gpu/drm/i915/intel_display.c | 138 ++++++++++++++++++-----
drivers/gpu/drm/i915/intel_dp.c | 111 ++++++++++++-------
drivers/gpu/drm/i915/intel_drv.h | 23 ++++
drivers/gpu/drm/i915/intel_hdmi.c | 158 ++++++++++++++++++++++----
drivers/gpu/drm/i915/intel_lvds.c | 8 ++
drivers/gpu/drm/i915/intel_panel.c | 4 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +
include/drm/drm_crtc.h | 2 +
include/drm/i915_drm.h | 2 +-
18 files changed, 594 insertions(+), 105 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-07-13 18:04 ` Keith Packard
@ 2011-07-13 19:41 ` Wolfram Sang
0 siblings, 0 replies; 31+ messages in thread
From: Wolfram Sang @ 2011-07-13 19:41 UTC (permalink / raw)
To: Keith Packard; +Cc: Dave Airlie, linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
> Sorry for not pinging you when I didn't hear back.
No problem! Will fix it.
Thanks,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-07-13 17:22 ` Wolfram Sang
@ 2011-07-13 18:04 ` Keith Packard
2011-07-13 19:41 ` Wolfram Sang
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-07-13 18:04 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Dave Airlie, linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
On Wed, 13 Jul 2011 19:22:14 +0200, Wolfram Sang <w.sang@pengutronix.de> wrote:
> Is this one intentionally not in or did it slip through?
I thought I had replied to that -- it doesn't apply to either -fixes or
-next at this point. I can try to fix it, but I'd prefer it if you'd
figure out how things have changed and re-test a modified version.
Sorry for not pinging you when I didn't hear back.
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-07-13 16:39 Keith Packard
@ 2011-07-13 17:22 ` Wolfram Sang
2011-07-13 18:04 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Wolfram Sang @ 2011-07-13 17:22 UTC (permalink / raw)
To: Keith Packard; +Cc: Dave Airlie, linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
On Wed, Jul 13, 2011 at 09:39:41AM -0700, Keith Packard wrote:
>
> Here's most of the patches I'm hoping to land after 3.0:
Is this one intentionally not in or did it slip through?
drm/i915: gracefully bail out when init_clock_gating-pointer is not set [1]
[1] http://lists.freedesktop.org/archives/dri-devel/2011-July/012741.html
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2011-07-13 16:39 Keith Packard
2011-07-13 17:22 ` Wolfram Sang
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-07-13 16:39 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel, Intel drivers
[-- Attachment #1: Type: text/plain, Size: 4573 bytes --]
Here's most of the patches I'm hoping to land after 3.0:
* FBC cleanups from Chris Wilson. Fixes 'missing' CPU writes to the
front buffer. We've enabled FBC by default, if we find regressions
again, we'll turn it off before the release.
* DP and HDMI support for formats other than 8bpc from Jesse
Barnes. Supports depth 30 frame buffers at 10bpc.
* Shared LLC support (SNB, IVB) from Eric Anholt and Chris
Wilson. Shares the LLC between CPU and GPU, avoiding main memory
traffic latencies.
* Ring frequency scaling (SNB, IVB) from Jesse Barnes. This makes
memory bus speed track the GPU clock in addition to the CPU clock,
keeping memory running at full speed when the GPU is busy and the CPU
is idle.
* Disable hangcheck module parameter from Ben Widawsky. This exports a
module parameter to keep the kernel from resetting the GPU. It's
useful for GPU debugging where the GPU may be stuck waiting for the
debugger.
The following changes since commit a94919eaddaa3fede1df8563ce4d761a75374645:
drm/i915/ringbuffer: Idling requires waiting for the ring to be empty (2011-07-12 10:35:45 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Ben Widawsky (1):
drm/i915: hangcheck disable parameter
Chris Wilson (14):
drm/i915: Introduce i915_gem_object_finish_gpu()
drm/i915: Introduce i915_gem_object_finish_gtt()
drm/i915/gtt: Split out i915_gem_gtt_rebind_object()
drm/i915: Add an interface to dynamically change the cache level
drm/i915: Mark the cursor and the overlay as being part of the display planes
drm/i915: Combine pinning with setting to the display plane
drm/i915: Only export the generic intel_disable_fbc() interface
drm/i915: Replace direct calls to vfunc.disable_fbc with intel_disable_fbc()
drm/i915: Remove vestigial pitch from post-gen2 FBC control routines
drm/i915: Use of a CPU fence is mandatory to update FBC regions upon CPU writes
drm/i915: Set persistent-mode for ILK/SNB framebuffer compression
drm/i915: Disable FBC across page-flipping
drm/i915: Perform intel_enable_fbc() from a delayed task
drm/i915: Share the common work of disabling active FBC before updating
Eric Anholt (2):
drm/i915: Use the uncached domain for the display planes
drm/i915: Use the LLC mode on gen6 for everything but display.
Hugh Dickins (1):
drm/i915: more struct_mutex locking
Jesse Barnes (13):
cpufreq: expose a cpufreq_quick_get_max routine
drm/i915: load a ring frequency scaling table v3
drm/i915: enable ring freq scaling, RC6 and graphics turbo on Ivy Bridge v3
drm/i915: don't set SDVO color range on ILK+
drm/i915: don't set transcoder bpc on CougarPoint
drm/i915: set bpc for DP transcoder
drm/i915: split out Ironlake pipe bpp picking code
drm/i915: split out plane update code
drm/i915: use pipe bpp in DP link bandwidth calculations
drm/i915: use pipe bpp when setting HDMI bpc
drm: bpp and depth changes require full mode sets
drm/i915: check for supported depth at fb init time
drm/i915: use pipe bpp in DP link bandwidth calculation
Keith Packard (14):
drm/i915: i915_gem_object_finish_gtt must always release gtt mmap
drm/i915: Enable i915 frame buffer compression by default
drivers/cpufreq/cpufreq.c | 20 +
drivers/gpu/drm/drm_crtc_helper.c | 5 +
drivers/gpu/drm/i915/i915_debugfs.c | 41 ++-
drivers/gpu/drm/i915/i915_dma.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 5 +-
drivers/gpu/drm/i915/i915_drv.h | 27 +-
drivers/gpu/drm/i915/i915_gem.c | 191 ++++++++--
drivers/gpu/drm/i915/i915_gem_gtt.c | 39 +-
drivers/gpu/drm/i915/i915_irq.c | 13 +-
drivers/gpu/drm/i915/i915_reg.h | 5 +-
drivers/gpu/drm/i915/i915_suspend.c | 8 +-
drivers/gpu/drm/i915/intel_display.c | 699 +++++++++++++++++++++++--------
drivers/gpu/drm/i915/intel_dp.c | 17 +-
drivers/gpu/drm/i915/intel_drv.h | 9 +
drivers/gpu/drm/i915/intel_hdmi.c | 8 +-
drivers/gpu/drm/i915/intel_overlay.c | 6 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +-
include/linux/cpufreq.h | 5 +
18 files changed, 842 insertions(+), 266 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-05-26 4:13 ` Keith Packard
@ 2011-06-03 23:40 ` Keith Packard
0 siblings, 0 replies; 31+ messages in thread
From: Keith Packard @ 2011-06-03 23:40 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2001 bytes --]
Here's another handful of fixes that I had merged to
drm-intel-next. Once these are merged, I'll move drm-intel-fixes and
start putting stuff there for 3.0.
The following changes since commit 9e3c256d7d56a12a3242222945ce8e6347f93fa0:
drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge (2011-05-18 15:14:39 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Chris Wilson (5):
drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/
drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
drm/i915/crt: Explicitly return false if connected to a digital monitor
drm/i915: Remove unused enum "chip_family"
drm/i915: Share the common force-audio property between connectors
Dan Carpenter (1):
drm/i915: fix if statement in ivybridge irq handler
Daniel Vetter (3):
drm/i915: Only print out the actual number of fences for i915_error_state
drm/i915: not finding a fence is a non-recoverable condition
drm/915: fix relaxed tiling on gen2: tile height
Jason Stubbs (1):
drm/i915: fix regression after clock gating init split
Nicolas Kaiser (1):
drm: i915: correct return status in intel_hdmi_mode_valid()
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 8 +---
drivers/gpu/drm/i915/i915_gem.c | 28 +++++-----
drivers/gpu/drm/i915/i915_irq.c | 2 +-
drivers/gpu/drm/i915/intel_crt.c | 4 ++
drivers/gpu/drm/i915/intel_display.c | 89 ++++++++--------------------------
drivers/gpu/drm/i915/intel_dp.c | 15 +-----
drivers/gpu/drm/i915/intel_drv.h | 1 +
drivers/gpu/drm/i915/intel_hdmi.c | 16 +-----
drivers/gpu/drm/i915/intel_modes.c | 30 +++++++++++
drivers/gpu/drm/i915/intel_sdvo.c | 14 +-----
11 files changed, 80 insertions(+), 129 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-05-17 23:39 ` Keith Packard
@ 2011-05-26 4:13 ` Keith Packard
2011-06-03 23:40 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-05-26 4:13 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
This fixes a simple typo in the Ivybridge code -- an extra semicolon.
The following changes since commit 9e3c256d7d56a12a3242222945ce8e6347f93fa0:
drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge (2011-05-18 15:14:39 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Dan Carpenter (1):
drm/i915: fix if statement in ivybridge irq handler
drivers/gpu/drm/i915/i915_irq.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-05-17 22:00 ` Keith Packard
@ 2011-05-17 23:39 ` Keith Packard
2011-05-26 4:13 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-05-17 23:39 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
On Tue, 17 May 2011 15:00:01 -0700, Keith Packard <keithp@keithp.com> wrote:
>
> I've pushed four more patches to this branch for your merging pleasure.
And, one more which fixes non-eDP displays on Ironlake systems after the
Ivybridge merge. Sorry for not catching that in our testing...
The following changes since commit a51f7a66fb5e4af5ec4286baef940d06594b59d2:
drm/i915: enable rc6 by default (2011-05-17 14:33:38 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Keith Packard (1):
drm/i915: FDI link training broken on Ironlake by Ivybridge integration
drivers/gpu/drm/i915/intel_display.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PULL] drm-intel-next
2011-05-15 21:29 Keith Packard
@ 2011-05-17 22:00 ` Keith Packard
2011-05-17 23:39 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-05-17 22:00 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
I've pushed four more patches to this branch for your merging pleasure.
> * Disabling FBC on Ironlake to enable RC6 instead
Two patches for this are included.
The following changes since commit 645c62a5e95a5f9a8e0d0627446bbda4ee042024:
drm/i915: split PCH clock gating init (2011-05-13 18:12:53 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Feng, Boqun (2):
drm/i915: fix user irq miss in BSD ring on g4x
drm/i915: clean up unused ring_get_irq/ring_put_irq functions
Jesse Barnes (2):
drm/i915: add fbc enable flag, but disable by default
drm/i915: enable rc6 by default
drivers/gpu/drm/i915/i915_debugfs.c | 3 ++
drivers/gpu/drm/i915/i915_drv.c | 7 +++-
drivers/gpu/drm/i915/i915_drv.h | 2 +
drivers/gpu/drm/i915/intel_display.c | 5 +++
drivers/gpu/drm/i915/intel_ringbuffer.c | 50 ++++++++++++++----------------
5 files changed, 38 insertions(+), 29 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PULL] drm-intel-next
@ 2011-05-15 21:29 Keith Packard
2011-05-17 22:00 ` Keith Packard
0 siblings, 1 reply; 31+ messages in thread
From: Keith Packard @ 2011-05-15 21:29 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 5386 bytes --]
Here's most of the patches I'm hoping to land in 2.6.40:
* Ivybridge support (Gen7)
* Forcewake fixes for Sandybridge (And ivybridge).
* Temporary FB for load detect (hoping for some cleanups here)
Still pending:
* More modesetting cleanups (as always)
* Disabling FBC on Ironlake to enable RC6 instead
This sequence also assigns me as the the drm/i915 maintainer.
The following changes since commit 2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c:
drm/i915/lvds: Only act on lid notify when the device is on (2011-05-09 09:13:22 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Ben Widawsky (10):
drm/i915: fix ilk rc6 teardown locking
drm/1915: ringbuffer wait for idle function
drm/i915: fix rc6 initialization on Ironlake
drm/i915: debugfs for context information
drm/i915: proper use of forcewake
drm/i915: reference counted forcewake
drm/i915: forcewake struct mutex locking fixes
drm/i915: move gen6 rps handling to workqueue
drm/i915: debugfs interface for forcewake reference count
drm/i915: forcewake debugfs fix
Chris Wilson (12):
drm/i915: Move the irq wait queue initialisation into the ring init
drm/i915: Simplify return value from intel_get_load_detect_pipe
drm/i915: Propagate failure to set mode for load-detect pipe
drm/i915: Don't store temporary load-detect variables in the generic encoder
drm/i915: Remove unused supported_crtc from intel_load_detect_pipe
drm/i915: Pass the saved adjusted_mode when adding to the load-detect crtc
drm/i915: Remove dead code from intel_get_load_detect_pipe()
drm/i915: Remove dead code from intel_release_load_detect_pipe()
drm/i915: Attach a fb to the load-detect pipe
drm/i915: Rename agp_type to cache_level
drm/i915: Do not clflush snooped objects
drm/i915: Disable all outputs early, before KMS takeover
Eric Anholt (12):
drm/i915: Split the crtc_mode_set function along HAS_PCH_SPLIT() lines.
drm/i915: Move the vblank pre/post modeset to the common crtc_mode_set.
drm/i915: Remove the PCH paths from the pre-Ironlake crtc_mode_set().
drm/i915: Drop the eDP paths from the pre-Ironlake crtc_mode_set.
drm/i915: Drop the remaining bit of Ironlake code from i9xx_crtc_mode_set().
drm/i915: Drop non-HAS_PCH_SPLIT() code from ironlake_crtc_mode_set().
drm/i915: Drop remaining pre-Ironlake code from ironlake_crtc_mode_set().
drm/i915: Clean up leftover DPLL and LVDS register choice from pch split.
drm/i915: Fold the DPLL limit defines into the structs that use them.
drm/i915: Use existing function instead of open-coding fence reg clear.
drm/i915: Add support for fence registers on Ivybridge.
drm/i915: Update the location of the ringbuffers' HWS_PGA registers for IVB.
Jesse Barnes (20):
drm/i915: use i915_enable_rc6 on SNB too
drm/i915: make FDI training a display function
drm/i915: split irq handling into per-chipset functions
drm/i915: split enable/disable vblank code into chipset specific functions
drm/i915: add IS_GEN7 macro to cover Ivy Bridge and later
drm/i915: add IS_IVYBRIDGE macro for checks
drm/i915: Ivy Bridge has split display and pipe control
drm/i915: add swizzle/tiling support for Ivy Bridge
drm/i915: manual FDI training for Ivy Bridge
drm/i915: treat Ivy Bridge watermarks like Sandy Bridge
drm/i915: interrupt & vblank support for Ivy Bridge
drm/i915: page flip support for Ivy Bridge
drm/i915: ring support for Ivy Bridge
agp/intel: add Ivy Bridge support
drm/i915: add PantherPoint PCH ID
drm/i915: add Ivy Bridge PCI IDs and driver feature structs
drm/i915: set IBX pch type explicitly
drm/i915: split clock gating init into per-chipset functions
drm/i915: add Ivybridge clock gating init function
drm/i915: split PCH clock gating init
Keith Packard (1):
MAINTAINERS: Switch maintainer for drm/i915 to Keith Packard
MAINTAINERS | 4 +-
drivers/char/agp/intel-agp.c | 3 +
drivers/char/agp/intel-agp.h | 8 +
drivers/char/agp/intel-gtt.c | 10 +
drivers/gpu/drm/i915/i915_debugfs.c | 128 ++-
drivers/gpu/drm/i915/i915_dma.c | 60 +-
drivers/gpu/drm/i915/i915_drv.c | 61 +-
drivers/gpu/drm/i915/i915_drv.h | 111 +-
drivers/gpu/drm/i915/i915_gem.c | 36 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 35 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 310 ++++-
drivers/gpu/drm/i915/i915_reg.h | 35 +-
drivers/gpu/drm/i915/i915_suspend.c | 3 +-
drivers/gpu/drm/i915/intel_crt.c | 24 +-
drivers/gpu/drm/i915/intel_display.c | 2370 ++++++++++++++++++-------------
drivers/gpu/drm/i915/intel_drv.h | 19 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +-
drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +-
drivers/gpu/drm/i915/intel_tv.c | 13 +-
20 files changed, 2124 insertions(+), 1181 deletions(-)
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2013-04-15 9:40 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-31 9:03 [PULL] drm-intel-next Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2013-04-15 7:56 [pull] drm-intel-next Daniel Vetter
2013-04-15 9:43 ` Daniel Vetter
2013-04-02 9:34 [PULL] drm-intel-next Daniel Vetter
2012-11-16 17:17 [pull] drm-intel-next Daniel Vetter
2012-11-16 17:47 ` Alex Deucher
2012-11-16 17:49 ` Daniel Vetter
2012-09-13 14:18 Daniel Vetter
2012-09-17 23:09 ` Daniel Vetter
2013-03-15 2:11 ` Stéphane Marchesin
2013-03-17 19:46 ` Daniel Vetter
2012-07-13 18:55 Daniel Vetter
[not found] <20120506190931.GD4756@phenom.ffwll.local>
2012-05-10 13:55 ` [PULL] drm-intel-next Daniel Vetter
2012-01-05 3:35 Keith Packard
2012-01-05 15:24 ` Daniel Vetter
2011-10-23 11:10 Martin
2011-10-23 22:31 ` Keith Packard
2011-10-23 7:27 Keith Packard
2011-09-20 3:55 Keith Packard
2011-08-04 3:14 Keith Packard
2011-08-10 16:20 ` Andy Lutomirski
2011-08-10 16:34 ` Keith Packard
2011-07-13 16:39 Keith Packard
2011-07-13 17:22 ` Wolfram Sang
2011-07-13 18:04 ` Keith Packard
2011-07-13 19:41 ` Wolfram Sang
2011-05-15 21:29 Keith Packard
2011-05-17 22:00 ` Keith Packard
2011-05-17 23:39 ` Keith Packard
2011-05-26 4:13 ` Keith Packard
2011-06-03 23:40 ` Keith Packard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).