Re: [Intel-gfx] [PATCH 01/11] drm/i915: Move gtt and ppgtt under address space umbrella

2013-07-11 Thread Ben Widawsky
On Thu, Jul 11, 2013 at 02:14:06PM +0300, Imre Deak wrote: > On Mon, 2013-07-08 at 23:08 -0700, Ben Widawsky wrote: > > The GTT and PPGTT can be thought of more generally as GPU address > > spaces. Many of their actions (insert entries), state (LRU lists) and > > many of

Re: [Intel-gfx] [PATCH 05/11] drm/i915: Create VMAs

2013-07-11 Thread Ben Widawsky
On Thu, Jul 11, 2013 at 02:20:50PM +0300, Imre Deak wrote: > On Mon, 2013-07-08 at 23:08 -0700, Ben Widawsky wrote: > > Formerly: "drm/i915: Create VMAs (part 1)" > > > > In a previous patch, the notion of a VM was introduced. A VMA describes > > an area of p

Re: [Intel-gfx] [PATCH 06/11] drm/i915: plumb VM into object operations

2013-07-12 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 08:26:07AM +0200, Daniel Vetter wrote: > On Thu, Jul 11, 2013 at 07:23:08PM -0700, Ben Widawsky wrote: > > On Tue, Jul 09, 2013 at 09:15:01AM +0200, Daniel Vetter wrote: > > > On Mon, Jul 08, 2013 at 11:08:37PM -0700, Ben Widawsky wrote: > > [snip]

Re: [Intel-gfx] [PATCH 01/11] drm/i915: Move gtt and ppgtt under address space umbrella

2013-07-12 Thread Ben Widawsky
On Thu, Jul 11, 2013 at 04:57:30PM -0700, Ben Widawsky wrote: > On Thu, Jul 11, 2013 at 02:14:06PM +0300, Imre Deak wrote: > > On Mon, 2013-07-08 at 23:08 -0700, Ben Widawsky wrote: > > > The GTT and PPGTT can be thought of more generally as GPU address > > > spaces. Ma

[Intel-gfx] [benjamin.widaw...@intel.com: intel_gpu_top broken for HSW. Ideas needed]

2013-07-12 Thread Ben Widawsky
FWD'd from our internal list now that we have more insight. - Forwarded message from Ben Widawsky - Date: Thu, 11 Jul 2013 10:32:03 -0700 From: Ben Widawsky To: linux-...@linux.intel.com Subject: intel_gpu_top broken for HSW. Ideas needed Message-ID: <20130711173202.gb8...@i

Re: [Intel-gfx] [benjamin.widaw...@intel.com: intel_gpu_top broken for HSW. Ideas needed]

2013-07-12 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 07:16:37PM +0200, Daniel Vetter wrote: > On Fri, Jul 12, 2013 at 7:12 PM, Ben Widawsky > wrote: > > FWD'd from our internal list now that we have more insight. > > - Forwarded message from Ben Widawsky > > - > > > > Date:

Re: [Intel-gfx] [benjamin.widaw...@intel.com: intel_gpu_top broken for HSW. Ideas needed]

2013-07-12 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 10:12:39AM -0700, Ben Widawsky wrote: > FWD'd from our internal list now that we have more insight. > - Forwarded message from Ben Widawsky - > > Date: Thu, 11 Jul 2013 10:32:03 -0700 > From: Ben Widawsky > To: linux-...@linux.intel.com &

Re: [Intel-gfx] [PATCH 1/2] intel_get_llc_size: Small tool to query LLC size

2013-07-12 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 10:39:51AM -0700, Chad Versace wrote: > On 07/11/2013 11:53 AM, Ben Widawsky wrote: > >v2: Use the new param > > > >CC: Chad Versace > >CC: Bryan Bell > >Signed-off-by: Ben Widawsky > >--- > > tools/Makefile.am

Re: [Intel-gfx] [PATCH 1/6] drm/i915: Colocate all GT access routines in the same file

2013-07-12 Thread Ben Widawsky
es in what is also known as the System > Agent. > Bikesheds: Would have preferred the gt/pm_init split as a separate patch. intel_uncore_clear_errors/chec_errors seems silly to me. Acked-by: Ben Widawsky > > Signed-off-by: Chris Wilson > [snip] -- Ben Wid

Re: [Intel-gfx] [PATCH 2/6] drm/i915: Use a private interface for register access within GT

2013-07-12 Thread Ben Widawsky
referred #define __raw_posting_read Also, I don't mind dev_priv as an implicit arg, but I know Daniel has complained about such things before. positive (I didn't check for missed conversions) Reviewed-by: Ben Widawsky > + > +#define __raw_i915_read64(dev_priv__, reg__) readq(

Re: [Intel-gfx] [PATCH 3/6] drm/i915: Use the common register access functions for NOTRACE variants

