Re: [PATCH] drm/i915: Init power domains early in driver load

2016-01-07 Thread Chris Wilson
power domain infrastructure right from the start, > since as soon as we register the i2c controllers someone can use them. > > v2: Adjust cleanup paths too (Chris). > > Cc: Ville Syrjälä > Cc: Patrik Jakobsson > Cc: Imre Deak > Cc: Jani Nikula > Cc: Meelis Roos > Cc:

Re: [Intel-gfx] [PATCH] drm/i915: Hide one invalid cancellation bug in i915_switch_context()

2015-12-22 Thread Chris Wilson
On Mon, Dec 21, 2015 at 12:59:01PM +, Chris Wilson wrote: > Hmm, it leaks a bit furter than execbuffer. For example, we need to > submit the request to maintain our state tracking correctly for the > semaphores and whatnot for incomplete CS flips. > > From inspection, we nee

Re: [PATCH] drm/i915: Hide one invalid cancellation bug in i915_switch_context()

2015-12-21 Thread Chris Wilson
On Mon, Dec 21, 2015 at 01:28:17PM +0100, Daniel Vetter wrote: > On Thu, Dec 17, 2015 at 06:18:05PM +0000, Chris Wilson wrote: > > As we add the VMA to the request early, it may be cancelled during > > execbuf reservation. This will leave the context object pointing to a >

[PATCH] drm/i915: Hide one invalid cancellation bug in i915_switch_context()

2015-12-17 Thread Chris Wilson
doing the RCS context initialisation earlier. This ensures that one callsite from blowing up (and for igt this is a frequent culprit due to how the stressful batches are submitted). Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915

[PATCH 01/32] drm/i915: Break busywaiting for requests on pending signals

2015-12-11 Thread Chris Wilson
interactivity resulting from excessively high __i915_spin_request usage. Fixes regression from commit 2def4ad99befa25775dd2f714fdd4d92faec6e34 [v4.2] Author: Chris Wilson Date: Tue Apr 7 16:20:41 2015 +0100 drm/i915: Optimistically spin for the request completion v2: Try to assess the impact

[PATCH 03/32] drm/i915: Only spin whilst waiting on the current request

2015-12-11 Thread Chris Wilson
checking for the active request. On reflection and plenty of recent experimentation, the issue is not a cache coherency problem - but an irq/seqno ordering problem (timing issue). Here, we do not need the w/a to force ordering of the read with an interrupt. Signed-off-by: Chris Wilson Reviewed-by

[PATCH 02/32] drm/i915: Limit the busy wait on requests to 5us not 10ms!

2015-12-11 Thread Chris Wilson
indicator that the system is too busy to waste cycles on spinning and we should sleep instead. __i915_spin_request was introduced in commit 2def4ad99befa25775dd2f714fdd4d92faec6e34 [v4.2] Author: Chris Wilson Date: Tue Apr 7 16:20:41 2015 +0100 drm/i915: Optimistically spin for the request

[PATCH v5] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-12-04 Thread Chris Wilson
in this patch for our access via info->screen_base). v3: Finish balancing the vma pinning for the normal !preallocated case. v4: Try to simplify the pinning even further. v5: Leak the VMA (cleaned up by object-free) to avoid complicated error paths. Signed-off-by: Chris Wilson Cc: "Goel,

Re: [PATCH] drm/i915: Fix RPS pointer passed from wait_ioctl to i915_wait_request

2015-12-03 Thread Chris Wilson
On Wed, Dec 02, 2015 at 09:13:46AM +, Chris Wilson wrote: > In commit 2e1b873072dfe3bbcc158a9c21acde1ab0d36c55 [v4.2] > Author: Chris Wilson > Date: Mon Apr 27 13:41:22 2015 +0100 > > drm/i915: Convert RPS tracking to a intel_rps_client struct > > we converted th

[PATCH] drm/i915: Fix RPS pointer passed from wait_ioctl to i915_wait_request

2015-12-02 Thread Chris Wilson
In commit 2e1b873072dfe3bbcc158a9c21acde1ab0d36c55 [v4.2] Author: Chris Wilson Date: Mon Apr 27 13:41:22 2015 +0100 drm/i915: Convert RPS tracking to a intel_rps_client struct we converted the __i915_wait_request() to take a new intel_rps_client struct (rather than having to pass fake

Re: [PATCH] drm/i915: Check the timeout passed to i915_wait_request

2015-11-26 Thread Chris Wilson
On Thu, Nov 26, 2015 at 03:49:00PM +0100, Daniel Vetter wrote: > On Thu, Nov 26, 2015 at 01:31:42PM +0000, Chris Wilson wrote: > > We have relied upon the sole caller (wait_ioctl) validating the timeout > > argument. However, when waiting for multiple requests I forgot to ensu

[PATCH] drm/i915: Check the timeout passed to i915_wait_request

2015-11-26 Thread Chris Wilson
b47161858ba13c9c7e0132230d66e008dd55 Author: Chris Wilson Date: Mon Apr 27 13:41:17 2015 +0100 drm/i915: Implement inter-engine read-read optimisations Signed-off-by: Chris Wilson Cc: Lionel Landwerlin Cc: Tvrtko Ursulin Cc: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu

[PATCH v4] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-11-20 Thread Chris Wilson
in this patch for our access via info->screen_base). v3: Finish balancing the vma pinning for the normal !preallocated case. v4: Try to simplify the pinning even further. Signed-off-by: Chris Wilson Cc: "Goel, Akash" Cc: Daniel Vetter Cc: Jesse Barnes Cc: stable@vger.kernel.org

