[Intel-gfx] [PATCH 6/7] drm/i915: Add some more registers to error state

2014-01-27 Thread Ben Widawsky
Chris: Do we also want to capture? GAC_ECO_BITS /* gen6,7 */ GAM_ECOCHK /* gen6,7 */ GAB_CTL /* gen6 */ GFX_MODE /* gen6 */ Requested-by: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 4 drivers/gpu

[Intel-gfx] [PATCH 7/7] [v2] drm/i915: Capture PPGTT info on error capture

2014-01-27 Thread Ben Widawsky
v2: Rebased upon cleaned up error state Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 9 drivers/gpu/drm/i915/i915_gpu_error.c | 39 +++ 2 files changed, 48 insertions

[Intel-gfx] [PATCH 4/7] drm/i915: Reorder struct members

2014-01-27 Thread Ben Widawsky
This helps make an upcoming patch a bit more reviewable Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 43 - 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu

[Intel-gfx] [PATCH 5/7] drm/i915: Move per ring error state to ring_error

2014-01-27 Thread Ben Widawsky
Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 62 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 137 +- 2 files changed, 99 insertions(+), 100 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b

Re: [Intel-gfx] [PATCH v2 1/3] drm/i915: Tune down debug output when context is banned

2014-01-26 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

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Seek only one guilty batch per hanged ring

2014-01-26 Thread Ben Widawsky
/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -41,6 +41,8 @@ enum intel_ring_hangcheck_action { HANGCHECK_HUNG, }; +#define HANGCHECK_SCORE_GUILTY 31 + struct intel_ring_hangcheck { bool deadlock; u32 seqno; -- Ben Widawsky, Intel

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Get rid of acthd based batch search on reset stats

2014-01-26 Thread Ben Widawsky
. However, the patch looks functionally correct to me, so I'll leave the decision up to Daniel. Reviewed-by: Ben Widawsky b...@bwidawsk.net Signed-off-by: Mika Kuoppala mika.kuopp...@intel.com --- drivers/gpu/drm/i915/i915_gem.c | 87 ++- 1 file

Re: [Intel-gfx] [PATCH 1/5] drm/i915: Round up object allocations

2014-01-26 Thread Ben Widawsky
Widawsky b...@bwidawsk.net wrote: On Sat, Jan 25, 2014 at 09:28:24PM +0100, Daniel Vetter wrote: On Thu, Jan 23, 2014 at 07:21:10PM -0800, Ben Widawsky wrote: DRM gets very mad when you request an object which occupies a partial page. As a DRM driver, i915 never really

Re: [Intel-gfx] [PATCH 5/5] drm/i915: Fix error capture on BYT/BDW

2014-01-26 Thread Ben Widawsky
On Sun, Jan 26, 2014 at 11:47:40AM +, Chris Wilson wrote: On Fri, Jan 24, 2014 at 06:17:45PM -0800, Ben Widawsky wrote: The previous check during error capture of whether or not the current VM should be scanned used, gen 7. That was more or less trying to determine if there was a full

Re: [Intel-gfx] [PATCH 4/5] drm/i915: Capture PPGTT info on error capture

2014-01-26 Thread Ben Widawsky
On Sun, Jan 26, 2014 at 11:42:22AM +, Chris Wilson wrote: On Fri, Jan 24, 2014 at 06:17:44PM -0800, Ben Widawsky wrote: Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 7 ++ drivers/gpu/drm

Re: [Intel-gfx] [PATCH 5/5] drm/i915: Fix error capture on BYT/BDW

2014-01-26 Thread Ben Widawsky
On Sun, Jan 26, 2014 at 07:55:59PM +, Chris Wilson wrote: On Sun, Jan 26, 2014 at 11:05:40AM -0800, Ben Widawsky wrote: On Sun, Jan 26, 2014 at 11:47:40AM +, Chris Wilson wrote: On Fri, Jan 24, 2014 at 06:17:45PM -0800, Ben Widawsky wrote: The previous check during error capture

Re: [Intel-gfx] [PATCH 1/5] drm/i915: Place the Global GTT VM first in the list of VM

2014-01-25 Thread Ben Widawsky
On Sat, Jan 25, 2014 at 01:31:29PM -0800, Kenneth Graunke wrote: On 01/25/2014 12:48 PM, Daniel Vetter wrote: On Sat, Jan 25, 2014 at 12:32:33AM -0800, Kenneth Graunke wrote: On 01/24/2014 06:17 PM, Ben Widawsky wrote: From: Chris Wilson ch...@chris-wilson.co.uk This is useful

Re: [Intel-gfx] [PATCH 3/5] drm/i915: Create a USES_PPGTT macro