2013-07-12 Thread Ben Widawsky
> bool trace) { \ > u32 __fifo_ret = 0; \ > - trace_i915_reg_rw(true, reg, val, sizeof(val)); \ > + if (trace) trace_i915_reg_rw(true, reg, val, sizeof(val)); \ > if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ > __fifo_ret = __gen6_gt_wait_f

Re: [Intel-gfx] [PATCH 4/6] drm/i915: Serialize all register access

2013-07-12 Thread Ben Widawsky
32 > reg, u##x val, bool tr > gen6_gt_check_fifodbg(dev_priv); \ > } \ > hsw_unclaimed_reg_check(dev_priv, reg); \ > + spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); \ > } > __i915_write(8, b) >

[Intel-gfx] [PATCH 3/3] drm/i915: eliminate vm->insert_entries()

2013-07-12 Thread Ben Widawsky
ppings. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 4 drivers/gpu/drm/i915/i915_gem_gtt.c | 15 --- 2 files changed, 19 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8f9569b..eb13399 100644 --- a/drive

[Intel-gfx] [PATCH 2/3] drm/i915: Use the new vm [un]bind functions

2013-07-12 Thread Ben Widawsky
Building on the last patch which created the new function pointers in the VM for bind/unbind, here we actually put those new function pointers to use. Split out as a separate patch to aid in review. I'm fine with squashing into the previous patch if people request it. Signed-off-by: Ben Wid

[Intel-gfx] [PATCH 1/3] drm/i915: Add bind/unbind object functions to VM

2013-07-12 Thread Ben Widawsky
be vm->bind, and not have to worry about distinguishing PPGTT vs GGTT. NOTE: At some point in the future, brining back insert_entries may in fact be desirable in order to use 1 bind/unbind for multiple generations of PPGTT. For now however, it's just not necessary. Signed-off-by: Ben

[Intel-gfx] [PATCH 12/15] [RFC] create vm->bind,unbind

2013-07-12 Thread Ben Widawsky
nces: http://lists.freedesktop.org/archives/intel-gfx/2013-January/023920.html Ben Widawsky (3): drm/i915: Add bind/unbind object functions to VM drm/i915: Use the new vm [un]bind functions drm/i915: eliminate vm->insert_entries() drivers/gpu/drm/i915/i915_drv.h| 23 +++--- drivers/gpu/drm/i9

Re: [Intel-gfx] [PATCH 1/7] drm/i915: remove SDV support from lpt_pch_init_refclk

2013-07-12 Thread Ben Widawsky
he documentation for the is_sdv cases was removed from BSpec. > > Signed-off-by: Paulo Zanoni Was hoping to get through the first 3 before I got too tired, but I didn't make it. This one is: Reviewed-by: Ben Widawsky Will try to finish up some more this weekend. > ---

[Intel-gfx] [PATCH 0/9] HW contest support for Ironlake

2013-07-14 Thread Ben Widawsky
firstly. The patch series is minimally tested. I told Chris and Ken at the offset, they'd need to do the heavy lifting on the testing front. Ben Widawsky (9): drm/i915: move ilk rc6 context setup drm/i915: Convert renderctx to a regular context drm/i915: Make ILK context objects more like oth

[Intel-gfx] [PATCH 2/9] drm/i915: Convert renderctx to a regular context

2013-07-14 Thread Ben Widawsky
The medium term plan is to just use the existing context code on ILK as well. The conversion just assists. Therefore, this is somewhat transient as I plan to kill renderctx quite soon. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 1/9] drm/i915: move ilk rc6 context setup

2013-07-14 Thread Ben Widawsky
Put it with the other context code since upcoming rework/enabling will be easier to handle with the similar code. Also, remove the comment which is now common knowledge, and incorrect, given that the powerctx is really the one that allows us to accomplish this on Ironlake. Signed-off-by: Ben

[Intel-gfx] [PATCH 3/9] drm/i915: Make ILK context objects more like others

2013-07-14 Thread Ben Widawsky
This is required so we can use the existing do_switch() which tries to map objects as non mappable and 64k aligned can work. Again, this is only required in order to ease the transition over to the existing context code. Signed-off-by: Ben Widawsky fixup! drm/i915: Convert renderctx to a

[Intel-gfx] [PATCH 5/9] drm/i915: Use do_switch for ILK renderctx

2013-07-14 Thread Ben Widawsky
a previous commit, this removes an MI_FLUSH. If issues occur, try adding that to the end of mi_set_context before complaining. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_context.c | 21 + 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers

[Intel-gfx] [PATCH 4/9] drm/i915: Add gen5 support to mi_set_context

2013-07-14 Thread Ben Widawsky
I remember clearly seeing the latter in a doc at one point however, I am going to leave it there. I had Ken look at his docs as well, and he could also find no note of either. NOTE2: Remember to put NOTE1 in the commit where we start using the new function for ILK. CC: Kenneth Graunke Signed-o

[Intel-gfx] [PATCH 6/9] drm/i915: HW contexts for ILK

2013-07-14 Thread Ben Widawsky
Turn on hardware contexts for Ironlake. This leaves the code in an awkward place where renderctx accomplishes nothing, but the code compiles and runs, and it makes the series overall more bisectable. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm

[Intel-gfx] [PATCH 8/9] drm/i915: Restore ILK powerctx pin attributes

2013-07-14 Thread Ben Widawsky
x27;t necessary (and conversely that I temporarily broke things earlier in the patch series; though I saw no such result). However, since ILK RC6 worked very well for those of us where it worked, I think messing with any of the code is unjustified. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/