[PATCH] drm/i915: Validate execbuffer start/length arguments against the target bo

2015-11-20 Thread Chris Wilson
The offset within and the length of the command sequence to execute are supplied by the user with respect to the batch buffer. We should be validating that region is wholly contained within the batch buffer; make it so. Reported-by: Ville Syrjälä Signed-off-by: Chris Wilson Cc: stable

[PATCH v3] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-11-20 Thread Chris Wilson
in this patch for our access via info->screen_base). v3: Finish balancing the vma pinning for the normal !preallocated case. Signed-off-by: Chris Wilson Cc: "Goel, Akash" Cc: Daniel Vetter Cc: Jesse Barnes Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/in

[PATCH v2 2/2] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-11-20 Thread Chris Wilson
in this patch for our access via info->screen_base). Signed-off-by: Chris Wilson Cc: "Goel, Akash" Cc: Daniel Vetter Cc: Jesse Barnes Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_fbdev.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/driv

[PATCH v2 1/2] drm/i915: Set the map-and-fenceable flag for preallocated objects

2015-11-20 Thread Chris Wilson
As we mark the preallocated objects as bound, we should also flag them correctly as being map-and-fenceable (if appropriate!) so that later users do not get confused and try and rebind the pinned vma in order to get a map-and-fenceable binding. Signed-off-by: Chris Wilson Cc: "Goel, Akash

[PATCH v2] drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

2015-11-19 Thread Chris Wilson
zling configuration and so we need to tell another white lie and mark the swizzling as NONE but report it as UNKNOWN through the extended get-tiling-ioctl. See commit 5eb3e5a5e11d14f9deb2a4b83555443b69ab9940 Author: Chris Wilson Date: Sun Jun 28 09:19:26 2015 +0100 drm/i915: Declare the swiz

Re: [PATCH 1/2] drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

2015-11-18 Thread Chris Wilson
On Tue, Nov 17, 2015 at 10:40:51AM +, Chris Wilson wrote: > We have varied reports of swizzling corruption on gen4 desktop, and > confirmation that it is triggered by uneven memory banks. The > implication is that the swizzling various between the paired channels > and the remaind

Re: [PATCH 1/2] drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

2015-11-17 Thread Chris Wilson
On Tue, Nov 17, 2015 at 10:40:51AM +, Chris Wilson wrote: > We have varied reports of swizzling corruption on gen4 desktop, and > confirmation that it is triggered by uneven memory banks. The s/it/one at least/ > implication is that the swizzling various between the paired channels

[PATCH 1/2] drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

2015-11-17 Thread Chris Wilson
ff-by: Chris Wilson Cc: Matti Hämäläinen Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_fence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c index 40a10b25956c..6ba68083aa95 100644

[PATCH 2/2] drm/i915: Pin unknown swizzle pages

2015-11-17 Thread Chris Wilson
unknown swizzle pages pinned. References: https://bugs.freedesktop.org/show_bug.cgi?id=90725 Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_fence.c | 4 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu

Re: [PATCH 1/2] drm/i915: Don't clobber the addfb2 ioctl params

2015-11-11 Thread Chris Wilson
On Wed, Nov 11, 2015 at 07:24:40PM +0200, Ville Syrjälä wrote: > On Wed, Nov 11, 2015 at 05:20:10PM +0000, Chris Wilson wrote: > > On Wed, Nov 11, 2015 at 07:11:28PM +0200, ville.syrj...@linux.intel.com > > wrote: > > > From: Ville Syrjälä > > > > >

Re: [PATCH 1/2] drm/i915: Don't clobber the addfb2 ioctl params

