[Intel-gfx] [PATCH 2/6] drm/i915: Debugfs for setting debug_flags

2013-06-28 Thread Ben Widawsky
The lock in the setter isn't really necessary - however we're doing some more stuff there presently, so just leave it in... Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 45 + 1 file changed, 45 insertions(+) diff --git a/d

[Intel-gfx] [PATCH 4/6] drm/i915: Synchronous execbuf for debug

2013-06-28 Thread Ben Widawsky
some basic tests). Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 1 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h inde

[Intel-gfx] [PATCH 3/6] drm/i915: Reset scratch pages when using debug_flags

2013-06-28 Thread Ben Widawsky
Instead of waiting an indeterminate amount of time for ranges to get cleared with the PTEs that will fault, do it immediately. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 7 +++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gem_gtt.c

[Intel-gfx] [PATCH 5/6] drm/i915: Let userspace create a faultable pad page

2013-06-28 Thread Ben Widawsky
ut it requires a lot of work to make that happen. Instead, do everything as we normally would, and clear out the last page after it's all done. NOTE: This does not convert previously allocated objects. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gp

[Intel-gfx] [PATCH 6/6] drm/i915: distinguish pad and fault pages

2013-06-28 Thread Ben Widawsky
it. It can be dropped without too much impact to the series though. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 6 -- drivers/gpu/drm/i915/i915_gem_gtt.c | 42 - 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a

Re: [Intel-gfx] [PATCH 0/6] Page faults to help user space debug

2013-06-28 Thread Ben Widawsky
On Fri, Jun 28, 2013 at 11:39:53PM +0100, Chris Wilson wrote: > On Fri, Jun 28, 2013 at 03:23:31PM -0700, Ben Widawsky wrote: > > This series originated from the request from Paul, "can you enable page > > faults"? After some though and discussion, we came up with

Re: [Intel-gfx] [PATCH 57/66] drm/i915: Disallow pin with full ppgtt

2013-06-28 Thread Ben Widawsky
On Fri, Jun 28, 2013 at 09:55:27AM +0100, Chris Wilson wrote: > On Thu, Jun 27, 2013 at 04:30:58PM -0700, Ben Widawsky wrote: > > Pin doesn't fit with PPGTT since the interface doesn't allow for the > > context for which we want to pin. > > Nak. Pin still retain

Re: [Intel-gfx] [PATCH 0/6] Page faults to help user space debug

2013-06-29 Thread Ben Widawsky
On Sat, Jun 29, 2013 at 04:38:00PM +0200, Daniel Vetter wrote: > On Sat, Jun 29, 2013 at 12:23 AM, Ben Widawsky wrote: > > 2. echo 2 > /sys/kernel/debug/dri/0/i915_debug_flags > > Unbind all buffers synchronously, so any batch which has bad code will fault > > every t

Re: [Intel-gfx] [PATCH 57/66] drm/i915: Disallow pin with full ppgtt

2013-06-29 Thread Ben Widawsky
On Sat, Jun 29, 2013 at 04:34:07PM +0200, Daniel Vetter wrote: > On Sat, Jun 29, 2013 at 8:44 AM, Chris Wilson > wrote: > > On Fri, Jun 28, 2013 at 10:43:30PM -0700, Ben Widawsky wrote: > >> On Fri, Jun 28, 2013 at 09:55:27AM +0100, Chris Wilson wrote: > >> > O

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Allow contexts to be specified for unsupported rings

2013-06-30 Thread Ben Widawsky
ading the list recently, but I have this same patch in the PPGTT series. I'll make sure I get it upstream in my series if you guys are okay with dropping it here. -- 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 2/3] drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID

2013-06-30 Thread Ben Widawsky
On Tue, Jun 25, 2013 at 06:47:01PM +0300, Mika Kuoppala wrote: > From: Chris Wilson > > The intent of the check is made more clear if we use the proper name for > 0 here. > > Signed-off-by: Chris Wilson Reviewed-by: Ben Widawsky [snip] -- Ben Widawsky, Intel Open Source

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Fix retrieval of hangcheck stats

2013-06-30 Thread Ben Widawsky
ktop.org/show_bug.cgi?id=65845 > Signed-off-by: Chris Wilson > Reviewed-by: Mika Kuoppala This patch is also duplicated in my PPGTT series. If you want to drop it here, I'll ameks ure it gets moved forward. [snip] -- Ben Widawsky, Int

Re: [Intel-gfx] [PATCH i-g-t 1/3] quick_dump: Add automagic DPIO register support