2014-01-25 Thread Ben Widawsky
On Sat, Jan 25, 2014 at 09:41:22PM +0100, Daniel Vetter wrote: On Fri, Jan 24, 2014 at 06:17:43PM -0800, Ben Widawsky wrote: There are cases where we want to know if there is a full, or aliased ppgtt. Having to always to the || is annoying. This shorthand will keep the code a bit cleaner

Re: [Intel-gfx] [PATCH 1/5] drm/i915: Round up object allocations

2014-01-25 Thread Ben Widawsky
On Sat, Jan 25, 2014 at 09:28:24PM +0100, Daniel Vetter wrote: On Thu, Jan 23, 2014 at 07:21:10PM -0800, Ben Widawsky wrote: DRM gets very mad when you request an object which occupies a partial page. As a DRM driver, i915 never really wants to anger DRM, and would always just want

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Print captured bo for all VM in error state

2014-01-24 Thread Ben Widawsky
ping On Fri, Jan 10, 2014 at 08:08:26PM +, Chris Wilson wrote: On Fri, Jan 10, 2014 at 11:59:10AM -0800, Ben Widawsky wrote: I will gladly re-review if you make any of my suggested changes. Hmm, I had already done the capture_vma one since that is required to display the right

[Intel-gfx] [PATCH 3/5] drm/i915: Create a USES_PPGTT macro

2014-01-24 Thread Ben Widawsky
There are cases where we want to know if there is a full, or aliased ppgtt. Having to always to the || is annoying. This shorthand will keep the code a bit cleaner/easier to read. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 1 + 1 file changed, 1 insertion

[Intel-gfx] [PATCH 1/5] drm/i915: Place the Global GTT VM first in the list of VM

2014-01-24 Thread Ben Widawsky
From: Chris Wilson ch...@chris-wilson.co.uk This is useful for debugging as we then know that the first entry is always the global GTT, and all later entries the per-process GTT VM. Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Reviewed-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu

[Intel-gfx] [PATCH 4/5] drm/i915: Capture PPGTT info on error capture

2014-01-24 Thread Ben Widawsky
Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 7 ++ drivers/gpu/drm/i915/i915_gpu_error.c | 41 +++ 2 files changed, 48 insertions(+) diff --git a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 5/5] drm/i915: Fix error capture on BYT/BDW

2014-01-24 Thread Ben Widawsky
not actually checked. While here, clean up the file a bit to avoid duplicate reads (now that the PPGTT info is in the error state). I think Mika/Chris may have been looking at this too. Broken by: commit 685987c6915222730f45141a89f1cd87fb092e9a Author: Ben Widawsky benjamin.widaw...@intel.com Date: Fri

[Intel-gfx] [PATCH 2/5] drm/i915: Print captured bo for all VM in error state

2014-01-24 Thread Ben Widawsky
. Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Reviewed-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 4 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 66 ++- 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/drivers

Re: [Intel-gfx] [PATCH] drm/i915: Always pin the default context

2014-01-23 Thread Ben Widawsky
, which is not what we want for the special casing of the real global default context. commit 0eea67eb26000657079b7fc41079097942339452 Author: Ben Widawsky b...@bwidawsk.net Date: Fri Dec 6 14:11:19 2013 -0800 drm/i915: Create a per file_priv default context If you like the way the code

[Intel-gfx] [PATCH 1/5] drm/i915: Round up object allocations

2014-01-23 Thread Ben Widawsky
DRM gets very mad when you request an object which occupies a partial page. As a DRM driver, i915 never really wants to anger DRM, and would always just want the rounding done for us. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2

Re: [Intel-gfx] [PATCH 1/2] drm: share drm_add_fake_info_node

2014-01-21 Thread Ben Widawsky
On Thu, Jan 16, 2014 at 12:42:22AM +0100, Daniel Vetter wrote: On Wed, Jan 15, 2014 at 12:08:19PM -0800, Ben Widawsky wrote: On Wed, Jan 15, 2014 at 09:45:28AM +0100, Daniel Vetter wrote: On Wed, Jan 15, 2014 at 9:39 AM, Daniel Vetter dan...@ffwll.ch wrote: On Wed, Jan 15, 2014 at 12:40

[Intel-gfx] [PATCH 5/6] drm/i915: Move forcewake debugfs setup also

2014-01-21 Thread Ben Widawsky
is targeted for a new file, so there is no reason to move it. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_debugfs.c | 48 +++-- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b

[Intel-gfx] [PATCH 4/6] drm/i915: Use new drm debugfs file helper