2015-11-11 Thread Chris Wilson
2 DRM_IOR(0xB8, struct drm_mode_fb_cmd2 instead? -Chris -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [Intel-gfx] [PATCH] drm/i915: Deny wrapping an userptr into a framebuffer

2015-10-23 Thread Chris Wilson
On Fri, Oct 23, 2015 at 10:04:24AM +0200, Daniel Vetter wrote: > On Thu, Oct 22, 2015 at 04:23:09PM -0700, Kristian Høgsberg wrote: > > On Tue, Oct 13, 2015 at 6:22 AM, Chris Wilson > > wrote: > > > Pinning a userptr onto the hardware raises interesting questions about &g

[PATCH] drm/i915: Deny wrapping an userptr into a framebuffer

2015-10-13 Thread Chris Wilson
e and hardware access is even more confusing. Deny it. Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Tvrtko Ursulin Cc: Michał Winiarski Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_userptr.c | 5 - drivers/gpu/drm/i915/intel_display.c| 5 + 2 files chang

[PATCH] drm/i915: Deny wrapping an userptr into a framebuffer

2015-10-13 Thread Chris Wilson
e and hardware access is even more confusing. Deny it. Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Tvrtko Ursulin Cc: Michał Winiarski Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_userptr.c | 5 - drivers/gpu/drm/i915/intel_display.c| 5 + 2 files chang

Re: [PATCH] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-10-09 Thread Chris Wilson
On Thu, Oct 08, 2015 at 01:50:21PM -0700, Wayne Boyer wrote: > From: Chris Wilson > > A long time ago (before 3.14) we relied on a permanent pinning of the > ifbdev to lock the fb in place inside the GGTT. However, the > introduction of stealing the BIOS framebuffer and reusing

Re: [PATCH] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-10-08 Thread Chris Wilson
On Wed, Oct 07, 2015 at 11:34:17AM -0700, Wayne Boyer wrote: > From: Chris Wilson > > A long time ago (before 3.14) we relied on a permanent pinning of the > ifbdev to lock the fb in place inside the GGTT. However, the > introduction of stealing the BIOS framebuffer and reusing

[PATCH 2/3] drm/i915: Fix userptr deadlock with aliased GTT mmappings

2015-10-01 Thread Chris Wilson
eported-by: Michał Winiarski Testcase: igt/gem_userptr_blits/map-fixed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Tvrtko Ursulin Cc: stable@vger.kernel.org Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_userptr.c | 175 1 file changed, 109

[PATCH v4 2/3] drm/i915: Fix userptr deadlock with aliased GTT mmappings

2015-09-10 Thread Chris Wilson
xed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Tvrtko Ursulin Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_userptr.c | 175 1 file changed, 109 insertions(+), 66 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/dr

Re: [Intel-gfx] [PATCH v3 2/3] drm/i915: Fix userptr deadlock with aliased GTT mmappings

2015-09-10 Thread Chris Wilson
On Thu, Sep 10, 2015 at 10:44:14AM +0100, Tvrtko Ursulin wrote: > > On 09/09/2015 04:03 PM, Chris Wilson wrote: > >On Wed, Sep 09, 2015 at 02:56:16PM +0100, Tvrtko Ursulin wrote: > >> > >>Hi, > >> > >>On 08/10/2015 09:51 AM, Chris Wilson wrote

Re: [Intel-gfx] [PATCH v3 2/3] drm/i915: Fix userptr deadlock with aliased GTT mmappings

2015-09-09 Thread Chris Wilson
On Wed, Sep 09, 2015 at 02:56:16PM +0100, Tvrtko Ursulin wrote: > > Hi, > > On 08/10/2015 09:51 AM, Chris Wilson wrote: > > +out: > > drm_free_large(pvec); > > return ret; > > + > > +err: > > + /* No pag

[PATCH v2] drm/i915: Limit the number of loops for reading a split 64bit register

2015-09-08 Thread Chris Wilson
...@ya.ru Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91906 Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Daniel Vetter Cc: Jani Nikula Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_drv.h | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a

Re: [Intel-gfx] [PATCH] drm/i915: Limit the number of loops for reading a split 64bit register

2015-09-08 Thread Chris Wilson
On Tue, Sep 08, 2015 at 03:36:32PM +0300, Jani Nikula wrote: > On Tue, 08 Sep 2015, Chris Wilson wrote: > > In I915_READ64_2x32 we attempt to read a 64bit register using 2 32bit > > reads. Due to the nature of the registers we try to read in this manner, > > they may incr

Re: [PATCH] drm/i915: Limit the number of loops for reading a split 64bit register

2015-09-08 Thread Chris Wilson
On Tue, Sep 08, 2015 at 08:24:19AM +0100, Chris Wilson wrote: > In I915_READ64_2x32 we attempt to read a 64bit register using 2 32bit > reads. Due to the nature of the registers we try to read in this manner, > they may increment between the two instruction (e.g. a timestamp > count

[PATCH] drm/i915: Limit the number of loops for reading a split 64bit register

2015-09-08 Thread Chris Wilson
Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 12870073d58f

[PATCH] drm/i915: Always mark the object as dirty when used by the GPU

2015-08-31 Thread Chris Wilson
eviction) but we do not run the risk of corruption. For correct read serialisation, userspace still has to notify when the GPU writes to an object. However, there are certain situations under which userspace may wish to tell white lies to the kernel... Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc

Re: [Intel-gfx] [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects

2015-08-27 Thread Chris Wilson
On Thu, Aug 27, 2015 at 09:19:18AM -0700, Jesse Barnes wrote: > On 08/27/2015 01:36 AM, Jani Nikula wrote: > > On Wed, 26 Aug 2015, Daniel Vetter wrote: > >> On Wed, Aug 26, 2015 at 12:55:57PM +0100, Chris Wilson wrote: > >>> As we mark the preallocated objects as b

Re: [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects

2015-08-26 Thread Chris Wilson
On Wed, Aug 26, 2015 at 03:06:59PM +0200, Daniel Vetter wrote: > On Wed, Aug 26, 2015 at 12:55:57PM +0100, Chris Wilson wrote: > > As we mark the preallocated objects as bound, we should also flag them > > correctly as being map-and-fenceable (if appropriate!) so that latter >

[PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects

2015-08-26 Thread Chris Wilson
As we mark the preallocated objects as bound, we should also flag them correctly as being map-and-fenceable (if appropriate!) so that latter users do not get confused and try and rebind the pinned vma in order to get a map-and-fenceable binding. Signed-off-by: Chris Wilson Cc: "Goel, Akash

Re: [Intel-gfx] [PATCH] drm/i915: Flush pipecontrol post-sync writes

2015-08-26 Thread Chris Wilson
On Wed, Aug 26, 2015 at 11:16:34AM +0200, Daniel Vetter wrote: > On Fri, Aug 21, 2015 at 04:08:41PM +0100, Chris Wilson wrote: > > In order to flush the results from in-batch pipecontrol writes (used for > > example in glQuery) before declaring the batch complete (and so declarin

[PATCH] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping

2015-08-25 Thread Chris Wilson
hat may be put into that offset. The effect is most pronounced across suspend/resume as intel_fbdev_set_suspend() does a full clear over the whole scanout. Signed-off-by: Chris Wilson Cc: "Goel, Akash" Cc: Daniel Vetter Cc: Jesse Barnes Cc: stable@vger.kernel.org --- drivers

[PATCH] drm/i915: Flush pipecontrol post-sync writes

2015-08-21 Thread Chris Wilson
es of immediate data from post-sync circles are complete before executing the next command". Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_lrc.c| 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/d

[PATCH] drm/i915: Mark the GTT as uncached, not WC, for Cherryview

2015-08-16 Thread Chris Wilson
the GSM like for Broxton removed the hangs. Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index

[PATCH] drm/i915: Flag the execlists context object as dirty after every use

2015-08-14 Thread Chris Wilson
, and a further swap-out cycle will then loose the most recent GPU state. Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_lrc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index

[PATCH v3 2/3] drm/i915: Fix userptr deadlock with aliased GTT mmappings

2015-08-10 Thread Chris Wilson
active-flag prior to successfully establishing obj->pages. v4: Take the active->flag early so we know in the mmu-notifier when we have to cancel a pending gup-worker. Reported-by: Michał Winiarski Testcase: igt/gem_userptr_blits/map-fixed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc:

Re: [PATCH] drm/i915: Declare the swizzling unknown for L-shaped configurations

2015-07-30 Thread Chris Wilson
On Sun, Jun 28, 2015 at 09:19:26AM +0100, Chris Wilson wrote: > The old style of memory interleaving swizzled upto the end of the > first even bank of memory, and then used the remainder as unswizzled on > the unpaired bank - i.e. swizzling is not constant for all memory. This > cau

Re: [Intel-gfx] [PATCH v3] drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls

2015-07-21 Thread Chris Wilson
On Tue, Jul 21, 2015 at 08:49:31AM +0200, Daniel Vetter wrote: > On Fri, Jul 17, 2015 at 05:10:25PM +0200, Michał Winiarski wrote: > > On Thu, Jul 16, 2015 at 12:37:56PM +0100, Chris Wilson wrote: > > > Since the hardware sometimes mysteriously totally flummoxes the 64bit >

[PATCH v3] drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls

2015-07-16 Thread Chris Wilson
request the 2x32 bit accurate read of the timestamp. v2: Fix alignment check and include details of the workaround for userspace. Reported-by: Karol Herbst Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91317 Testcase: igt/gem_reg_read Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc

[PATCH v2] drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls

2015-07-15 Thread Chris Wilson
request the 2x32 bit accurate read of the timestamp. Reported-by: Karol Herbst Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91317 Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_uncore.c | 26 +++--- 1 file

Re: [Intel-gfx] [PATCH] drm/i915: Use two 32bit reads for all 64bit REG_READ ioctls

2015-07-15 Thread Chris Wilson
On Wed, Jul 15, 2015 at 08:59:52AM +0100, Chris Wilson wrote: > On Wed, Jul 15, 2015 at 08:50:44AM +0100, Chris Wilson wrote: > > Since the hardware sometimes mysteriously totally flummoxes the 64bit > > read of a 64bit register when read using a single instruction, split the &g

Re: [PATCH] drm/i915: Use two 32bit reads for all 64bit REG_READ ioctls

2015-07-15 Thread Chris Wilson
On Wed, Jul 15, 2015 at 08:50:44AM +0100, Chris Wilson wrote: > Since the hardware sometimes mysteriously totally flummoxes the 64bit > read of a 64bit register when read using a single instruction, split the > read into two instructions. Since the read here is of automatically >

[PATCH] drm/i915: Use two 32bit reads for all 64bit REG_READ ioctls

2015-07-15 Thread Chris Wilson
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91317 Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index

Re: [PATCH] Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations"

2015-07-14 Thread Chris Wilson
On Tue, Jul 14, 2015 at 07:31:12PM +0200, Harald Arnesen wrote: > Chris Wilson [2015-07-14 18:15]: > > > I am annoyed, but under the rules we have to revert this because > > userspace (me) fscked up. > > > > Acked-by: Chris Wilson > > > > But v1 s

Re: [PATCH] Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations"

2015-07-14 Thread Chris Wilson
ill is on some other platforms, but it still pretty clearly broke > the testers machine. If we want this we need to extend the ioctl with > new paramters that only new userspace looks at. > > Cc: Harald Arnesen > Cc: Chris Wilson > Reported-by: Harald Arnesen > Cc: stable@vger.kern

Re: [PATCH v3 1/2] drm/i915: avoid leaking DMA mappings

2015-07-11 Thread Chris Wilson
pvec, num_pages); > + if (ret) > + return ret; > + > + ret = i915_gem_gtt_prepare_object(obj); > + if (ret) { > + sg_free_table(obj->pages); > + kfree(obj->pages); > + obj->pages = NULL; Oh dear, we just lea

Re: [PATCH v3 1/2] drm/i915: avoid leaking DMA mappings

2015-07-09 Thread Chris Wilson
t; > v2: > - move the DMA mapping create/remove calls to the get_pages/put_pages > callbacks instead of adding new callbacks for these (Chris) > v3: > - also fix the get_page cache logic on the userptr async path (Chris) > > Signed-off-by: Imre Deak > Reviewed-by: Ch

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-07-01 Thread Chris Wilson
nce one side is guarded by the spinlock, I think it is easier to reuse that. Especially when the expression becomes a little more complicated. > Hm.. What if we get invalidate > while get_pages is running, before it set active but after gup has > succeeded? Yeah, that actually is a p

[PATCH 2/3] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-06-30 Thread Chris Wilson
Winiarski Testcase: igt/gem_userptr_blits/map-fixed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Tvrtko Ursulin Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_userptr.c | 43 +++-- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/dr

Re: [Intel-gfx] [PATCH v2] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-06-30 Thread Chris Wilson
On Tue, Jun 30, 2015 at 04:31:15PM +0100, Chris Wilson wrote: > That suggests MAP_FIXED is special in invalidating the range unlike a > normal mmap(). This is arguing that we must always make any access after > invalidate_range be EFAULT. The danger here is that I am not sure if there

Re: [Intel-gfx] [PATCH v2] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-06-30 Thread Chris Wilson
Looking again at mm/, I can't see any place where we can legally be expecting to reuse the same address for a userptr after the invalidate. I'm sure you have a testcase waiting for igt :) -Chris -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe from this list: sen

[PATCH v2] drm/i915: Declare the swizzling unknown for L-shaped configurations

2015-06-29 Thread Chris Wilson
: Mark the global swizzling as unknown rather than adjust the value reported to userspace. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91105 Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_tiling.c | 12 +++- 1 file

[PATCH v2] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-06-29 Thread Chris Wilson
the next loop then the notifier.serial will be incremented and we start the walk from the beginning as we detect the invalid cache. v2: Grammar fixes Reported-by: Michał Winiarski Testcase: igt/gem_userptr_blits/map-fixed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Tvrtko Ursulin Cc

[PATCH] drm/i915: Fix userptr deadlock with MAP_FIXED

2015-06-29 Thread Chris Wilson
the next loop then the notifier.serial will be incremented and we start the walk from the beginning as we detect the invalid cache. Reported-by: Michał Winiarski Testcase: igt/gem_userptr_blits/map-fixed* Signed-off-by: Chris Wilson Cc: Michał Winiarski Cc: Tvrtko Ursulin Cc: stable

[PATCH] agp/intel: Fix typo in needs_ilk_vtd_wa()

2015-06-28 Thread Chris Wilson
: Chris Wilson Date: Wed Feb 13 09:31:53 2013 + drm/i915: Disable WC PTE updates to w/a buggy IOMMU on ILK Reported-by: Ting-Wei Lan Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91127 References: https://bugzilla.freedesktop.org/show_bug.cgi?id=60391 Signed-off-by: Chris

Re: [PATCH] drm/i915: Declare the swizzling unknown for L-shaped configurations

2015-06-28 Thread Chris Wilson
On Sun, Jun 28, 2015 at 09:19:26AM +0100, Chris Wilson wrote: > The old style of memory interleaving swizzled upto the end of the > first even bank of memory, and then used the remainder as unswizzled on > the unpaired bank - i.e. swizzling is not constant for all memory. This > cau

[PATCH] drm/i915: Declare the swizzling unknown for L-shaped configurations

2015-06-28 Thread Chris Wilson
: https://bugs.freedesktop.org/show_bug.cgi?id=91105 Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem_tiling.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915

Re: [PATCH] drm/i915: fix backlight after resume on 855gm

2015-06-26 Thread Chris Wilson
335@acheron > Fixes: b0cd324faed2 ("drm/i915: don't save/restore backlight hist ctl > registers") > Cc: Ville Syrjälä > Cc: stable@vger.kernel.org > Acked-by: Chris Wilson > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_reg.h| 1 + >

Re: [Intel-gfx] [PATCH] drm/i915: Officially give up on seqno coherency

2015-06-24 Thread Chris Wilson
only tricks to make it work. And since > > > > > > commit 094f9a54e35500739da185cdb78f2e92fc379458 > > > Author: Chris Wilson > > > Date: Wed Sep 25 17:34:55 2013 +0100 > > > > > > drm/i915: Fix __wait_seqno to use true infinite t

Re: [PATCH] drm/i915: Officially give up on seqno coherency

2015-06-19 Thread Chris Wilson
On Fri, Jun 19, 2015 at 09:16:09PM +0200, Daniel Vetter wrote: > We've never figured out the magic trick to make irq vs. seqno > updates coherent, only tricks to make it work. And since > > commit 094f9a54e35500739da185cdb78f2e92fc379458 > Author: Chris Wilson > Date: W

Re: [Intel-gfx] [PATCH] drm/i915: Officially give up on seqno coherency

2015-06-19 Thread Chris Wilson
On Fri, Jun 19, 2015 at 06:43:04PM +0200, Daniel Vetter wrote: > We've never figured out the magic trick to make irq vs. seqno > updates coherent, only tricks to make it work. And since > > commit 094f9a54e35500739da185cdb78f2e92fc379458 > Author: Chris Wilson > Date: W

[PATCH] drm/i915: Always reset vma->ggtt_view.pages cache on unbinding

2015-06-11 Thread Chris Wilson
17:27:58 2014 + drm/i915: Infrastructure for supporting different GGTT views per object Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1227892 Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Daniel Vetter Cc: Michel Thierry Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/

Re: [Intel-gfx] [PATCH] drm/i915: Mark the final obj->pages sg entry as last

2015-06-09 Thread Chris Wilson
On Tue, Jun 09, 2015 at 10:53:23AM +0100, Chris Wilson wrote: > > > if (!i || page_to_pfn(page) != last_pfn + 1) { > > > if (i) > > > - sg = sg_next(sg); > > > + sg = sg_next(end = sg);

Re: [PATCH] drm/i915: Mark the final obj->pages sg entry as last

2015-06-09 Thread Chris Wilson
On Tue, Jun 09, 2015 at 12:46:30PM +0300, Imre Deak wrote: > On ti, 2015-06-09 at 10:19 +0100, Chris Wilson wrote: > > Currently we may mark the subsequent sg entry as the last, instead of > > the actual last element we used. If a later iterator only used > > sg_is_last() (su

[PATCH] drm/i915: Mark the final obj->pages sg entry as last

2015-06-09 Thread Chris Wilson
dereference we see in insert pages, such as https://bugzilla.redhat.com/show_bug.cgi?id=1227892 Signed-off-by: Chris Wilson Cc: Imre Deak Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915

Re: [Intel-gfx] [PATCH v2] drm/i915: Force wmb() on using GTT io_mapping_map_wc

2015-05-26 Thread Chris Wilson
On Tue, May 26, 2015 at 11:56:18AM +0200, Daniel Vetter wrote: > On Tue, May 26, 2015 at 09:49:15AM +0100, Chris Wilson wrote: > > On Tue, May 26, 2015 at 10:01:24AM +0200, Daniel Vetter wrote: > > > On Mon, May 25, 2015 at 06:48:44PM +0100, Chris Wilson wrote: > > > &g

Re: [Intel-gfx] [PATCH v2] drm/i915: Force wmb() on using GTT io_mapping_map_wc

2015-05-26 Thread Chris Wilson
On Tue, May 26, 2015 at 10:01:24AM +0200, Daniel Vetter wrote: > On Mon, May 25, 2015 at 06:48:44PM +0100, Chris Wilson wrote: > > Since the advent of mmap(wc), where we reused the same cache domain for > > WC and GTT paths (oh, how I regret that double-edged advice), we need

[PATCH v2] drm/i915: Force wmb() on using GTT io_mapping_map_wc

2015-05-25 Thread Chris Wilson
path and about to write through the second path. Also, apply the barriers on transitioning into the GTT domain as well to cover the white lie asychronous cases. Signed-off-by: Chris Wilson Cc: Akash Goel Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem.c | 26

[PATCH] drm/i915: Force wmb() on using GTT io_mapping_map_wc

2015-05-25 Thread Chris Wilson
aliased WC path through the GTT, those writes may overlap and not be visible to the other path. Easiest to trigger appears to be write the batch through mmap(wc) and then attempt to perform reloc the GTT, corruption quickly ensues. Signed-off-by: Chris Wilson Cc: Akash Goel Cc: stable@vger.kernel.org

Re: [PATCH v2] drm: Only create a cmdline mode if no probed modes match

2015-05-22 Thread Chris Wilson
On Fri, May 22, 2015 at 12:03:27PM +0300, Ville Syrjälä wrote: > On Mon, Apr 20, 2015 at 02:28:56PM +0100, Chris Wilson wrote: > > The intention of using video=: is primarily to select > > the user's preferred resolution at startup. Currently we always create a > > new mo

Re: [PATCH v2] drm: Only create a cmdline mode if no probed modes match

2015-05-21 Thread Chris Wilson
On Mon, Apr 20, 2015 at 03:41:48PM +0200, Radek Dostál wrote: > On 04/20/2015 03:28 PM, Chris Wilson wrote: > > The intention of using video=: is primarily to select > > the user's preferred resolution at startup. Currently we always create a > > new mode irrespective of

Re: [Intel-gfx] [PATCH] drm/i915: Unconditionally flush writes before execbuffer

2015-05-21 Thread Chris Wilson
T. */ > Reviewed-by: Daniel Vetter > > And I guess also > > Cc: stable@vger.kernel.org It already was ;-) -Chris -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a mess