2013-06-30 Thread Ben Widawsky
if register[2] == 'DPIO': > + val = reg.dpio_read(register[1]) > + else: > + val = reg.read(register[1]) > intreg = int(register[1], 16) > print('{0:#010x} | {1:<28} | {2:#010x}'.for

Re: [Intel-gfx] [PATCH 2/3] drm/i915: no hangcheck when reset is in progress

2013-06-30 Thread Ben Widawsky
this, avoid running the hangcheck > logic while reset is in progress. > > Signed-off-by: Mika Kuoppala Patches 1 & 2 are: Reviewed-by: Ben Widawsky Though I would like a DRM_DEBUG_DRIVER or some such for this case in patch 2. > --- > drivers/gpu/drm/i915/i915_irq.c

Re: [Intel-gfx] [PATCH 57/66] drm/i915: Disallow pin with full ppgtt

2013-07-01 Thread Ben Widawsky
r are ppgtt. So > > keep pin-ioctl and fix the test not to assume that pin.offset is > > meaningful with execbuffer after HAS_FULL_PPGTT. > > I was eyeing for the most minimal fix, but this is ok with me, too. > -Daniel > So, just fi

Re: [Intel-gfx] [PATCH 29/66] drm: pre allocate node for create_block

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 02:34:43PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:30PM -0700, Ben Widawsky wrote: > > For an upcoming patch where we introduce the i915 VMA, it's ideal to > > have the drm_mm_node as part of the VMA struct (ie. it's pre-al

Re: [Intel-gfx] [PATCH 30/66] drm/i915: Getter/setter for object attributes

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 03:00:05PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:31PM -0700, Ben Widawsky wrote: > > This will be handy when we add VMs. It's not strictly, necessary, but it > > will make the code much cleaner. > > > > Signed-off-by:

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

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 03:12:35PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:22PM -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 &g

Re: [Intel-gfx] [PATCH 23/66] drm/i915: Move stolen stuff to i915_gtt

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 03:18:46PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:24PM -0700, Ben Widawsky wrote: > > It doesn't apply to generic VMA, so it belongs with the gtt. > > > > for file in `ls drivers/gpu/drm/i915/*.c` ; do > > sed -i &

Re: [Intel-gfx] [PATCH 24/66] drm/i915: Move aliasing_ppgtt

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 03:27:44PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:25PM -0700, Ben Widawsky wrote: > > for file in `ls drivers/gpu/drm/i915/*.c` ; do > > sed -i "s/mm.aliasing/gtt.aliasing/" $file; > > done > > Commit message

Re: [Intel-gfx] [PATCH 40/66] drm/i915: Track all VMAs per VM

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 05:35:00PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:41PM -0700, Ben Widawsky wrote: > > This allows us to be aware of all the VMAs leftover and teardown, and is > > useful for debug. I suspect it will prove even more useful later. > &g

Re: [Intel-gfx] [PATCH 24/66] drm/i915: Move aliasing_ppgtt

2013-07-01 Thread Ben Widawsky
On Mon, Jul 01, 2013 at 09:06:20PM +0200, Daniel Vetter wrote: > On Mon, Jul 1, 2013 at 8:52 PM, Ben Widawsky wrote: > >> One thing which looks a bit peculiar at the end is that struct > >> i915_hw_ppgtt is actually used as the real ppgtt object (since it > >> sub

Re: [Intel-gfx] [PATCH 2/2] drm/i915: use drm_mm_remove_node instead of put_block

2013-07-01 Thread Ben Widawsky
; drm_mm > > > > > > only the allocation side was converted, but not the freeing. Fix this > > > up. > > > > > > Note that the only difference between put_block and remove_node is > > > that the former fills up the preallocation cache.

Re: [Intel-gfx] [PATCH 00/66] [v1] Full PPGTT minus soft pin

2013-07-01 Thread Ben Widawsky
efcounting on top of the context/obj > refcounting we already have. > > Comments? The high level plan sounds totally fine to me, I still have some issues with how to break up the huge changes in the VMA/VM conversion since many interfaces need to change, and that gets messy. In the en

Re: [Intel-gfx] [PATCH 26/66] drm/i915: Move active/inactive lists to new mm

2013-07-01 Thread Ben Widawsky
On Sun, Jun 30, 2013 at 05:38:16PM +0200, Daniel Vetter wrote: > On Thu, Jun 27, 2013 at 04:30:27PM -0700, Ben Widawsky wrote: > > for file in `ls drivers/gpu/drm/i915/*.c` ; do sed -i > > "s/dev_priv->mm.inactive_list/i915_gtt_mm-\>inactive_list/" $file; done >

Re: [Intel-gfx] [PATCH 30/66] drm/i915: Getter/setter for object attributes

2013-07-01 Thread Ben Widawsky
too important, but I'm just arguing for the sake of arguing. With the sg page stuff that Imre did, I think most size calculations unrelated to gtt size are there anyway, and most of our mm (not page allocation) code should only ever care about the gtt. > -- > Daniel Vetter > Softwa

Re: [Intel-gfx] [PATCH 3/3] drm/mm: WARN for unclean mm takedown

2013-07-01 Thread Ben Widawsky
en this patch myself a number of times. Reviewed-by: Ben Widawsky > --- > drivers/gpu/drm/drm_mm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c > index f9d4873..d303e31 100644 > --- a/drivers

Re: [Intel-gfx] [PATCH 26/66] drm/i915: Move active/inactive lists to new mm

2013-07-02 Thread Ben Widawsky
On Tue, Jul 02, 2013 at 09:26:45AM +0200, Daniel Vetter wrote: > On Mon, Jul 01, 2013 at 03:56:50PM -0700, Ben Widawsky wrote: > > On Sun, Jun 30, 2013 at 05:38:16PM +0200, Daniel Vetter wrote: > > > On Thu, Jun 27, 2013 at 04:30:27PM -0700, Ben Widawsky wrote: > > > &g

Re: [Intel-gfx] [PATCH 30/66] drm/i915: Getter/setter for object attributes

2013-07-02 Thread Ben Widawsky
On Tue, Jul 02, 2013 at 09:28:56AM +0200, Daniel Vetter wrote: > On Mon, Jul 01, 2013 at 03:59:51PM -0700, Ben Widawsky wrote: > > On Mon, Jul 01, 2013 at 09:08:58PM +0200, Daniel Vetter wrote: > > > On Mon, Jul 1, 2013 at 8:43 PM, Daniel Vetter wrote: > > > >> A

Re: [Intel-gfx] [PATCH 42/66] drm/i915: Clean up VMAs before freeing

2013-07-02 Thread Ben Widawsky
On Tue, Jul 02, 2013 at 01:59:17PM +0300, Ville Syrjälä wrote: > On Thu, Jun 27, 2013 at 04:30:43PM -0700, Ben Widawsky wrote: > > It's quite common for an object to simply be on the inactive list (and > > not unbound) when we want to free the context. This of course h

Re: [Intel-gfx] [PATCH 0/6] Page faults to help user space debug

2013-07-02 Thread Ben Widawsky
ns of the debug flags should work, ie. echo 7 > > > References > > 1. mailto:ch...@chris-wilson.co.uk -- 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 7/7] drm/i915: add i915_get_reset_stats_ioctl

2013-07-03 Thread Ben Widawsky
Ben, will we be informing userspace about the ABI change? > -Chris Hmm. I'm not convinced we ever want to reset the default context stats. > > -- > Chris Wilson, Intel Open Source Technology Centre > _

[Intel-gfx] [PATCH 3/6] drm/i915: Kill obj->gtt_offset

2013-07-03 Thread Ben Widawsky
. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 7 --- drivers/gpu/drm/i915/i915_gem.c| 2 -- drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - 3 files changed, 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index

[Intel-gfx] [PATCH 1/6] drm: pre allocate node for create_block

2013-07-03 Thread Ben Widawsky
_create_block(), both related to stolen memory. It also allows us to embed the drm_mm_node into the object currently which provides a nice transition over to the new code. v2: Reordered to do before ripping out obj->gtt_offset. Some minor cleanups made available because of reordering. CC: Si

[Intel-gfx] [PATCH 2/6] drm/i915: Getter/setter for object attributes

2013-07-03 Thread Ben Widawsky
h] sed -i "s/i915_gem_obj_size/i915_gem_obj_ggtt_size/" drivers/gpu/drm/i915/*.[ch] sed -i "s/i915_gem_obj_offset/i915_gem_obj_ggtt_offset/" drivers/gpu/drm/i915/*.[ch] (Daniel) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c| 26 drivers/gpu/drm/i915/i915_

[Intel-gfx] [PATCH 6/6] drm: Optionally create mm blocks from top-to-bottom

2013-07-03 Thread Ben Widawsky
removal Signed-off-by: Chris Wilson CC: Signed-off-by: Ben Widawsky Conflicts: drivers/gpu/drm/drm_mm.c include/drm/drm_mm.h --- drivers/gpu/drm/drm_mm.c | 121 +++ drivers/gpu/drm/i915/i915_gem.c| 4 +- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 5/6] drm/i915: Embed drm_mm_node in i915 gem obj

2013-07-03 Thread Ben Widawsky
don't need anyway and hence is just wasted space. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 10 +- drivers/gpu/drm/i915/i915_gem.c| 31 +++ drivers/gpu/drm/i915/i915_gem_evict.c | 6 +++--- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 4/6] drm/i915: Use gtt_space->start for stolen reservation

2013-07-03 Thread Ben Widawsky
Shortly we'll want to switch to an embedded drm_mm_node per object, and therefore using pointers as we're doing is unfeasible. I've chosen an impossible gtt start offset as the way to denote a reservation. CC: Chris Wilson Signed-off-by: Ben Widawsky --- drivers/gpu/drm/

Re: [Intel-gfx] [PATCH 7/7] drm/i915: add i915_get_reset_stats_ioctl

2013-07-03 Thread Ben Widawsky
On Wed, Jul 03, 2013 at 10:41:11PM +0100, Chris Wilson wrote: > On Wed, Jul 03, 2013 at 02:23:23PM -0700, Ben Widawsky wrote: > > On Wed, Jul 03, 2013 at 04:14:31PM +0100, Chris Wilson wrote: > > > Ben, will we be informing userspace about the ABI change? > > > >

Re: [Intel-gfx] [PATCH 7/7] drm/i915: add i915_get_reset_stats_ioctl

2013-07-03 Thread Ben Widawsky
On Wed, Jul 03, 2013 at 11:58:31PM +0200, Daniel Vetter wrote: > On Wed, Jul 3, 2013 at 11:44 PM, Ben Widawsky wrote: > > Yes. It won't be a requirement for mesa to know, but since I want to > > kill aliasing ppgtt as much as possible, I intend to update getparam to > &

Re: [Intel-gfx] [PATCH 2/6] drm/i915: Getter/setter for object attributes

2013-07-03 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 12:55:51AM +0200, Daniel Vetter wrote: > On Wed, Jul 03, 2013 at 02:45:22PM -0700, Ben Widawsky wrote: > > Soon we want to gut a lot of our existing assumptions how many address > > spaces an object can live in, and in doing so, embed the drm_mm_node in >

Re: [Intel-gfx] [PATCH 7/7] drm/i915: add i915_get_reset_stats_ioctl

2013-07-04 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 10:54:58AM +0300, Ville Syrjälä wrote: > On Wed, Jul 03, 2013 at 03:00:39PM -0700, Ben Widawsky wrote: > > On Wed, Jul 03, 2013 at 11:58:31PM +0200, Daniel Vetter wrote: > > > On Wed, Jul 3, 2013 at 11:44 PM, Ben Widawsky wrote: > > > > Yes.

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

2013-07-04 Thread Ben Widawsky
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 not knowing what it actually means. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/i915_re

[Intel-gfx] [PATCH 3/5] drm/i915: store eLLC size

2013-07-04 Thread Ben Widawsky
docs are clear, and left the rest as magic. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gem.c | 9 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.

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

2013-07-04 Thread Ben Widawsky
From: Ben Widawsky The cacheability controls have changed, and the bits have been rearranged in general. v2: Remove comments for snb/ivb cache leves, that's a separate change. v3: Resolve conflicts due to patch series reordering. v4: Rebased on top of Kenneth Graunke's -&

[Intel-gfx] [PATCH 4/5] drm/i915: Use eLLC/LLC by default when available

2013-07-04 Thread Ben Widawsky
nefit from this, so let's do it. eLLC is always a good default, and really not using it is the special case for MOCS. References: http://www.intel.com/newsroom/kits/restricted/ha$well!/pdfs/4th_Gen_Intel_Core_PressBriefing_5-29.pdf (page 57) Signed-off-by: Ben Widawsky --- drivers/gp

[Intel-gfx] [PATCH 5/5] drm/i915: debugfs entries for [e]LLC

2013-07-04 Thread Ben Widawsky
To make users life a little easier figuring out what they have on their system. Ideally, I'd really like to report LLC size, but it turned out to be a bit of a pain. Maybe I'll revisit it in the future. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++

Re: [Intel-gfx] [PATCH 5/5] drm/i915: debugfs entries for [e]LLC

2013-07-04 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 08:14:41PM +0200, Daniel Vetter wrote: > On Thu, Jul 04, 2013 at 11:02:07AM -0700, Ben Widawsky wrote: > > To make users life a little easier figuring out what they have on their > > system. > > > > Ideally, I'd really like to report LLC

Re: [Intel-gfx] [PATCH 4/5] drm/i915: Use eLLC/LLC by default when available

2013-07-04 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 08:17:09PM +0200, Daniel Vetter wrote: > On Thu, Jul 04, 2013 at 11:02:06AM -0700, Ben Widawsky wrote: > > DRI clients really should be using MOCS to get fine grained streaming > > cache controls. With that note, I *hope* that this patch doesn't imp

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

2013-07-04 Thread Ben Widawsky
rring rewriting all the init ordering), I've opted to do the detection really early, and the enabling later - since the register to detect doesn't require forcewake. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c | 10 ++ drivers/gpu/drm/i915/i915_gem.c | 9 +--

Re: [Intel-gfx] [PATCH 5/5] drm/i915: debugfs entries for [e]LLC

2013-07-04 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 08:43:58PM +0200, Daniel Vetter wrote: > On Thu, Jul 4, 2013 at 8:40 PM, Ben Widawsky wrote: > > On Thu, Jul 04, 2013 at 08:14:41PM +0200, Daniel Vetter wrote: > >> On Thu, Jul 04, 2013 at 11:02:07AM -0700, Ben Widawsky wrote: > >> > To m

[Intel-gfx] [PATCH 6/6] drm/i915: Add a param for eLLC size

2013-07-04 Thread Ben Widawsky
Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 7eda8ab..435fc4a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c

[Intel-gfx] [PATCH] drm/i915: Don't use a special stolen reserve offset

2013-07-04 Thread Ben Widawsky
Setting the node directly is good enough. We don't need a special value to store the gtt_offset, and we no longer have the pointer to tuck things away neatly. This is temporarily broken since: commit 7dedae28b41000539b6c18bcf72107c97e4937e4 Author: Ben Widawsky Date: Wed Jul 3 14:45:24

Re: [Intel-gfx] [PATCH 1/6] drm: pre allocate node for create_block

2013-07-04 Thread Ben Widawsky
On Thu, Jul 04, 2013 at 11:19:58AM +0200, David Herrmann wrote: > Hi > > On Wed, Jul 3, 2013 at 11:45 PM, Ben Widawsky wrote: > > For an upcoming patch where we introduce the i915 VMA, it's ideal to > > have the drm_mm_node as part of the VMA struct (ie. it's

[Intel-gfx] [PATCH] [v3] drm: pre allocate node for create_block

2013-07-04 Thread Ben Widawsky
mann Signed-off-by: Ben Widawsky --- drivers/gpu/drm/drm_mm.c | 16 +-- drivers/gpu/drm/i915/i915_gem_gtt.c| 20 ++ drivers/gpu/drm/i915/i915_gem_stolen.c | 37 +- include/drm/drm_mm.h | 9 +

Re: [Intel-gfx] [PATCH] drm/i915: Don't use a special stolen reserve offset

2013-07-05 Thread Ben Widawsky
On Fri, Jul 05, 2013 at 09:12:05AM +0200, Daniel Vetter wrote: > On Thu, Jul 04, 2013 at 11:24:46PM +0200, Daniel Vetter wrote: > > On Thu, Jul 04, 2013 at 12:42:15PM -0700, Ben Widawsky wrote: > > > Setting the node directly is good enough. We don't need a special v

Re: [Intel-gfx] [PATCH] drm/i915: convert debugfs creation/destruction to table

2013-07-05 Thread Ben Widawsky
> > Signed-off-by: Daniel Vetter Acked-by: Ben Widawsky [snip] -- 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] [v3] drm: pre allocate node for create_block

2013-07-05 Thread Ben Widawsky
On Fri, Jul 05, 2013 at 09:25:35PM +0200, Daniel Vetter wrote: > On Thu, Jul 04, 2013 at 10:32:27PM +0200, David Herrmann wrote: > > Hi > > > > On Thu, Jul 4, 2013 at 10:14 PM, Ben Widawsky wrote: > > > For an upcoming patch where we introduce the i915 VMA

Re: [Intel-gfx] [PATCH 10/30] drm/i915: Implement WaDisableDopClockGating:snb

2013-07-05 Thread Ben Widawsky
| > -- > 1.8.1.5 > > ___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- 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 00/30] drm/i915: Lots of workaround changes

2013-07-05 Thread Ben Widawsky
___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ben Widawsky, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 1/9] Revert "drm/i915: Getter/setter for object attributes"

2013-07-05 Thread Ben Widawsky
This reverts commit 3c7354329d77c333dab8647676c3de342f022dc9. --- drivers/gpu/drm/i915/i915_debugfs.c| 26 - drivers/gpu/drm/i915/i915_drv.h| 31 --- drivers/gpu/drm/i915/i915_gem.c| 89 +++--- drivers/gpu/drm/i915/i915_gem_co

[Intel-gfx] [PATCH 2/9] Revert "drm/i915: Kill obj->gtt_offset"

2013-07-05 Thread Ben Widawsky
This reverts commit a6b27b42fbb01a6b6523ff1ab6a6d440d0eba1ae. --- drivers/gpu/drm/i915/i915_drv.h| 7 +++ drivers/gpu/drm/i915/i915_gem.c| 2 ++ drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + 3 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drive

[Intel-gfx] [PATCH 4/9] drm: pre allocate node for create_block

2013-07-05 Thread Ben Widawsky
id Herrmann Signed-off-by: Ben Widawsky --- drivers/gpu/drm/drm_mm.c | 16 +-- drivers/gpu/drm/i915/i915_gem_gtt.c| 20 ++ drivers/gpu/drm/i915/i915_gem_stolen.c | 37 +- include/drm/drm_mm.h | 9

[Intel-gfx] [PATCH 5/9] drm: Change create block to reserve node

2013-07-05 Thread Ben Widawsky
nveniently this is the only user of the interface. CC: David Airlie CC: Signed-off-by: Ben Widawsky --- drivers/gpu/drm/drm_mm.c | 19 ++- drivers/gpu/drm/i915/i915_gem_gtt.c| 8 drivers/gpu/drm/i915/i915_gem_stolen.c | 14 -- include/dr

[Intel-gfx] [PATCH 3/9] Revert "drm/i915: Use gtt_space->start for stolen reservation"

2013-07-05 Thread Ben Widawsky
This reverts commit 7dedae28b41000539b6c18bcf72107c97e4937e4. Conflicts: drivers/gpu/drm/i915/i915_drv.h --- drivers/gpu/drm/i915/i915_drv.h| 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c| 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- 3 files changed, 3 insertions(+), 3 del

[Intel-gfx] [PATCH 7/9] drm/i915: Kill obj->gtt_offset

2013-07-05 Thread Ben Widawsky
: Properly preserve the stolen offset. This code is a bit hacky but it all goes away when we embed the drm_mm_node and removes the need for the incorrect patch I submitted previously: "Use gtt_space->start for stolen reservation" Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i9

[Intel-gfx] [PATCH 8/9] drm/i915: Embed drm_mm_node in i915 gem obj

2013-07-05 Thread Ben Widawsky
don't need anyway and hence is just wasted space. v2: Clean up the stolen preallocation code. Rebased on the reserve_node patches renames ggtt_ stuff to gtt_ stuff WARN_ON if the object is already bound (which doesn't mean it's in the bound list, tricky) Signed-off-by:

[Intel-gfx] [PATCH 9/9] drm: Optionally create mm blocks from top-to-bottom

2013-07-05 Thread Ben Widawsky
removal v4: by Ben: Rebased on reserve_node addition. Signed-off-by: Chris Wilson CC: Signed-off-by: Ben Widawsky Conflicts: drivers/gpu/drm/drm_mm.c include/drm/drm_mm.h Conflicts: drivers/gpu/drm/drm_mm.c drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm

[Intel-gfx] [PATCH 6/9] drm/i915: Getter/setter for object attributes

2013-07-05 Thread Ben Widawsky
h] sed -i "s/i915_gem_obj_size/i915_gem_obj_ggtt_size/" drivers/gpu/drm/i915/*.[ch] sed -i "s/i915_gem_obj_offset/i915_gem_obj_ggtt_offset/" drivers/gpu/drm/i915/*.[ch] (Daniel) v3: Rebased on new reserve_node patch Changed DRM_DEBUG_KMS to actually work (will need fixing later) Sign

Re: [Intel-gfx] [PATCH 0/6] Page faults to help user space debug

2013-07-06 Thread Ben Widawsky
t;[1]ch...@chris-wilson.co.uk> wrote: > >On Tue, Jul 02, 2013 at 12:00:48PM -0700, Paul Berry wrote: >> Â Â On 28 June 2013 15:39, Chris Wilson ><[1][2]ch...@chris-wilson.co.uk> wrote: >> >> Â Â Â On Fri, Jun 28, 2013 at 03:23:31PM -07

[Intel-gfx] [PATCH] drm/i915: Really fix the debug unregister code

2013-07-07 Thread Ben Widawsky
incrementally removing. One really bad side effect of this failure is all tests in our test suite will fail after module_reload fails. This fix was actually lazily authored by Chris. CC: Chris Wilson Reported-and-tested-by: Ben Widawsky Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 02/11] drm/i915: Put the mm in the parent address space

2013-07-08 Thread Ben Widawsky
;d hope one day this becomes almost irrelvant. v2: Rebased Signed-off-by: Ben Widawsky Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i9

[Intel-gfx] [PATCH 00/11] ppgtt: just the VMA

2013-07-08 Thread Ben Widawsky
PPGTT series is merged. Finally, Daniel, is this more or less what you wanted first? References: http://lists.freedesktop.org/archives/intel-gfx/2013-June/029408.html Ben Widawsky (11): drm/i915: Move gtt and ppgtt under address space umbrella drm/i915: Put the mm in the parent address space drm

[Intel-gfx] [PATCH 03/11] drm/i915: Create a global list of vms

2013-07-08 Thread Ben Widawsky
After we plumb our code to support multiple address spaces (VMs), there are a few situations where we want to be able to traverse the list of all address spaces in the system. Cases like eviction, or error state collection are obvious example. Signed-off-by: Ben Widawsky --- drivers/gpu/drm

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

2013-07-08 Thread Ben Widawsky
with the grand scheme. GGTT will usually be a special case where we either know an object must be in the GGTT (dislay engine, workarounds, etc.). v2: Drop usage of i915_gtt_vm (Daniel) Make cleanup also part of the parent class (Ben) Modified commit msg Rebased Signed-off-by: Ben Wid

[Intel-gfx] [PATCH 04/11] drm/i915: Move active/inactive lists to new mm

2013-07-08 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. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c| 16 +++- drivers/gp

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

2013-07-08 Thread Ben Widawsky
d make the rest of the infrastructure more suited v2: s/i915_obj/i915_gem_obj (Chris) v3: Only move an object to the now global unbound list if there are no more VMAs for the object which are bound into a VM (ie. the list is empty). v4: killed obj->gtt_space some reworks due to rebase Signe

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

2013-07-08 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_gem.c |

[Intel-gfx] [PATCH 09/11] drm/i915: Update error capture for VMs

2013-07-08 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. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 8 +-- drivers/gpu/drm/i915/i915_drv.h | 4 +- d

[Intel-gfx] [PATCH 08/11] drm/i915: mm_list is per VMA

2013-07-08 Thread Ben Widawsky
il this point in the patch series, and doing it here makes the change much easier to understand. v2: only bump GGTT LRU in i915_gem_object_set_to_gtt_domain (Chris) v3: Moved earlier in the series Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c| 53 ++-

[Intel-gfx] [PATCH 10/11] drm/i915: create an object_is_active()

2013-07-08 Thread Ben Widawsky
This is simply obj->active for now, but will serve a purpose when we track activity per vma. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h| 1 + drivers/gpu/drm/i915/i915_gem.c| 18 -- drivers/gpu/drm/i915/i915_gem_execbuffer.c |

[Intel-gfx] [PATCH 11/11] drm/i915: Move active to vma

2013-07-08 Thread Ben Widawsky
Probably need to squash whole thing, or just the inactive part, tbd... Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 14 ++-- drivers/gpu/drm/i915/i915_gem.c | 47 - 2 files changed, 35 insertions(+), 26 deletions(-) diff

Re: [Intel-gfx] [PATCH 5/5] drm/i915: debugfs entries for [e]LLC

2013-07-09 Thread Ben Widawsky
On Tue, Jul 09, 2013 at 11:35:38AM -0700, Chad Versace wrote: > On 07/04/2013 11:46 AM, Ben Widawsky wrote: > >On Thu, Jul 04, 2013 at 08:43:58PM +0200, Daniel Vetter wrote: > >>On Thu, Jul 4, 2013 at 8:40 PM, Ben Widawsky wrote: > >>>On Thu, Jul 04, 2013 at 08:14:4

[Intel-gfx] [PATCH] intel_get_llc_size: Small tool to query LLC size

2013-07-09 Thread Ben Widawsky
CC: Chad Versace CC: Bryan Bell Signed-off-by: Ben Widawsky --- tools/Makefile.am | 1 + tools/intel_get_llc_size.c | 57 ++ 2 files changed, 58 insertions(+) create mode 100644 tools/intel_get_llc_size.c diff --git a/tools/Makefile.am b

[Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-09 Thread Ben Widawsky
irely copied from Chad's code. I've tested this on two platforms, and it seems to perform how I want. CC: Chad Versace CC: Bryan Bell Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/

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

2013-07-10 Thread Ben Widawsky
On Tue, Jul 09, 2013 at 08:37:45AM +0200, Daniel Vetter wrote: > On Mon, Jul 08, 2013 at 11:08:32PM -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 &g

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

2013-07-10 Thread Ben Widawsky
On Tue, Jul 09, 2013 at 09:16:54AM +0200, Daniel Vetter wrote: > On Mon, Jul 08, 2013 at 11:08:38PM -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] [PATCH 08/11] drm/i915: mm_list is per VMA

2013-07-10 Thread Ben Widawsky
On Tue, Jul 09, 2013 at 09:18:46AM +0200, Daniel Vetter wrote: > On Mon, Jul 08, 2013 at 11:08:39PM -0700, Ben Widawsky wrote: > > formerly: "drm/i915: Create VMAs (part 5) - move mm_list" > > > > The mm_list is used for the active/inactive LRUs. Since those LRUs

Re: [Intel-gfx] [PATCH 11/11] drm/i915: Move active to vma

2013-07-10 Thread Ben Widawsky
On Tue, Jul 09, 2013 at 09:45:09AM +0200, Daniel Vetter wrote: > On Mon, Jul 08, 2013 at 11:08:42PM -0700, Ben Widawsky wrote: > > Probably need to squash whole thing, or just the inactive part, tbd... > > > > Signed-off-by: Ben Widawsky > > I agree that we need vma-&

Re: [Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 09:59:01AM +0100, Chris Wilson wrote: > On Tue, Jul 09, 2013 at 07:58:02PM -0700, Ben Widawsky wrote: > > The algorithm/information was originally written by Chad, though I > > changed the control flow, and I think his original code had a couple of > >

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

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 08:34:18AM +0200, Daniel Vetter wrote: > On Tue, Jul 09, 2013 at 07:58:03PM -0700, Ben Widawsky wrote: > > CC: Chad Versace > > CC: Bryan Bell > > Signed-off-by: Ben Widawsky > > So I think we should run this from igt and check its return val

Re: [Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 09:40:18AM -0700, Ben Widawsky wrote: > On Wed, Jul 10, 2013 at 09:59:01AM +0100, Chris Wilson wrote: > > On Tue, Jul 09, 2013 at 07:58:02PM -0700, Ben Widawsky wrote: > > > The algorithm/information was originally written by Chad, though I > > &g

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

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 07:15:43PM +0200, Daniel Vetter wrote: > On Wed, Jul 10, 2013 at 09:58:38AM -0700, Ben Widawsky wrote: > > On Wed, Jul 10, 2013 at 08:34:18AM +0200, Daniel Vetter wrote: > > > On Tue, Jul 09, 2013 at 07:58:03PM -0700, Ben Widawsky wrote: > > > >

Re: [Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 06:40:02PM +0100, Chris Wilson wrote: > On Wed, Jul 10, 2013 at 09:40:18AM -0700, Ben Widawsky wrote: > > On Wed, Jul 10, 2013 at 09:59:01AM +0100, Chris Wilson wrote: > > > On Tue, Jul 09, 2013 at 07:58:02PM -0700, Ben Widawsky wrote: > > > >

Re: [Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 07:00:53PM +0100, Chris Wilson wrote: > On Wed, Jul 10, 2013 at 10:46:47AM -0700, Ben Widawsky wrote: > > On Wed, Jul 10, 2013 at 06:40:02PM +0100, Chris Wilson wrote: > > > On Wed, Jul 10, 2013 at 09:40:18AM -0700, Ben Widawsky wrote: > > > >

Re: [Intel-gfx] [PATCH] drm/i915: Expose LLC size to user space

2013-07-10 Thread Ben Widawsky
On Wed, Jul 10, 2013 at 05:16:54PM -0700, Chad Versace wrote: > On 07/09/2013 07:58 PM, Ben Widawsky wrote: > >The algorithm/information was originally written by Chad, though I > >changed the control flow, and I think his original code had a couple of > >bugs, though I

[Intel-gfx] [PATCH] tests: Basic tools tester

2013-07-11 Thread Ben Widawsky
Requested-by: Daniel Vetter Signed-off-by: Ben Widawsky --- tests/Makefile.am | 1 + tests/drm_lib.sh | 4 tests/tools_test | 20 3 files changed, 25 insertions(+) create mode 100755 tests/tools_test diff --git a/tests/Makefile.am b/tests/Makefile.am index

[Intel-gfx] [PATCH] [v2] drm/i915: Expose LLC size to user space

2013-07-11 Thread Ben Widawsky
Chad) Fix unicode multiply symbol (Ben) CC: Chad Versace CC: Bryan Bell Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 55 + include/uapi/drm/i915_drm.h

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

2013-07-11 Thread Ben Widawsky
v2: Use the new param CC: Chad Versace CC: Bryan Bell Signed-off-by: Ben Widawsky --- tools/Makefile.am | 1 + tools/intel_get_llc_size.c | 58 ++ 2 files changed, 59 insertions(+) create mode 100644 tools/intel_get_llc_size.c diff --git

[Intel-gfx] [PATCH 2/2] tests: Basic tools tester

2013-07-11 Thread Ben Widawsky
v2: Remove the reg write test because it breaks pre gen5 Add the llc size param test Requested-by: Daniel Vetter Signed-off-by: Ben Widawsky --- tests/Makefile.am | 1 + tests/drm_lib.sh | 4 tests/tools_test | 21 + 3 files changed, 26 insertions(+) create mode

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