2014-01-21 Thread Ben Widawsky
The debugfs helper duplicates the functionality used by Armada, so let's just use that. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_debugfs.c | 25 - 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 1/6] drm: Create a debugfs file creation helper

2014-01-21 Thread Ben Widawsky
-by: Daniel Vetter dan...@ffwll.ch Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/drm_debugfs.c | 49 +++ include/drm/drmP.h| 14 + 2 files changed, 63 insertions(+) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu

[Intel-gfx] [PATCH 6/6] drm/i915: Move pipecrc debug functions to new file

2014-01-21 Thread Ben Widawsky
: Remove spurious #if 0 (Damien) Rename to intel_display_test.c (Damien) Inline the drm_info_fake_node_add, since the DRM helper function should solve most users problem (Ben) Cc: Damien Lespiau damien.lesp...@intel.com Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/Makefile

[Intel-gfx] [PATCH] [trivial] drm/i915: Remove incorrect comment about struct mutex

2014-01-21 Thread Ben Widawsky
This statenment became false here: commit 4fc688ce79772496503d22263d61b071a8fb596e Author: Jesse Barnes jbar...@virtuousgeek.org Date: Fri Nov 2 11:14:01 2012 -0700 drm/i915: protect RPS/RC6 related accesses (including PCU) with a new mutex Signed-off-by: Ben Widawsky b...@bwidawsk.net

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Move pipecrc debug functions to new file

2014-01-15 Thread Ben Widawsky
On Wed, Jan 15, 2014 at 01:22:00AM +, Damien Lespiau wrote: On Tue, Jan 14, 2014 at 06:14:07AM -0800, Ben Widawsky wrote: +#include linux/debugfs.h +#include linux/fs.h +#include linux/seq_file.h +#include linux/circ_buf.h +#include linux/ctype.h +#if 0 +#include drm/drm_crtc.h

Re: [Intel-gfx] [PATCH 1/2] drm: share drm_add_fake_info_node

2014-01-15 Thread Ben Widawsky
: On Tue, Jan 14, 2014 at 06:14:06AM -0800, Ben Widawsky wrote: Both i915 and Armada had the exact same implementation. For an upcoming patch, I'd like to call this function from two different source files in i915, and having it available externally helps there too. While moving, add

Re: [Intel-gfx] [PATCH] drm/i915/bdw: remove preliminary_hw_support flag from BDW

2014-01-14 Thread Ben Widawsky
think it should be safe enough to call the HW supported, even with my gripes above. So while I prefer to get the stuff above in/tested, if you want to move ahead with this, it's Acked by: Ben Widawsky b...@bwidawsk.net -- Ben Widawsky, Intel Open Source Technology Center

[Intel-gfx] [PATCH 1/2] drm: share drm_add_fake_info_node

2014-01-14 Thread Ben Widawsky
functions. Cc: linux-arm-ker...@lists.infradead.org Cc: intel-gfx@lists.freedesktop.org Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/armada/armada_debugfs.c | 24 +--- drivers/gpu/drm/drm_debugfs.c | 24 drivers/gpu/drm/i915

[Intel-gfx] [PATCH 2/2] drm/i915: Move pipecrc debug functions to new file

2014-01-14 Thread Ben Widawsky
At almost 800 lines of code, with almost a function per platform, this code was cluttering up the existing debugfs file, which has historically had fairly small functions. Patch should have no functional changes. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/Makefile

Re: [Intel-gfx] [PATCH] drm/i915: Fix disabled semaphores

2014-01-13 Thread Ben Widawsky
Daniel, please consider merging this, or the rest of the semaphore series. Existing code is broken. On Tue, Dec 17, 2013 at 08:06:00PM -0800, Ben Widawsky wrote: The ring will emit too many if semaphores are disabled since we do not add the correct number to num_dwords anymore

Re: [Intel-gfx] [PATCH] drm/i915: Don't list gens one by bone in the VMA creation function

2014-01-10 Thread Ben Widawsky
/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ben

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Print captured bo for all VM in error state