Re: [Intel-gfx] [PATCH] drm/i915: Unconditionally flush writes before execbuffer

2015-05-21 Thread Chris Wilson
On Thu, May 21, 2015 at 03:07:54PM +0200, Daniel Vetter wrote: > On Thu, May 21, 2015 at 02:00:34PM +0100, Chris Wilson wrote: > > On Tue, May 19, 2015 at 03:41:48PM +0100, Chris Wilson wrote: > > > On Mon, May 11, 2015 at 04:25:52PM +0100, Chris Wilson wrote: > > > >

Re: [Intel-gfx] [PATCH] drm/i915: Unconditionally flush writes before execbuffer

2015-05-21 Thread Chris Wilson
On Tue, May 19, 2015 at 03:41:48PM +0100, Chris Wilson wrote: > On Mon, May 11, 2015 at 04:25:52PM +0100, Chris Wilson wrote: > > On Mon, May 11, 2015 at 12:34:37PM +0200, Daniel Vetter wrote: > > > On Mon, May 11, 2015 at 08:51:36AM +0100, Chris Wilson wrote: > > > &

Re: [Intel-gfx] [PATCH] drm/i915: Unconditionally flush writes before execbuffer

2015-05-19 Thread Chris Wilson
On Mon, May 11, 2015 at 04:25:52PM +0100, Chris Wilson wrote: > On Mon, May 11, 2015 at 12:34:37PM +0200, Daniel Vetter wrote: > > On Mon, May 11, 2015 at 08:51:36AM +0100, Chris Wilson wrote: > > > With the advent of mmap(wc), we have a path to write directly into > > &g