[Intel-gfx] [PATCH 7/9] drm/i915: Use only the default context for ILK

2013-07-14 Thread Ben Widawsky
powerctx is still needed since that is a special ILK only thing. VLV has a similar funkiness, so we could probably try to join those two, but I see no point. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 6 - drivers/gpu/drm/i915/i915_drv.h | 2

[Intel-gfx] [PATCH] i965: Gen5: Use HW contexts on Ironlake

2013-07-14 Thread Ben Widawsky
NOTE: The error messages might need updating if the patches don't make 3.11. NOTE2: I'm not sure if mesa devs want to make HW contexts a hard requirement on GEN5, as it is on GEN6+. I think letting the patches soak for a few releases first, won't be a bad idea. Signed-off-b

[Intel-gfx] [PATCH 9/9] drm/i915: Re-enable rc6 on ILK (again^5)

2013-07-14 Thread Ben Widawsky
With the conversion to use the existing, well tested HW context code for the ILK RC6 render context, let's once again try to enable RC6 by default on ILK. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_pm.c | 4 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm

Re: [Intel-gfx] [PATCH 0/9] HW contest support for Ironlake

2013-07-14 Thread Ben Widawsky
Why do I always forget this...? You guys can easily clone the kernel sources here for easier testing: http://cgit.freedesktop.org/~bwidawsk/drm-intel/log/?h=ilk_contexts On Sun, Jul 14, 2013 at 09:22:44AM -0700, Ben Widawsky wrote: > By the request of Ken, and Chris, I've added suppor

[Intel-gfx] [PATCH 0/9] HW context support for Ironlake (was: Re: [PATCH 0/9] HW contest support for Ironlake)

2013-07-14 Thread Ben Widawsky
Changed the mail subject... I'm not even sure what HW Contest support might be. On Sun, Jul 14, 2013 at 09:24:16AM -0700, Ben Widawsky wrote: > Why do I always forget this...? > > You guys can easily clone the kernel sources here for easier testing: > > http://cgit.freedeskt

[Intel-gfx] [PATCH 9/9] [v2] drm/i915: enable rc6 on ILK again^5

2013-07-14 Thread Ben Widawsky
3:18 2012 +0200 drm/i915: disable rc6 on ilk when vt-d is enabled Do not try to turn on for VT-d case. v2: Updated commit message (Daniel) Disable with VT-d (Daniel) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_pm.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-

[Intel-gfx] [PATCH 3/9] [v2] drm/i915: Make ILK context objects more like others

2013-07-14 Thread Ben Widawsky
effects the power context. v2: Updated commit message. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 10f8f7cd..fd91b74 100644 --- a/drivers/gpu

Re: [Intel-gfx] [PATCH 2/6] drm/i915: Use a private interface for register access within GT

2013-07-14 Thread Ben Widawsky
*_NOTRACE would no longer be used after this patch. Maybe removing those here would also help clarify what you're doing, and make merge easier (in case someone adds a new one before this gets merged). And yes, I know you change it in an upcoming patch. Otherwise, looks good to me: Reviewed-b

Re: [Intel-gfx] [PATCH 4/6] drm/i915: Serialize all register access

2013-07-14 Thread Ben Widawsky
15_write(8, b) > __i915_write(16, w) Is there any reason you kept read##y instead of using the new raw functions? I would like to have only one place where we readl/writel if possible. Anyway, I can't find anything wrong with the patch otherwise, and I think we can try throwing it at all h

Re: [Intel-gfx] [PATCH 6/6] drm/i915: Convert the register access tracepoint to be conditional

2013-07-14 Thread Ben Widawsky
uch like the condition added to the trace itself, and reading probably the same docs as you agree it should be faster. Looking over our code. It looks like I missed trace events when writing the PTEs in i915_gem_gtt.c. Can you get around to fixing those up? [snip] -- Ben Widawsky, Inte

Re: [Intel-gfx] [PATCH 1/5] drm/i915/hsw: Set correct Haswell PTE encodings.

2013-07-14 Thread Ben Widawsky
questions. > If the answer is on spec or any other doc please send me in pvt! I think since we haven't yet published HSW docs, it's pretty fair of you to ask, and for me to address it publicly. > > > On Thu, Jul 4, 2013 at 3:02 PM, Ben Widawsky wrote: > > From: Ben

Re: [Intel-gfx] [PATCH 2/5] drm/i915: Define some of the eLLC magic

2013-07-14 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 09:02:37PM -0300, Rodrigo Vivi wrote: > On Thu, Jul 4, 2013 at 3:02 PM, Ben Widawsky wrote: > > The EDRAM present register isn't really defined in the docs. It just > > says check to see if it's set to 1. So I haven't defined the 1 value no

Re: [Intel-gfx] [PATCH 3.5/5] drm/i915: Do eLLC detection earlier

2013-07-14 Thread Ben Widawsky
On Sat, Jul 13, 2013 at 11:39:44AM +0200, Daniel Vetter wrote: > On Thu, Jul 04, 2013 at 11:42:46AM -0700, Ben Widawsky wrote: > > We need it before we set the pte_encode function pointers, which happens > > really early, in gtt_init. > > > > The problem with jus