2014-01-10 Thread Ben Widawsky
-vm_count = cnt; + } One other change which I apparently never pushed was to try to identify the guilty context/VM (instead of the global as you do for patch 1 of the series). that way foo_bo[0] was always the interesting one. } /** -- 1.8.5.2 Both patches are Reviewed-by: Ben Widawsky

Re: [Intel-gfx] [PATCH] drm/i915: Only unlink ggtt-global_link after i915_gem_load

2014-01-10 Thread Ben Widawsky
-gtt.mtrr); io_mapping_free(dev_priv-gtt.mappable); out_gtt: - list_del(dev_priv-gtt.base.global_link); - drm_mm_takedown(dev_priv-gtt.base.mm); This is correct. - dev_priv-gtt.base.cleanup(dev_priv-gtt.base); -- Chris Wilson, Intel Open Source Technology Centre -- Ben

Re: [Intel-gfx] [PATCH] drm/i915: Only scan for a potential fb is the object is pinned to the display

2014-01-10 Thread Ben Widawsky
); } This was an error during PPGTT development: commit d7f46fc4e7323887494db13f063a8e59861fefb0 Author: Ben Widawsky benjamin.widaw...@intel.com Date: Fri Dec 6 14:10:55 2013 -0800 drm/i915: Make pin count per VMA Could be squashed if ppgtt isn't merged. Reviewed-by: Ben Widawsky b

Re: [Intel-gfx] [PATCH] drm/i915: set ctx-initialized only after RCS

2014-01-09 Thread Ben Widawsky
On Tue, Jan 07, 2014 at 10:47:18AM +, Chris Wilson wrote: On Tue, Jan 07, 2014 at 08:10:33AM +0100, Daniel Vetter wrote: On Sat, Dec 28, 2013 at 01:31:49PM -0800, Ben Widawsky wrote: The initialized flag is used to specify a context has been initialized and it's context is safe

Re: [Intel-gfx] [PATCH 4/5] intel: Intel full PPGTT param

2014-01-09 Thread Ben Widawsky
On Tue, Jan 07, 2014 at 08:53:36AM +0100, Daniel Vetter wrote: On Thu, Jan 02, 2014 at 07:50:33PM -1000, Ben Widawsky wrote: This will allow mesa to determine if it needs to create a context, or can reuse the default context. Reusing the default context saves memory, and startup time

Re: [Intel-gfx] [PATCH] drm/i915: Free requests after object release when retiring requests

2014-01-09 Thread Ben Widawsky
up commit e20780439b26ba95aeb29d3e27cd8cc32bc82a4c Author: Ben Widawsky b...@bwidawsk.net Date: Fri Dec 6 14:11:22 2013 -0800 drm/i915: Defer request freeing by simply swapping the order of operations rather than introducing further complexity - as noted during review. Signed-off

[Intel-gfx] [PATCH] i965: Use default contexts when possible.

2014-01-02 Thread Ben Widawsky
context idea is valid. Needs mesa eyes. Cc: Kenneth Graunke kenneth.w.grau...@intel.com Signed-off-by: Ben Widawsky b...@bwidawsk.net --- configure.ac| 2 +- src/mesa/drivers/dri/i965/brw_context.c | 9 - 2 files changed, 9 insertions(+), 2 deletions(-) diff

[Intel-gfx] [PATCH 2/5] intel: Handle malloc fails in context create

2014-01-02 Thread Ben Widawsky
The previous code would just use the potentially unallocated variable, which is probably okay most of the time, but not very nice to the user of the library. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- intel/intel_bufmgr_gem.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion

[Intel-gfx] [PATCH 4/5] intel: Intel full PPGTT param

2014-01-02 Thread Ben Widawsky
thereis full PPGTT and per fd contexts). As such, callers can expect NULL when this is not the case. See the usage in mesa for details. Cc: Kenneth Graunke kenneth.w.grau...@intel.com Signed-off-by: Ben Widawsky b...@bwidawsk.net --- include/drm/i915_drm.h| 1 + intel/intel_bufmgr.h | 1

[Intel-gfx] [PATCH 5/5] configure.ac: bump version to 2.4.51 for release

2014-01-02 Thread Ben Widawsky
Provides the parameter for full PPGTT on Intel. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c5b8d40..d0d051a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7

[Intel-gfx] [PATCH] [v2] drm/i915/ppgtt: Never return a NULL context

2014-01-02 Thread Ben Widawsky
It makes all the code which calls into this function way too confusing. v2: Fix destroy IOCTL as well v3: Clarify the other two callers of i915_gem_context_get() to never check for NULL. (Mika) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72903 Signed-off-by: Ben Widawsky b

[Intel-gfx] [PATCH 3/5] intel: Merge latest i915_drm.h

2014-01-02 Thread Ben Widawsky
This was not done as a straight copy because reset_stats IOCTL landed in libdrm before upstream kernel. (We'll do a similar thing for full PPGTT anyway, so there isn't really a point in syncing exactly). Signed-off-by: Ben Widawsky b...@bwidawsk.net --- include/drm/i915_drm.h | 113

[Intel-gfx] [PATCH 1/5] intel: squash unused variable 'bo_gem'

2014-01-02 Thread Ben Widawsky
Signed-off-by: Ben Widawsky b...@bwidawsk.net --- intel/intel_bufmgr_gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 48ff62e..3b1f584 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1337,7 +1337,9

[Intel-gfx] [PATCH 3/3] drm/i915: Make file default context persistent

2014-01-02 Thread Ben Widawsky
allocating a new context and simply use the default context instead. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_context.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 2/3] drm/i915: set ctx-initialized only after RCS

2014-01-02 Thread Ben Widawsky
-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 44dddc00..8c7a5b2 100644 --- a/drivers/gpu/drm/i915

Re: [Intel-gfx] [PATCH] drm/i915: set ctx-initialized only after RCS

2014-01-01 Thread Ben Widawsky
On Tue, Dec 31, 2013 at 11:26:17AM +, Chris Wilson wrote: On Mon, Dec 30, 2013 at 01:34:46PM -0800, Ben Widawsky wrote: On Sun, Dec 29, 2013 at 09:59:26AM +, Chris Wilson wrote: On Sat, Dec 28, 2013 at 01:31:49PM -0800, Ben Widawsky wrote: The initialized flag is used to specify

[Intel-gfx] [PATCH] [v2] drm/i915/ppgtt: Defer request freeing on reset

2014-01-01 Thread Ben Widawsky
We need to defer the free request until the object/vma is capable of being freed - or else we have a problem when we try to destroy the context. The exact same issue is described and fixed here: commit e20780439b26ba95aeb29d3e27cd8cc32bc82a4c Author: Ben Widawsky b...@bwidawsk.net Date: Fri

[Intel-gfx] [PULL] drm-intel-fixes

2014-01-01 Thread Ben Widawsky
) Alexander van Heukelum (1): Revert drm/i915: assume all GM45 Acer laptops use inverted backlight PWM drivers/gpu/drm/i915/intel_display.c | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) -- Ben Widawsky, Intel Open Source Technology Center

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Avoid dereference past end of page array in gen8_ppgtt_insert_entries()

2014-01-01 Thread Ben Widawsky
: Daniel Vetter daniel.vet...@ffwll.ch Cc: Ben Widawsky benjamin.widaw...@intel.com Note to Daniel: This is still broken (for gen8) in the 4GB GGTT series. There, pdpe is the bad guy. Both are: Reviewed-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 18

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Only bind each object rather than for every execbuffer

2014-01-01 Thread Ben Widawsky
. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72906 Tested-by: jianx.z...@intel.com Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Cc: Ben Widawsky benjamin.widaw...@intel.com Cc: Daniel Vetter daniel.vet...@ffwll.ch My original plan with full PPGTT was to avoid all this deferred bind

[Intel-gfx] -nightly and -fixes status

2014-01-01 Thread Ben Widawsky
of the pt_pages array. I started to review Chris' series, but seem to have checked out mentally already. I'll be back on the 8th if any questions still remain by then. -- Ben Widawsky, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx

[Intel-gfx] [PATCH] [v2] drm/i915/ppgtt: Never return a NULL context

2013-12-31 Thread Ben Widawsky
It makes all the code which calls into this function way too confusing. v2: Fix destroy IOCTL as well Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72903 Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_context.c | 12 +--- 1 file changed, 9

[Intel-gfx] [PATCH] drm/i915/ppgtt: Defer request freeing on reset

2013-12-31 Thread Ben Widawsky
We need to defer the free request until the object/vma is capable of being freed - or else we have a problem when we try to destroy the context. The exact same issue is described and fixed here: commit e20780439b26ba95aeb29d3e27cd8cc32bc82a4c Author: Ben Widawsky b...@bwidawsk.net Date: Fri

Re: [Intel-gfx] [PATCH] shader-debugger: Use in tree gen4asm

2013-12-30 Thread Ben Widawsky
Should be fixed now. Sorry about that. On Mon, Dec 30, 2013 at 10:57:29AM -0200, Paulo Zanoni wrote: 2013/12/21 Ben Widawsky benjamin.widaw...@intel.com: Reported-by: Patrick McMunn doctorwho...@gmail.com Signed-off-by: Ben Widawsky b...@bwidawsk.net I see this got merged. Now when I

Re: [Intel-gfx] [PATCH] drm/i915: set ctx-initialized only after RCS

2013-12-30 Thread Ben Widawsky
On Sun, Dec 29, 2013 at 09:59:26AM +, Chris Wilson wrote: On Sat, Dec 28, 2013 at 01:31:49PM -0800, Ben Widawsky wrote: The initialized flag is used to specify a context has been initialized and it's context is safe to load, ie. the 3d state is setup properly. With full PPGTT, we emit

[Intel-gfx] [PATCH] drm/i915: set ctx-initialized only after RCS

2013-12-28 Thread Ben Widawsky
It is really easy to hit this with a planned upcoming patch which makes default context reuse possible. NOTE: This should only effect full PPGTT branches, ie. current drm-intel-nightly. Thanks to Chris for helping me track this down. Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben

[Intel-gfx] [PATCH] [trivial] drm/i915: Clarify relocation errnos

2013-12-26 Thread Ben Widawsky
-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index bbff8f9..0383171 100644

[Intel-gfx] [PATCH 9/9] drm/i915: Split GEN6 PPGTT initialization up

2013-12-25 Thread Ben Widawsky
/map/etc. or use a common helper, similar to the ringbuffer code. I don't see a benefit to doing this just yet, but who knows... Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 141 +++- 1 file changed, 91 insertions(+), 50

[Intel-gfx] [PATCH 8/9] drm/i915: Split GEN6 PPGTT cleanup

2013-12-25 Thread Ben Widawsky
This cleanup is similar to the GEN8 cleanup (though less necessary). Having everything split will make cleaning the initialization path error paths easier to understand. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +++--- 1 file

[Intel-gfx] [penguin-ker...@i-love.sakura.ne.jp: [PATCH] drm/i915: Fix refcount leak and possible NULL pointer dereference.]

2013-12-24 Thread Ben Widawsky
message - -- 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 7/7] drm/i915: Update i915_gem_gtt.c copyright

2013-12-24 Thread Ben Widawsky
I keep meaning to do this... by now almost the entire file has been written by an Intel employee (including Daniel post-2010). Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 0/7] GEN8 PPGTT cleanups + 4GB support

2013-12-24 Thread Ben Widawsky
. Ben Widawsky (7): drm/i915/bdw: Split up PPGTT cleanup drm/i915/bdw: Reorganize PPGTT init drm/i915/bdw: Split ppgtt initialization up drm/i915: Make clear/insert vfuncs args absolute drm/i915/bdw: Reorganize PT allocations Revert drm/i915/bdw: Limit GTT to 2GB drm/i915: Update

[Intel-gfx] [PATCH 1/7] drm/i915/bdw: Split up PPGTT cleanup

2013-12-24 Thread Ben Widawsky
This will make the code more readable, and extensible which is needed for upcoming feature work. Eventually, we'll do the same for init. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 58 +++-- 1 file changed, 37 insertions

[Intel-gfx] [PATCH 5/7] drm/i915/bdw: Reorganize PT allocations

2013-12-24 Thread Ben Widawsky
this functionality up to be too unwieldy. I apologize in advance to the reviewer. I'd recommend looking at the result, rather than the diff. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 135

[Intel-gfx] [PATCH 2/7] drm/i915/bdw: Reorganize PPGTT init

2013-12-24 Thread Ben Widawsky
we free. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 125 +--- 2 files changed, 74 insertions(+), 53 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm

[Intel-gfx] [PATCH 3/7] drm/i915/bdw: Split ppgtt initialization up

2013-12-24 Thread Ben Widawsky
. I've avoiding that to keep the cleanup function (which is required anyway) as robust and widespread as possible. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 183 +--- 1 file changed, 126 insertions(+), 57 deletions(-) diff

[Intel-gfx] [PATCH 6/7] Revert drm/i915/bdw: Limit GTT to 2GB

2013-12-24 Thread Ben Widawsky
This reverts commit 3a2ffb65eec6dbda2fd8151894f51c18b42c8d41. Now that the code is fixed to use smaller allocations, it should be safe to let the full GGTT be used on DW. The testcase for this is anything which uses more than half of the GTT, thus eclipsing the old limit. Signed-off-by: Ben

[Intel-gfx] [PATCH 4/7] drm/i915: Make clear/insert vfuncs args absolute

2013-12-24 Thread Ben Widawsky
need a significant amount more memory simply for the page tables. To address this, the allocations will be split up in finer amounts. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 6 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 80

[Intel-gfx] [PATCH] drm/i915/bdw: Flush system agent on gen8 also

2013-12-24 Thread Ben Widawsky
gem_gtt_cpu_tlb seems to indicate that it is needed. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72869 Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b

[Intel-gfx] [PATCH] drm/i915/bdw: Return -ENONENT on default ctx destroy

2013-12-24 Thread Ben Widawsky
This was an accidental ABI change introduced during PPGTT: commit 0eea67eb26000657079b7fc41079097942339452 Author: Ben Widawsky b...@bwidawsk.net Date: Fri Dec 6 14:11:19 2013 -0800 drm/i915: Create a per file_priv default context The failure test application actually tests the return

[Intel-gfx] [PATCH 2/7] [v2] drm/i915/bdw: Reorganize PPGTT init

2013-12-24 Thread Ben Widawsky
we free. v2: Don't call cleanup on the error path since that takes down the drm_mm and list entry, which aren't setup at this point. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 124

[Intel-gfx] [PATCH 3/7] [v2] drm/i915/bdw: Split ppgtt initialization up

2013-12-24 Thread Ben Widawsky
. I've kept the error path as similar as possible to the cleanup() function to make sure cleanup is as robust as possible v2: Remove comment NB:From here on, ppgtt-base.cleanup() should function properly Update commit message to reflect above Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers

[Intel-gfx] [PATCH] drm/i915/ppgtt: Never return a NULL context

2013-12-22 Thread Ben Widawsky
It makes all the code which calls into this function way too confusing. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72903 Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_context.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git

Re: [Intel-gfx] [PULL] drm-intel-next

2013-12-21 Thread Ben Widawsky
/drm-intel/log/?h=drm-intel-nightly -- 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] drm/i915/ppgtt: Prevent NULL deref in reset ioctl

2013-12-20 Thread Ben Widawsky
On Fri, Dec 20, 2013 at 03:11:09PM +0100, Daniel Vetter wrote: On Thu, Dec 19, 2013 at 10:55:56PM -0800, Ben Widawsky wrote: On Fri, Dec 20, 2013 at 07:05:10AM +0100, Daniel Vetter wrote: On Fri, Dec 20, 2013 at 12:22 AM, Ben Widawsky benjamin.widaw...@intel.com wrote: ctx

Re: [Intel-gfx] [PATCH] drm/i915/ppgtt: Prevent NULL deref in reset ioctl

2013-12-20 Thread Ben Widawsky
On Fri, Dec 20, 2013 at 04:37:34PM +0200, Jani Nikula wrote: On Fri, 20 Dec 2013, Daniel Vetter dan...@ffwll.ch wrote: On Thu, Dec 19, 2013 at 10:55:56PM -0800, Ben Widawsky wrote: On Fri, Dec 20, 2013 at 07:05:10AM +0100, Daniel Vetter wrote: On Fri, Dec 20, 2013 at 12:22 AM, Ben Widawsky

[Intel-gfx] [PATCH] [RFC] drm/i915: VMA ops sanitizer

2013-12-20 Thread Ben Widawsky
we've corrupted the VMA. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 ++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index

[Intel-gfx] [PATCH] shader-debugger: Use in tree gen4asm

2013-12-20 Thread Ben Widawsky
Reported-by: Patrick McMunn doctorwho...@gmail.com Signed-off-by: Ben Widawsky b...@bwidawsk.net --- configure.ac| 21 ++--- debugger/system_routine/Makefile.am | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac b

[Intel-gfx] [PATCH] drm/i915/ppgtt: Prevent NULL deref in reset ioctl

2013-12-19 Thread Ben Widawsky
of commit 41bde5535a7d48876095926bb55b1aed5ccd6b2c Author: Ben Widawsky b...@bwidawsk.net Date: Fri Dec 6 14:11:21 2013 -0800 drm/i915: Get context early in execbuf Cc: Mika Kuoppala mika.kuopp...@linux.intel.com Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/intel_uncore.c

Re: [Intel-gfx] [PATCH] drm/i915/ppgtt: Prevent NULL deref in reset ioctl

2013-12-19 Thread Ben Widawsky
On Fri, Dec 20, 2013 at 07:05:10AM +0100, Daniel Vetter wrote: On Fri, Dec 20, 2013 at 12:22 AM, Ben Widawsky benjamin.widaw...@intel.com wrote: ctx = i915_gem_context_get(file-driver_priv, args-ctx_id); - if (IS_ERR(ctx)) { + if (IS_ERR_OR_NULL(ctx)) { We now have

Re: [Intel-gfx] [PATCH 02/15] drm/i915: Don't emit mbox updates without semaphores

2013-12-17 Thread Ben Widawsky
On Tue, Dec 17, 2013 at 07:24:41PM +, Chris Wilson wrote: On Mon, Dec 16, 2013 at 08:50:38PM -0800, Ben Widawsky wrote: Aside from the fact that it leaves confusing dumps on error capture, it is entirely unnecessary, and potentially harmful in cases like BDW, where the instruction has

[Intel-gfx] [PATCH 08/15] [v3] drm/i915/bdw: implement semaphore signal

2013-12-17 Thread Ben Widawsky
ring-id (Chris) v3: After the num_dwords update in the last patch, size was not properly adjusted on rebase. (Chris) Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 01.5/15] drm/i915: Make semaphore modparam RO

2013-12-17 Thread Ben Widawsky
: Daniel Vetter daniel.vet...@ffwll.ch Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c

[Intel-gfx] [PATCH 09/15] [v3] drm/i915/bdw: implement semaphore wait

2013-12-17 Thread Ben Widawsky
a condensed GEN8_SEMAPHORE_OFFSET to define the WAIT/SIGNAL offsets (Chris). To be honest, I prefer the original implementation because I feel it is more explicit about exactly what is going on. I am willing to declare I am just unsmart, and leave it there. Signed-off-by: Ben Widawsky b

Re: [Intel-gfx] [PATCH 12/15] drm/i915: Extract semaphore error collection

2013-12-17 Thread Ben Widawsky
On Tue, Dec 17, 2013 at 07:14:27PM +, Chris Wilson wrote: On Mon, Dec 16, 2013 at 08:50:48PM -0800, Ben Widawsky wrote: Refactoring semaphore error state capture in preparation for future hardware support. Signed-off-by: Ben Widawsky b...@bwidawsk.net A trivial explanation

Re: [Intel-gfx] [PATCH] drm/i915: grab a pages pin count for preallocate stolen

2013-12-17 Thread Ben Widawsky
a pages_pin_count underrun when cleaning up framebuffers objects taken over from the BIOS. Reported-by: Jesse Barnes jbar...@virtuousgeek.org Cc: Jesse Barnes jbar...@virtuousgeek.org Cc: Ben Widawsky benjamin.widaw...@intel.com Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm

[Intel-gfx] [PATCH] drm/i915: Fix disabled semaphores

2013-12-17 Thread Ben Widawsky
The ring will emit too many if semaphores are disabled since we do not add the correct number to num_dwords anymore. This was introduced: commit 52ed23253b68e1cf154b03d91bed619504cf955b Author: Ben Widawsky benjamin.widaw...@intel.com Date: Mon Dec 16 20:50:38 2013 -0800 drm/i915: Don't

[Intel-gfx] [PATCH 04/15] drm/i915: Virtualize the ringbuffer signal func

2013-12-16 Thread Ben Widawsky
This abstraction again is in preparation for gen8. Gen8 will bring new semantics for doing this operation. While here, make the writes of MI_NOOPs explicit for non-existent rings. This should have been implicit before. NOTE: This is going to be removed in a few patches. Signed-off-by: Ben

[Intel-gfx] [PATCH 02/15] drm/i915: Don't emit mbox updates without semaphores

2013-12-16 Thread Ben Widawsky
Aside from the fact that it leaves confusing dumps on error capture, it is entirely unnecessary, and potentially harmful in cases like BDW, where the instruction has changed. In reality (seemingly), this will have no behavioral impact. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers

[Intel-gfx] [PATCH 01/15] drm/i915: Reorder/respace MI instruction definition

2013-12-16 Thread Ben Widawsky
A few command were out of numerical order and had different spacing. Put them back in numerical order, with proper spacing. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_reg.h | 52 - 1 file changed, 26 insertions(+), 26

[Intel-gfx] [PATCH 06/15] drm/i915: Make semaphore updates more precise

2013-12-16 Thread Ben Widawsky
. While we're here, simply do the round up to 2 instead of the fancier rounding we did before, which rounding up per mbox, ie 4. Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/intel_ringbuffer.c | 43 + 1 file changed, 22 insertions(+), 21

[Intel-gfx] [PATCH 11/15] drm/i915/bdw: poll semaphores

2013-12-16 Thread Ben Widawsky
Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index cf20140..66f6e1c 100644 --- a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 00/15] [v2] Broadwell HW semaphore

2013-12-16 Thread Ben Widawsky
should be pretty benign for other platforms. Ben Widawsky (15): drm/i915: Reorder/respace MI instruction definition drm/i915: Don't emit mbox updates without semaphores drm/i915: Move semaphore specific ring members to struct drm/i915: Virtualize the ringbuffer signal func drm/i915: Move

[Intel-gfx] [PATCH 07/15] drm/i915: gen specific ring init

2013-12-16 Thread Ben Widawsky
commit message Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/intel_ringbuffer.c | 134 ++-- 1 file changed, 92 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index

[Intel-gfx] [PATCH 09/15] drm/i915/bdw: implement semaphore wait

2013-12-16 Thread Ben Widawsky
-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_reg.h | 3 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 66 +++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 30 +++ 3 files changed, 62 insertions(+), 37 deletions(-) diff --git

<    5   6   7   8   9   10   11   12   13   14   >