[PATCH] drm/i915: Unconditionally flush writes before execbuffer

2015-05-11 Thread Chris Wilson
memory barriers along the execbuffer path. Writes through the GTT should have been naturally serialised with execution through the GTT as well and so the impact only seems to be from the WC paths. Signed-off-by: Chris Wilson Cc: Akash Goel Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915

[PATCH v2] drm: Only create a cmdline mode if no probed modes match

2015-04-20 Thread Chris Wilson
r: Chris Wilson Date: Wed Aug 6 10:08:32 2014 +0200 drm: Perform cmdline mode parsing during connector initialisation that breaks HDMI output on BeagleBone Black with LG TV (model 19LS4R-ZA). v2: Explicitly delete our earlier cmdline mode Reported-by: Radek Dostál Signed-off-by: Chris Wi

Re: [PATCH] drm: Only create a cmdline mode if no probed modes match

2015-04-20 Thread Chris Wilson
On Mon, Apr 20, 2015 at 03:06:30PM +0200, Radek Dostál wrote: > Hi Chris, > > On 04/20/2015 02:26 PM, Chris Wilson wrote: > > The intention of using video=: > the user's preferred resolution at startup. Currently we always create a > > GTF mode irrespective of whe

[PATCH] drm: Only create a cmdline mode if no probed modes match