Re: [Intel-gfx] [PATCH 1/3] drm/i915: unify PM interrupt preinstall sequence

2013-07-14 Thread Ben Widawsky
drm_device *dev) > POSTING_READ(SDEIER); > } > > +static void gen5_gt_irq_preinstall(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + > + /* and GT */ > + I915_WRITE(GTIMR, 0x); > + I915_WRITE

Re: [Intel-gfx] [PATCH 2/3] drm/i915: unify GT/PM irq postinstall code

2013-07-14 Thread Ben Widawsky
't steal an interrupt > event an accidentally trigger the spurious interrupt logic in the > core kernel. Note that after some discussion with Ben Widawsky we > think that we actually should clear the IIR registers in the > preinstall hook. But doing that is a much larger pat

Re: [Intel-gfx] [PATCH 3/3] drm/i915: extract rps interrupt enable/disable helpers

2013-07-14 Thread Ben Widawsky
n code. > > Hence this just unifies the vlv code with the snb-hsw code which > matched exactly before the VECS enabling. See > > commit eda63ffb906c2fb3b609a0e87aeb63c0f25b9e6b > Author: Ben Widawsky > Date: Tue May 28 19:22:26 2013 -0700 > >

Re: [Intel-gfx] [PATCH 2/3] drm/i915: unify GT/PM irq postinstall code

2013-07-14 Thread Ben Widawsky
On Sun, Jul 14, 2013 at 11:31:29PM +0200, Daniel Vetter wrote: > On Sun, Jul 14, 2013 at 01:55:20PM -0700, Ben Widawsky wrote: > > On Fri, Jul 12, 2013 at 10:43:26PM +0200, Daniel Vetter wrote: > > > Again extract a common helper. For the postinstall hook things are a > >

Re: [Intel-gfx] [PATCH 2/3] drm/i915: unify GT/PM irq postinstall code

2013-07-14 Thread Ben Widawsky
On Sun, Jul 14, 2013 at 11:31:29PM +0200, Daniel Vetter wrote: > On Sun, Jul 14, 2013 at 01:55:20PM -0700, Ben Widawsky wrote: > > On Fri, Jul 12, 2013 at 10:43:26PM +0200, Daniel Vetter wrote: [snip] > > > > Maybe while you're doing this, explain why the L3 parity inte

Re: [Intel-gfx] [PATCH 3/3] drm/i915: extract rps interrupt enable/disable helpers

2013-07-15 Thread Ben Widawsky
On Sun, Jul 14, 2013 at 11:35:46PM +0200, Daniel Vetter wrote: > On Sun, Jul 14, 2013 at 02:06:28PM -0700, Ben Widawsky wrote: > > On Fri, Jul 12, 2013 at 10:43:27PM +0200, Daniel Vetter wrote: > > > The VECS enabling required some changes to how rps interrupts are > >

Re: [Intel-gfx] [PATCH 1/5] drm/i915/hsw: Set correct Haswell PTE encodings.

2013-07-15 Thread Ben Widawsky
On Mon, Jul 15, 2013 at 03:23:00PM +0100, Damien Lespiau wrote: > On Thu, Jul 04, 2013 at 11:02:03AM -0700, Ben Widawsky wrote: > > +/* Cacheability Control is a 4-bit value. The low three bits are stored in > > * > > + * bits 3:1 of the PTE, while the fourth bit is st

Re: [Intel-gfx] [PATCH 0/9] HW contest support for Ironlake

2013-07-15 Thread Ben Widawsky
On Mon, Jul 15, 2013 at 01:44:13PM +0100, Chris Wilson wrote: > On Sun, Jul 14, 2013 at 09:22:44AM -0700, Ben Widawsky wrote: > > Finally, in the series I reenable rc6 on ILK. I've never had an issue > > with this on my ILK, but I recommend anyone testing on it who sees

Re: [Intel-gfx] [PATCH 8/9] drm/i915: Restore ILK powerctx pin attributes

2013-07-15 Thread Ben Widawsky
On Mon, Jul 15, 2013 at 11:30:15AM +0100, Chris Wilson wrote: > On Sun, Jul 14, 2013 at 09:22:52AM -0700, Ben Widawsky wrote: > > Now that I've killed renderctx, and the ILK pm code no longer has > > anything shared with the regular i915 context code, make the pin > >

[Intel-gfx] [PATCH 2/9] [v2] drm/i915: Convert renderctx to a regular context

2013-07-15 Thread Ben Widawsky
The medium term plan is to just use the existing context code on ILK as well. The conversion just assists. Therefore, this is somewhat transient as I plan to kill renderctx quite soon. v2: Make NULL check style consistent (Chris) Ditch superfluous 'else' (Chris) Signed-off-by: Be

Re: [Intel-gfx] [PATCH 4/6] drm/i915: Serialize all register access

2013-07-15 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 09:52:46PM +0100, Chris Wilson wrote: > On Fri, Jul 12, 2013 at 01:37:28PM -0700, Ben Widawsky wrote: > > On Fri, Jul 12, 2013 at 03:02:34PM +0100, Chris Wilson wrote: > > > In theory, the different register blocks were meant to be only ever > >

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Add bind/unbind object functions to VM

2013-07-15 Thread Ben Widawsky
On Sat, Jul 13, 2013 at 11:33:22AM +0200, Daniel Vetter wrote: > On Fri, Jul 12, 2013 at 09:45:54PM -0700, Ben Widawsky wrote: > > As we plumb the code with more VM information, it has become more > > obvious that the easiest way to deal with bind and unbind is to simply >

Re: [Intel-gfx] [PATCH 06/11] drm/i915: plumb VM into object operations

2013-07-15 Thread Ben Widawsky
On Fri, Jul 12, 2013 at 06:46:51PM +0200, Daniel Vetter wrote: > On Fri, Jul 12, 2013 at 08:46:48AM -0700, Ben Widawsky wrote: > > On Fri, Jul 12, 2013 at 08:26:07AM +0200, Daniel Vetter wrote: > > > On Thu, Jul 11, 2013 at 07:23:08PM -0700, Ben Widawsky wrote: > > > &

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Add bind/unbind object functions to VM

2013-07-15 Thread Ben Widawsky
On Mon, Jul 15, 2013 at 08:35:43PM -0700, Ben Widawsky wrote: > On Sat, Jul 13, 2013 at 11:33:22AM +0200, Daniel Vetter wrote: > > On Fri, Jul 12, 2013 at 09:45:54PM -0700, Ben Widawsky wrote: > > > As we plumb the code with more VM information, it has become more > > &g

Re: [Intel-gfx] Intel Crash

2013-07-15 Thread Ben Widawsky
On Mon, 15 Jul 2013 21:59:09 -0600 Oscar Dario Trujillo Tejada wrote: > Sorry about this but, I dont know a better place to send it > please read the bug report that I put in archlinux bug tracker > > https://bugs.archlinux.org/task/36155?project=1&cat%5B0%5D=10&string=xf86-video-intel > I am

Re: [Intel-gfx] [PATCH 0/9] HW contest support for Ironlake

2013-07-16 Thread Ben Widawsky
On Mon, Jul 15, 2013 at 01:44:13PM +0100, Chris Wilson wrote: > On Sun, Jul 14, 2013 at 09:22:44AM -0700, Ben Widawsky wrote: > > Finally, in the series I reenable rc6 on ILK. I've never had an issue > > with this on my ILK, but I recommend anyone testing on it who sees

[Intel-gfx] [PATCH] drm/i915: Make i915 events part of uapi

2013-07-16 Thread Ben Widawsky
Make the uevent strings part of the user API for people who wish to write their own listeners. CC: Chad Versace Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 8 include/uapi/drm/i915_drm.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a

[Intel-gfx] [PATCH 1/5] [v3] drm/i915: Move gtt and ppgtt under address space umbrella

2013-07-16 Thread Ben Widawsky
the future when we have Full PPGTT, I intend to create a separate scratch page for each. v2: Drop usage of i915_gtt_vm (Daniel) Make cleanup also part of the parent class (Ben) Modified commit msg Rebased v3: Properly share scratch page (Imre) Finish commit message (Daniel, Imre) Signed-o

[Intel-gfx] [PATCH 2/5] [v2] drm/i915: Put the mm in the parent address space

2013-07-16 Thread Ben Widawsky
;d hope one day this becomes almost irrelvant. v2: Rebased Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c| 4 ++-- drivers/gpu/drm/i915/i915_drv.h| 3 +-- drivers/gpu/drm/i915/i915_gem.c| 2 +- drivers/gpu/drm/i915/i915_gem_evict.c | 10 +-

[Intel-gfx] [PATCH 3/5] [v2] drm/i915: Create a global list of vms

2013-07-16 Thread Ben Widawsky
. While this in and of itself shouldn't be really be a problem, doing this allows us to WARN on an non-empty list, which is a problem. (Daniel) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ 2 files changed, 8 insertions(+)

[Intel-gfx] [PATCH 4/5] [v2] drm/i915: Move active/inactive lists to new mm

2013-07-16 Thread Ben Widawsky
ed with no i915_gtt_vm. In most places I added a new *vm local, since it will eventually be replaces by a vm argument. Put comment back inline, since it no longer makes sense to do otherwise. v4: Rebased on hangcheck/error state movement Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915

[Intel-gfx] [PATCH 5/5] [v5] drm/i915: Create VMAs

2013-07-16 Thread Ben Widawsky
vma on error path (Imre) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 48 ++- drivers/gpu/drm/i915/i915_gem.c| 71 +++--- drivers/gpu/drm/i915/i915_gem_evict.c | 12 -- drivers/gpu/drm/i915/i915_gem_

[Intel-gfx] [PATCH 5/6] drm/i915: Free stolen node on failed preallocation

2013-07-17 Thread Ben Widawsky
The odds of this happening are *extremely* unlikely. Reported-by: Imre Deak Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_stolen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 6/6] drm/i915: Create VMAs

2013-07-17 Thread Ben Widawsky
vma on error path (Imre) v6: Another missed vma free in i915_gem_object_bind_to_gtt error path (Imre) Fixed vma freeing in stolen preallocation (Imre) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 48 +- drivers/gpu/drm/i915/i915_gem.

Re: [Intel-gfx] [PATCH 6/6] drm/i915: Create VMAs

2013-07-17 Thread Ben Widawsky
On Thu, Jul 18, 2013 at 01:12:17AM +0100, Chris Wilson wrote: > On Wed, Jul 17, 2013 at 12:19:03PM -0700, Ben Widawsky wrote: > > Formerly: "drm/i915: Create VMAs (part 1)" > > > > In a previous patch, the notion of a VM was introduced. A VMA describes > > an

[Intel-gfx] [PATCH] drm/i915: Don't try to deref an unbound VMA

2013-07-17 Thread Ben Widawsky
This was actually correct in the original series, and is also fixed later in the patch series, but was broken in this middle state. I'm not really certain how I didn't hit it sooner. This patch should be squashed into: commit 8f588cfc349bbbd8ae62a13679b9efba41645064 Author: Ben Wida

Re: [Intel-gfx] [PATCH 2/8] lib: Introduce drmtest_skip_on_simulation()

2013-07-18 Thread Ben Widawsky
D I'm okay with what we ended up on the iterators. It's somewhat ugly, but I couldn't come up with anything less ugly, and the argv thing I think just won't work well for some of the weirder tests. > > -- > Jesse Barnes, Intel Open Source Technology Center > _____

Re: [Intel-gfx] [PATCH 4/7] drm/i915: extend lpt_enable_clkout_dp

2013-07-18 Thread Ben Widawsky
tmp = intel_sbi_read(dev_priv, SBI_DBUFF0, SBI_ICLK); > + tmp |= SBI_DBUFF0_ENABLE; > + intel_sbi_write(dev_priv, SBI_DBUFF0, tmp, SBI_ICLK); > + } > > mutex_unlock(&dev_priv->dpio_lock); > } > @@ -5305,7 +5322,7 @@ static voi

Re: [Intel-gfx] [PATCH 5/7] drm/i915: disable CLKOUT_DP when it's not needed

2013-07-18 Thread Ben Widawsky
(struct drm_device > *dev) > } > } > > - if (!has_vga) > - return; > - > - lpt_enable_clkout_dp(dev, true, true); > + if (has_vga) > + lpt_enable_clkout_dp(dev, true, true); > + else > + lpt_disable_clkout_dp(dev); > } -- Ben Widawsky, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 6/7] drm/i915: add functions to disable and restore LCPLL

2013-07-18 Thread Ben Widawsky
intel_set_cpu_fifo_underrun_reporting(struct > drm_device *dev, > extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, >enum transcoder pch_transcoder, >

Re: [Intel-gfx] [PATCH 7/7] drm/i915: add some assertions to hsw_disable_lcpll

2013-07-18 Thread Ben Widawsky
e for display software to disable LCPLL > @@ -5935,6 +5961,8 @@ void hsw_disable_lcpll(struct drm_i915_private > *dev_priv, > { > uint32_t val; > > + assert_can_disable_lcpll(dev_priv); > + Do we want to proceed if the above fails? I was sort of under the imp

Re: [Intel-gfx] [PATCH 0/7] HSW/LPT clocking code additional sequences

2013-07-18 Thread Ben Widawsky
++-- > drivers/gpu/drm/i915/intel_drv.h | 3 + > 3 files changed, 276 insertions(+), 103 deletions(-) > With the comments addressed in patches 1-5, they are: Reviewed-by: Ben Widawsky I'll wait for feedback before slapping tags on 6 & 7. -- Ben

Re: [Intel-gfx] [PATCH 6/7] drm/i915: add functions to disable and restore LCPLL

2013-07-18 Thread Ben Widawsky
On Thu, Jul 18, 2013 at 04:26:42PM -0700, Ben Widawsky wrote: > On Fri, Jul 12, 2013 at 02:19:41PM -0300, Paulo Zanoni wrote: > > From: Paulo Zanoni > > > > For now there are no callers, but these functions are going to be > > needed for the code that allows Package

[Intel-gfx] [PATCH 3/3] [v2] drm/i915: Make i915 events part of uapi

2013-07-18 Thread Ben Widawsky
error comments. CC: Chad Versace Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 8 include/uapi/drm/i915_drm.h | 22 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915

[Intel-gfx] [PATCH 1/3] drm/i915: Move error uevent to detection time

2013-07-18 Thread Ben Widawsky
n the workqueue. This was inspired as a result of the patch to move these events to the uapi. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.

[Intel-gfx] [PATCH 2/3] drm/i915: Change uevent for reset completion

2013-07-18 Thread Ben Widawsky
m not really sure what the motivation for this was originally, but to me it makes more sense to have a distinct event for error detection, and another event for reset start/finish (since reset is prone to failure). Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file chang

[Intel-gfx] [PATCH] [v3] drm/i915: Make i915 events part of uapi

2013-07-19 Thread Ben Widawsky
e introduced in last submission (Daniel) Fixed up comments to address removal changes. Thanks to Daniel Vetter for a majority of the parity error comments. CC: Chad Versace Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 8 include/uapi/drm/i915_drm.h | 24 +++

[Intel-gfx] [PATCH 00/12] Completion of i915 VMAs

2013-07-21 Thread Ben Widawsky
.freedesktop.org/archives/intel-gfx/2013-July/029974.html [2] http://lists.freedesktop.org/archives/intel-gfx/2013-July/030395.html [3] http://lists.freedesktop.org/archives/intel-gfx/2013-June/029408.html I've pushed a badly rebased onto -nightly here (not worth fixing): http://cgit.freedesktop.org/~bwidawsk/drm

[Intel-gfx] [PATCH 03/12] drm/i915: Update error capture for VMs

2013-07-21 Thread Ben Widawsky
encies on the mm_list change. Since I've moved the mm_list change to an earlier point in the series, we were able to accomplish it here and now. v3: Rebased over new error capture Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 4 +- dr

[Intel-gfx] [PATCH 02/12] drm/i915: Fix up map and fenceable for VMA

2013-07-21 Thread Ben Widawsky
cteristics. Functionally, this commit could very well be squashed in to the previous patch which updated object operations to take a VM argument. This commit is split out because it's a bit tricky (or at least it was for me). Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_de

[Intel-gfx] [PATCH 06/12] drm/i915: Use the new vm [un]bind functions

2013-07-21 Thread Ben Widawsky
s the smart ggtt which can do aliasing as needed Make sure we bind to global gtt when mappable and fenceable. I thought we could get away without this initialy, but we cannot. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 10 -- drivers/gpu/drm/i915/i915_

[Intel-gfx] [PATCH 05/12] drm/i915: Add map/unmap object functions to VM

2013-07-21 Thread Ben Widawsky
levels Use VMA for map/unmap, call it map/unmap (Daniel, Ben) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 51 ++ drivers/gpu/drm/i915/i915_gem_gtt.c | 100 2 files changed, 130 insertions(+), 21 deletions(-) diff

[Intel-gfx] [PATCH 10/12] drm/i915: Convert execbuf code to use vmas

2013-07-21 Thread Ben Widawsky
. Unfortunately, to do this, we must move the exec_list link from the obj structure. This list is reused in the shrinker code, so we must also modify the shrinker code to make this work. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 20 +- drivers/gpu/drm/i915/i915_gem.c

[Intel-gfx] [PATCH 12/12] drm/i915: Convert active API to VMA

2013-07-21 Thread Ben Widawsky
Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 5 ++--- drivers/gpu/drm/i915/i915_gem.c| 14 ++ drivers/gpu/drm/i915/i915_gem_context.c| 5 +++-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 4 files changed, 12 insertions(+), 14

[Intel-gfx] [PATCH 07/12] drm/i915: eliminate vm->insert_entries()

2013-07-21 Thread Ben Widawsky
ppings. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 1 file changed, 16 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 1de49a0..5c04887 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/

[Intel-gfx] [PATCH 08/12] drm/i915: Add vma to list at creation

2013-07-21 Thread Ben Widawsky
With the current code there shouldn't be a distinction - however with an upcoming change we intend to allocate a vma much earlier, before it's actually bound anywhere. To do this we have to check node allocation as well for the _bound() check. Signed-off-by: Ben Widawsky --- drive

[Intel-gfx] [PATCH 04/12] drm/i915: Track active by VMA instead of object

2013-07-21 Thread Ben Widawsky
not VMAs, having this function around will be useful even as we begin to use VMAs more in function arguments. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 15 +++ drivers/gpu/drm/i915/i915_gem.c| 64 ++ drivers/gpu/drm

[Intel-gfx] [PATCH 09/12] drm/i915: create vmas at execbuf

2013-07-21 Thread Ben Widawsky
lp us catch leaks, and other issues before we actually shuffle a bunch of stuff around. The subsequent patch to fix up the rest of execbuf should be mostly just moving code around, and this is the major functional change. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h

[Intel-gfx] [PATCH 11/12] drm/i915: Convert object coloring to VMA

2013-07-21 Thread Ben Widawsky
Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 3 --- drivers/gpu/drm/i915/i915_gem.c | 18 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fe41a3d..2b4f30c 100644 --- a

Re: [Intel-gfx] [PATCH 00/12] Completion of i915 VMAs

2013-07-22 Thread Ben Widawsky
On Mon, Jul 22, 2013 at 11:42:40AM +0100, Chris Wilson wrote: > On Sun, Jul 21, 2013 at 07:08:07PM -0700, Ben Widawsky wrote: > > Map, and unmap are logical functionalities to add for an address space. > > They do more or less what you'd think: take an object and create a >

Re: [Intel-gfx] [PATCH 5/5] drm/i915: add HAS_LP_PCH check

2013-07-22 Thread Ben Widawsky
the pixel path. Both > models return true for HAS_PCH_LPT. > > We already have a few places where we explicitly check for LPT-LP, so > add a HAS_LP_PCH check to simplify the code. > > Signed-off-by: Paulo Zanoni 1-4 is: Reviewed-by: Ben Widawsky This patch I believe should have com

Re: [Intel-gfx] [PATCH] drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt

2013-07-22 Thread Ben Widawsky
On Mon, Jul 22, 2013 at 12:12:38PM +0200, Daniel Vetter wrote: > This has been broken in > > commit 2f63315692b1d3c055972ad33fc7168ae908b97b > Author: Ben Widawsky > Date: Wed Jul 17 12:19:03 2013 -0700 > > drm/i915: Create VMAs > > which resulted in an OOPS

Re: [Intel-gfx] [PATCH 02/12] drm/i915: Fix up map and fenceable for VMA

2013-07-23 Thread Ben Widawsky
On Tue, Jul 23, 2013 at 06:42:35PM +0200, Daniel Vetter wrote: > On Sun, Jul 21, 2013 at 07:08:09PM -0700, Ben Widawsky wrote: > > formerly: "drm/i915: Create VMAs (part 3.5) - map and fenceable > > tracking" > > > > The map_and_fenceable tracking is per obj

Re: [Intel-gfx] Maintainer-review fluff (was: Re: [PATCH 01/12] drm/i915: plumb VM into object operations)

2013-07-26 Thread Ben Widawsky
is all rather fluffy and very much an inexact science, > but it's the only tools I have as a maintainer. The alternative of doing > shit myself or checking everything myself in-depth just doesnt scale. > > Cheers, Daniel > > > On Mon, Jul 22, 2013 at 4:08 AM, Ben Widawsky wrote:

Re: [Intel-gfx] [PATCH 06/12] drm/i915: Use the new vm [un]bind functions

2013-07-26 Thread Ben Widawsky
On Tue, Jul 23, 2013 at 06:54:43PM +0200, Daniel Vetter wrote: > On Sun, Jul 21, 2013 at 07:08:13PM -0700, Ben Widawsky wrote: > > Building on the last patch which created the new function pointers in > > the VM for bind/unbind, here we actually put those new function poin

Re: [Intel-gfx] [PATCH 04/12] drm/i915: Track active by VMA instead of object

2013-07-26 Thread Ben Widawsky
On Tue, Jul 23, 2013 at 06:48:09PM +0200, Daniel Vetter wrote: > On Sun, Jul 21, 2013 at 07:08:11PM -0700, Ben Widawsky wrote: > > Even though we want to be able to track active by VMA, the rest of the > > code is still using objects for most internal APIs. To solve this

Re: [Intel-gfx] Maintainer-review fluff (was: Re: [PATCH 01/12] drm/i915: plumb VM into object operations)

2013-07-26 Thread Ben Widawsky
ter than the after you merge. My desire is to get to something like #3. I had a really long paragraph on why and how we could do that, but I've redacted it. Let's just leave it as, I think that should be the goal. Finally, let me clear that none of the discussion I'm having with

Re: [Intel-gfx] [PATCH] drm/i915: Squelch repeated reasoning for why FBC cannot be activated

2013-07-27 Thread Ben Widawsky
uot;framebuffer not tiled or fenced, disabling > compression\n"); > - dev_priv->fbc.no_fbc_reason = FBC_NOT_TILED; > + if (set_no_fbc_reason(dev_priv, FBC_NOT_TILED)) > + DRM_DEBUG_KMS("framebuffer not tiled or fenced, > disa

Re: [Intel-gfx] [PATCH] drm/i915: Squelch repeated reasoning for why FBC cannot be activated

2013-07-27 Thread Ben Widawsky
On Sat, Jul 27, 2013 at 11:30:16PM +0100, Chris Wilson wrote: > On Sat, Jul 27, 2013 at 03:13:16PM -0700, Ben Widawsky wrote: > > On Sat, Jul 27, 2013 at 05:23:55PM +0100, Chris Wilson wrote: > > > > This should only return true if no_fbc_reason != FBC_OK, right? >

[Intel-gfx] [PATCH] drm/i915: fix missed hunk after GT access breakage

2013-07-30 Thread Ben Widawsky
e all GT access routines in the same file It is introduced by: commit 181d1b9e31c668259d3798c521672afb8edd355c Author: Daniel Vetter Date: Sun Jul 21 13:16:24 2013 +0200 drm/i915: fix up gt init sequence fallout Reported-by: Dave Jones Cc: stable Signed-off-by: Ben Widawsky --- driver

Re: [Intel-gfx] [PATCH] drm/i915: Use the same pte_encoding for ppgtt as for gtt

2013-07-31 Thread Ben Widawsky
e > other. > > For instance, > > commit 4d15c145a6234d999c0452eec0d275c1fbf0688c > Author: Ben Widawsky > Date: Thu Jul 4 11:02:06 2013 -0700 > > drm/i915: Use eLLC/LLC by default when available > > only extends the gtt to use eLLC/LLC cacheing and forgets t

Re: [Intel-gfx] [PATCH] drm/i915: Squelch repeated reasoning for why FBC cannot be activated

2013-07-31 Thread Ben Widawsky
On Sun, Jul 28, 2013 at 12:02:16AM +0100, Chris Wilson wrote: > On Sat, Jul 27, 2013 at 03:56:29PM -0700, Ben Widawsky wrote: > > What I meant is, you don't want it to return true if you go from: > > FBC_OFF_FOR_REASON_A->FBC_OFF_FOR_REASON_B > > > > Only when

<    1   2   3   4   5   6   7   8   9   10   >