[PULL] drm-intel-next for 3.11
Hi Dave, So I've figured it's time to upon up drm-next with a nice pile of intel patches. And there seems to be some other stuff pending on dri-devel already, too ;-) Highlights (copy-pasted from my testing cycle mails): - fbc support for Haswell (Rodrigo) - streamlined workaround comments, including an igt tool to grep for them (Damien) - sdvo and TV out cleanups, including a fixup for sdvo multifunction devices - refactor our eDP mess a bit (Imre) - don't register the hdmi connector on haswell when desktop eDP is present - vlv support is no longer preliminary! - more vlv fixes from Jesse for stolen and dpll handling - more flexible power well checking infrastructure from Paulo - a few gtt patches from Ben - a bit of OCD cleanups for transcoder #defines and an assorted pile of smaller things. - fixes for the gmch modeset sequence - a bit of OCD around plane/pipe usage (Ville) - vlv turbo support (Jesse) - tons of vlv modeset fixes (Jesse et al.) - vlv pte write fixes (Kenneth Graunke) - hpd filtering to avoid costly probes on unaffected outputs (Egbert Eich) - intel dev_info cleanups and refactorings (Damien) - vlv rc6 support (Jesse) - random pile of fixes around non-24bpp modes handling - asle/opregion cleanups and locking fixes (Jani) - dp dpll refactoring - improvements for reduced_clock computation on g4x/ilk+ - pfit state refactored to use pipe_config (Jesse) - lots more computed modeset state moved to pipe_config, including readout and cross-check support - fdi auto-dithering for ivb B/C links, using the neat pipe_config improvements - drm_rect helpers plus sprite clipping fixes (Ville) - hw context refcounting (Mika + Ben) Note that the merge with Linus' tree was a bit messy so I've also pushed out a 2nd tag drm-intel-next-2013-05-20-merged which has the backmerge which is already in my queue. Pull request for the merged tree below. Just drop the -merged suffix if you want to have some fun ;-) Cheers, Daniel The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-05-20-merged for you to fetch changes up to e1b73cba13a0cc68dd4f746eced15bd6bb24cda4: Merge tag 'v3.10-rc2' into drm-intel-next-queued (2013-05-21 09:52:16 +0200) Ben Widawsky (3): drm/i915: Assert mutex_is_locked on context lookup drm/i915: BUG_ON bad PPGTT offset drm/i915: Extract PDE writes Chris Wilson (2): drm/i915: Only print the info message about incresing stolen size for FBC once drm/i915: put context upon switching Damien Lespiau (12): drm/i915: Remove mention of Haswell in DDI code drm/i915: Turn DEV_INFO_FLAGS into a foreach style macro drm/i915: Replace the line of %s by a DEV_INFO_FOR_EACH_FLAG() invocation drm/i915: Use DEV_INFO_FOR_EACH_FLAG() to declare flags as well drm/i915: Turn HAS_DDI() into a device_info flag drm/i915: Introduce HAS_FPGA_DBG_UNCLAIMED() drm/i915: Turn HAS_FPGA_DBG_UNCLAIMED into a device_info flag drm/i915: Ivybridge is the odd one when it comes to pipe scalers drm/i915: Add platform information to implemented workarounds drm/i915: Add references to some workaround we implement drm/i915: Compute WR PLL dividers dynamically drm/i915: Add missing platform tags to FBC workaround comments Daniel Vetter (56): drm/i915: don't enable the plane too early in i9xx_crtc_mode_set drm/i915: drop redundant vblank waits drm/i915: add pipe asserts for the crtc enable sequence drm/i915: add i9xx pfit pipe asserts drm/i915: move debug output back to the right place drm/i915: fix VLV limits drm/i915: magic VLV PLL registers in the dpio sideband drm/i915: disable interrupts earlier in the driver unload code drm/i915: Disable high-bpc on pre-1.4 EDID screens drm/i915: Fixup non-24bpp support for VGA screens on Haswell drm/i915: consolidate pch pll computations a bit drm/i915: shovel compute clock into crtc->config.dpll on ilk drm/i915: move dp clock computations to encoder->compute_config drm/i915: use pipe_config for lvds dithering drm/i915: don't force matching p1 for g4x/ilk+ reduced pll settings drm/i915: remove redundant has_pch_encoder check drm/i915: simplify config->pixel_multiplier handling drm/i915: put the right cpu_transcoder into pipe_config for hw state readout drm/i915: force bpp for eDP panels drm/i915: drop adjusted_mode from *_set_pipeconf functions drm/i915: implement high-bpc + pipeconf-dither support for g4x/vlv drm/i915: allow high-bpc modes on DP drm/i915: move intel_crtc->fdi_lanes to pipe_config drm/i915: hw state readout support for pipe_config->fdi_lanes drm/i915: split up fdi_
Re: [pull] drm-intel-next
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
[pull] drm-intel-next
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 a
[PULL] drm-intel-next
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 DS
Re: [pull] drm-intel-next
On Fri, Mar 15, 2013 at 3:11 AM, Stéphane Marchesin 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [pull] drm-intel-next
On Thu, Sep 13, 2012 at 7:18 AM, 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 > > 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 outup
[pull] drm-intel-next for 3.9
Hi Dave,
Probably the last feature pull for 3.9, there's some fixes outstanding
thought that I'd like to sneak in. And maybe 3.8 takes a bit longer ...
Anyway, highlights of this pull:
- Kill the horrible IS_DISPLAYREG hack to handle the mmio offset movements
on vlv, big thanks to Ville.
- Dynamic power well support for Haswell, shaves away a bit when only
using the eDP port on pipe A (Paulo). Plus unclaimed register fixes
uncovered by this.
- Clarifications of the gpu hang/reset state transitions, hopefully fixing
a few spurious -EIO deaths in userspace.
- Haswell ELD fixes.
- Some more (pp)gtt cleanups from Ben.
- A few smaller things all over.
Plus all the stuff from the previous rather small pull request:
- Broadcast RBG improvements and reduced color range fixes from Ville.
- Ben is on a "kill legacy gtt code for good" spree, first pile of patches
included.
- No-relocs and bo lut improvements for faster execbuf from Chris.
- Some refactorings from Imre.
QA filed tons of bugs this cycle, all due to us finally enabling all the
really anal timestamp and vblank counter checks in kms_flip, now that the
locking is fixed and EDID reads don't cause stalls any more. In short, our
vblank code seems to be ridiculously racy and broken :( Otoh that's not
really news.
Cheers, Daniel
The following changes since commit b5cc6c0387b2f8d269c1df1e68c97c958dd22fed:
Merge tag 'drm-intel-next-2012-12-21' of
git://people.freedesktop.org/~danvet/drm-intel into drm-next (2013-01-17
20:34:08 +1000)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-02-01
for you to fetch changes up to 7d37beaaf3dbc6ff16f4d32a4dd6f8c557c6ab50:
GPU/i915: Fix acpi_bus_get_device() check in
drivers/gpu/drm/i915/intel_opregion.c (2013-02-01 11:01:50 +0100)
Ben Widawsky (16):
drm/i915: Kill gtt_end
drm/i915: Mappable_end can't ever be > end
drm/i915: Remove gtt_mappable_total
drm/i915: Create a gtt structure
drm/i915: Remove use on gma_bus_addr on gen6+
drm/i915: Remove use of gtt_mappable_entries
drm/i915: Cut out the infamous ILK w/a from AGP layer
drm/i915: Remove scratch page from shared
drm/i915: Needs_dmar, not
agp/intel: Add gma_bus_addr
drm/i915: Implement WaVSRefCountFullforceMissDisable
drm/i915: Error state should print /sys/kernel/debug
drm/i915: Add probe and remove to the gtt ops
drm/i915: remove intel_gtt structure
drm/i915: Reclaim GTT space for failed PPGTT
drm/i915: Fix CAGF for HSW
Changlong Xie (1):
drm/i915: gen6_gmch_remove can be static
Chris Wilson (9):
drm/i915: Add a debug interface to forcibly evict and shrink our object
caches
drm/i915: Bail if we attempt to allocate pages for a purged object
drm/i915: Mark a temporary allocation for copy-from-user as such
drm/i915: Take the handle idr spinlock once for looking up the exec
objects
drm/i915: Move the execbuffer objects list from the stack into the tracker
drm/i915: Use the reloc.handle as an index into the execbuffer array
drm/i915: Only insert the mb() before updating the fence parameter
drm/i915: Only apply the mb() when flushing the GTT domain during a finish
drm/i915: Only run idle processing from i915_gem_retire_requests_worker
Daniel Vetter (21):
drm/i915: wake up all pageflip waiters
drm/i915: Allow userspace to hint that the relocations were known
drm/i915: move dev_priv->mm out of line
drm/i915: extract hangcheck/reset/error_state state into substruct
drm/i915: move wedged to the other gpu error handling stuff
drm/i915: fix reset handling in the throttle ioctl
drm/i915: clear up wedged transitions
drm/i915: create a race-free reset detection
drm/i915: clarify concurrent hang detect/gpu reset consistency
drm/i915: fixup sbi_read/write locking
drm/i915: move modeset checks out of save/restore_modeset_reg
drm/i915: extract ums suspend/resume into i915_ums.c
drm/i915: dont save/restore VGA state for kms
drm/i915: move DP save/restore into i915_ums.c
drm/i915: vfuncs for gtt_clear_range/insert_entries
drm/i915: vfuncs for ppgtt
drm/i915: pte_encode is gen6+
drm/i915: extract hw ppgtt setup/cleanup code
drm/i915: kill cargo-culted locking from power well code
drm/i915: don't run hsw power well code on !hsw
drm/i915: dynamic Haswell display power well support
Egbert Eich (1):
drm/i915: Remove pch_rq_mask from struct drm_i915_private.
Imre Deak (3):
drm/i915: merge get_gtt_alignment/get_unfenced_gtt_alignment()
drm/i915: merge {i965, sandybridge}_write_fence_reg()
drm/i915: use gtt_get_size() instead of open coding it
Jani Nikula (3):
drm/i915: add quirk to invert brightness on eMachines G725
drm/i
Re: [pull] drm-intel-next
On Fri, Nov 16, 2012 at 6:47 PM, Alex Deucher 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [pull] drm-intel-next
On Fri, Nov 16, 2012 at 12:17 PM, Daniel Vetter 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[pull] drm-intel-next
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:
[pull] drm-intel-next for 3.8
Hi Dave, Quite a pile since this is 4 weeks worth of patches: - 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. For Haswell display support, this is not yet everything, big things still missing are: - hdmi/dp encoder unification, otherwise we can't enable non-eDP outputs - vga fixes (which essentially required forking all the fdi/pch code) Both are already in -next-queued, so for the next pull I plan to move Haswell out of experimental support. Note that this also contains a -rc2 backmerge, which I've botched up slightly:( Luckily Jani caught me and fixed things up, his patch is included on top of what QA beat on. For drm core stuff I have two series outstanding: - kerneldoc/DocBook patches demanded by Lauren Pinchart. Note that the last patch in that series depends upon the dp helper refactoring included in here. - relaunched hpd rework, requested&reviewed by Alex Deucher. Can you please look into slurping these into drm-next, too? Yours, 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 c8241969b44438c9335b59d375b627214bc36483: drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again (2012-11-02 09:57:28 +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 (3): drm/i915: Extract PCU communication drm/i915: Workaround to bump rc6 voltage to 450 drm/i915: Add rc6vids to debugfs Chris Wilson (5): 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 Damien Lespiau (9): 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 Daniel Vetter (24): 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 fro
Re: [pull] drm-intel-next
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 c
Re: [Intel-gfx] [pull] drm-intel-next
Hi 2012/9/14 Daniel Vetter : > On Fri, Sep 14, 2012 at 09:55:58AM -0400, Bobby Powers wrote: >> This tree gives me recursive dependency problems, which ends up >> removing a big (& important) part of my .config: >> >> [bpowers@fina linux]$ git reset --hard drm-intel-next-2012-09-09 >> HEAD is now at e04190e drm/fb helper: don't call >> drm_helper_connector_dpms directly >> [bpowers@fina linux]$ git status >> # On branch master >> # Your branch and 'origin/master' have diverged, >> # and have 207 and 323 different commits each, respectively. >> # >> nothing to commit (working directory clean) >> [bpowers@fina linux]$ make oldconfig >> scripts/kconfig/conf --oldconfig Kconfig >> drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected! >> drivers/gpu/drm/udl/Kconfig:1:symbol DRM_UDL depends on >> USB_ARCH_HAS_HCD >> drivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT >> drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB >> drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL >> # >> # configuration written to .config >> # > You want this: http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=95ca19cf8cbf6163805dc9dc6a83f73b3e75ea13 > That's an issue with Dave Airlie's udl code I'd say - the drm-intel-next > tree here simply includes a few drm-next patches already. Dave? > -Daniel > >> >> >> I've attached my config & the diff between what is attached and the >> result of make oldconfig. Let me know if there is any other info that >> would help, or if I'm just doing something boneheaded. Thanks! >> >> yours, >> Bobby >> >> On Thu, Sep 13, 2012 at 10:18 AM, 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 >> > >> > 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 >> >
Re: [Intel-gfx] [pull] drm-intel-next
On Fri, Sep 14, 2012 at 09:55:58AM -0400, Bobby Powers wrote: > This tree gives me recursive dependency problems, which ends up > removing a big (& important) part of my .config: > > [bpowers@fina linux]$ git reset --hard drm-intel-next-2012-09-09 > HEAD is now at e04190e drm/fb helper: don't call > drm_helper_connector_dpms directly > [bpowers@fina linux]$ git status > # On branch master > # Your branch and 'origin/master' have diverged, > # and have 207 and 323 different commits each, respectively. > # > nothing to commit (working directory clean) > [bpowers@fina linux]$ make oldconfig > scripts/kconfig/conf --oldconfig Kconfig > drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected! > drivers/gpu/drm/udl/Kconfig:1:symbol DRM_UDL depends on > USB_ARCH_HAS_HCD > drivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT > drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB > drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL > # > # configuration written to .config > # That's an issue with Dave Airlie's udl code I'd say - the drm-intel-next tree here simply includes a few drm-next patches already. Dave? -Daniel > > > I've attached my config & the diff between what is attached and the > result of make oldconfig. Let me know if there is any other info that > would help, or if I'm just doing something boneheaded. Thanks! > > yours, > Bobby > > On Thu, Sep 13, 2012 at 10:18 AM, 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 > > > > 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_
[pull] drm-intel-next
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 co
[PULL] drm-intel-next
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 +-
[pull] drm-intel-next
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/i