2015-04-20 Thread Chris Wilson
add the cmdline mode mode ahead of the absolute fallback 1024x768 mode. That is if the user has specified a mode that we create as a fallback, we do not need to add a second unused fallback mode. Fixes regression from commit eaf99c749d43ae74ac7ffece5512f3c73f01dfd2 Author: Chris Wilson Date

Re: [PATCH 1/2] drm/i915: Fix locking in DRRS flush/invalidate hooks

2015-04-09 Thread Chris Wilson
upport or not first. Also unconditionally initialize > the mutex/work item to avoid future trouble. > > Cc: Chris Wilson > Cc: Ville Syrjälä > Cc: Ramalingam C > Cc: Rodrigo Vivi > Cc: Vandana Kannan > Cc: stable@vger.kernel.org (4.0+ only) > Signed-off-by: Dani

Re: [PATCH] drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again

2015-03-09 Thread Chris Wilson
On Fri, Mar 06, 2015 at 05:48:26PM +0100, Daniel Vetter wrote: > On Fri, Mar 06, 2015 at 08:54:35AM +0000, Chris Wilson wrote: > > On Thu, Mar 05, 2015 at 01:27:43PM +0100, Daniel Vetter wrote: > > > On Wed, Mar 04, 2015 at 06:09:26PM +, Chris Wilson wrote: > > > >

Re: [PATCH] drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again

2015-03-06 Thread Chris Wilson
On Thu, Mar 05, 2015 at 01:27:43PM +0100, Daniel Vetter wrote: > On Wed, Mar 04, 2015 at 06:09:26PM +0000, Chris Wilson wrote: > > This fixes a regression from > > > > commit 5ed0bdf21a85d78e04f89f15ccf227562177cbd9 > > Author: Thomas Gleixner > > Date:

[PATCH] drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again

2015-03-04 Thread Chris Wilson
indefinitely. Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Ben Widawsky Cc: Kristian Høgsberg Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/i915_gem.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c

[PATCH 1/2] acpi/video: Load the module even if ACPI is disabled

2015-03-01 Thread Chris Wilson
boot correctly. Reported-by: Bill Augur Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Jani Nikula Cc: Zhang Rui Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: linux-a...@vger.kernel.org Cc: linux-ker...@vger.kernel.org Cc: stable@vger.kernel.org --- drivers/acpi/video.c | 10 +++

Re: [Intel-gfx] [PATCH] drm/i915: Check for driver readyness before handling an underrun interrupt

2015-02-27 Thread Chris Wilson
On Fri, Feb 27, 2015 at 10:20:05AM +0200, Jani Nikula wrote: > On Fri, 27 Feb 2015, Jani Nikula wrote: > > On Thu, 26 Feb 2015, Chris Wilson wrote: > >> When we takeover from the BIOS and install our interrupt handler, the > >> BIOS may have left us a few surprises

[PATCH] drm/i915: Check for driver readyness before handling an underrun interrupt

2015-02-26 Thread Chris Wilson
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1193972 Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter Cc: stable@vger.kernel.org --- drivers/gpu/drm/i915/intel_fifo_underrun.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915

[PATCH] drm: Don't assign fbs for universal cursor support to files

2015-02-25 Thread Chris Wilson
lementation, which is the only place it is needed. And also rename the function for a more accurate since it only creates the fb, but doesn't add it anywhere. Signed-off-by: Daniel Vetter (fix & commit msg) Signed-off-by: Chris Wilson (provider of lipstick) Cc: Ville Syrjälä Cc: M

Re: [PATCH] drm/i915: Align initial plane backing objects correctly

2015-02-10 Thread Chris Wilson
On Tue, Feb 10, 2015 at 11:10:51PM +0100, Daniel Vetter wrote: > Some bios really like to joke and start the planes at an offset ... > hooray! > > Align start and end to fix this. > > v2: Fixup calculation of size, spotted by Chris Wilson. > > Bugzilla: https://bugs.free

Re: [Intel-gfx] [PATCH] drm/i915: Do not invalidate obj->pages under mempressure

2015-02-09 Thread Chris Wilson
On Sun, Feb 08, 2015 at 03:27:13PM -0800, Sean V Kelley wrote: > > > On 01/16/2015 08:05 PM, Daniel Vetter wrote: > > On Thu, Jan 15, 2015 at 08:44:00PM +0000, Chris Wilson wrote: > >> On Thu, Jan 15, 2015 at 08:36:15PM +0100, Daniel Vetter wrote: > >>> On

  1   2   3   4   >