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
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
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +++---
1 file changed, 19
semantics. 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 Widawsk
On Wed, Feb 12, 2014 at 07:18:19PM +, Chris Wilson wrote:
> On Wed, Feb 12, 2014 at 10:55:07AM -0800, Ben Widawsky wrote:
> > On Wed, Feb 12, 2014 at 08:15:58AM +, Chris Wilson wrote:
> > Are you opposed to doing anything at context creation? pid reference
> > works f
On Wed, Feb 12, 2014 at 08:13:50AM +, Chris Wilson wrote:
> On Tue, Feb 11, 2014 at 06:32:24PM -0800, Ben Widawsky wrote:
> > > @@ -3234,7 +3241,9 @@ static irqreturn_t i8xx_irq_handler(int irq, void
> > > *arg)
> > >*/
> > >
On Wed, Feb 12, 2014 at 08:25:58AM +, Chris Wilson wrote:
> On Tue, Feb 11, 2014 at 05:57:19PM -0800, Ben Widawsky wrote:
> > On Mon, Feb 10, 2014 at 04:30:49PM +0200, Mika Kuoppala wrote:
> > > -static struct drm_i915_gem_request *
> > > -i915_gem_fin
On Wed, Feb 12, 2014 at 08:15:58AM +, Chris Wilson wrote:
> On Tue, Feb 11, 2014 at 06:07:09PM -0800, Ben Widawsky wrote:
> > I still like my solution which does the strcpy on context creation. Your
> > solution is deferred in the usual case since the hangcheck is
> > asyn
or(dev, false);
> + i915_handle_error(dev, false,
> + "Command parser error, iir 0x%08x",
> + iir);
>
> for_each_pipe(pipe) {
> int reg = PIPESTAT(pipe);
> @@ -341
an compare
> its contents against the intended batch for the active request.
>
> v3: Rebase (Mika)
>
> Link: http://lists.freedesktop.org/archives/intel-gfx/2013-August/032280.html
> Signed-off-by: Chris Wilson (v2)
> Signed-off-by: Mika Kuoppala (v3)
> Cc: Be
ns that we then report the oldest incomplete batch on
> each ring, which can be useful for determining the state of userspace at
> the time of a hang.
>
> v2: Use i915_gem_find_active_request (Mika)
>
> Signed-off-by: Chris Wilson (v1)
> Signed-off-by: Mika Kuoppala (v2)
> C
On Thu, Jan 30, 2014 at 04:53:32PM +0200, Ville Syrjälä wrote:
> On Wed, Jan 29, 2014 at 11:55:31AM -0800, Ben Widawsky wrote:
> > Since the semaphore information is in an object, just dump it, and let
> > the user parse it later.
> >
> > NOTE: The page being
On Thu, Jan 30, 2014 at 02:58:09PM +, Chris Wilson wrote:
> On Thu, Jan 30, 2014 at 04:53:32PM +0200, Ville Syrjälä wrote:
> > On Wed, Jan 29, 2014 at 11:55:31AM -0800, Ben Widawsky wrote:
> > > + obj = error->semaphore_obj;
> > > + if (obj) {
> >
> >
On Tue, Feb 11, 2014 at 02:22:37PM -0800, Ben Widawsky wrote:
> On Tue, Feb 11, 2014 at 02:11:04PM -0800, Ben Widawsky wrote:
> > On Thu, Jan 30, 2014 at 02:38:17PM +0200, Ville Syrjälä wrote:
> > > On Wed, Jan 29, 2014 at 11:55:26AM -0800, Ben Widawsky wrote:
> > > &
On Tue, Feb 11, 2014 at 10:23:38PM +, Chris Wilson wrote:
> On Tue, Feb 11, 2014 at 01:48:22PM -0800, Ben Widawsky wrote:
> > On Thu, Jan 30, 2014 at 01:35:41PM +, Chris Wilson wrote:
> > > On Thu, Jan 30, 2014 at 02:18:32PM +0100, Daniel Vetter wrote:
> > > >
On Tue, Feb 11, 2014 at 02:11:04PM -0800, Ben Widawsky wrote:
> On Thu, Jan 30, 2014 at 02:38:17PM +0200, Ville Syrjälä wrote:
> > On Wed, Jan 29, 2014 at 11:55:26AM -0800, Ben Widawsky wrote:
> > > Semaphore signalling works similarly to previous GENs with the exception
>
On Thu, Jan 30, 2014 at 02:38:17PM +0200, Ville Syrjälä wrote:
> On Wed, Jan 29, 2014 at 11:55:26AM -0800, Ben Widawsky wrote:
> > Semaphore signalling works similarly to previous GENs with the exception
> > that the per ring mailboxes no longer exist. Instead you must define
>
On Tue, Feb 11, 2014 at 10:53:40PM +0200, Ville Syrjälä wrote:
> On Tue, Feb 11, 2014 at 12:20:42PM -0800, Ben Widawsky wrote:
> > With the ring mask we now have an easy way to know the number of rings
> > in the system, and therefore can accurately predict the number of dwords
soon as the flush is complete - in parallel
> to the TLB invalidate. Adding CONTROL_FLUSH_ENABLE would then stall the
> CS until the post-sync operation completes. That still leaves the
> possibility that the TLB invalidate is being performed in parallel and
> is itself provid
emit (Ville)
Conditionally set .sync_to when semaphores are enabled (Ville)
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 55 ++---
1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c
b/dr
On Thu, Jan 30, 2014 at 01:25:42PM +0200, Ville Syrjälä wrote:
> On Wed, Jan 29, 2014 at 11:55:24AM -0800, Ben Widawsky wrote:
> > With the ring mask we now have an easy way to know the number of rings
> > in the system, and therefore can accurately predict the number of dwords
15/intel_ringbuffer.h
> b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 38c757e..6c52d59 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -259,6 +259,7 @@ int intel_init_vebox_ring_buffer(struct
eeping it naive
gives us some ability to make a decent test case.
Cc: Jesse Barnes
References: https://bugs.freedesktop.org/show_bug.cgi?id=73276
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gpu_error.c | 44 +--
1 file changed, 37 insertions(+), 7 del
On Thu, Jan 30, 2014 at 11:00:35AM -0800, Ben Widawsky wrote:
> RC6 works a lot like HW contexts in that when the GPU enters RC6 it
> saves away the state to a context, and loads it upon wake.
>
> It's to be somewhat expected that BIOS will not set up valid GPU state.
> As
ally, this tactic is required for all platforms, though I am not
certain we've seen real failures.
Cc: David E. Box
Cc: Kristen Carlson Accardi
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gem.c | 6 ++
drivers/gpu/drm/i915/intel_display.c | 4
2 files changed, 6 i
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
Signed-off-by: Ben Widawsky
Reviewed-by: Chris Wilson
---
drivers/gpu/drm/i915/i915_drv.h | 4
drivers/gpu/drm/i915
v2: Moved num_requests up (Chris)
Rebased on new hws page capture which required a rename since it made
two members named, 'hws' in the per ring error state. (Ben)
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 65
drivers/gpu/drm/i915/i915_g
This helps make an upcoming patch a bit more reviewable
Signed-off-by: Ben Widawsky
Reviewed-by: Chris Wilson
---
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
v2: Rebased upon cleaned up error state
v3: Make sure hangcheck info remains last (Chris)
Cc: Chris Wilson
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 9 +
drivers/gpu/drm/i915/i915_gpu_error.c | 37 +++
2 files changed, 46
The code has become quite hairy. By relocating all the generic registers
it will become more obvious where future ones should go. There is still
admittedly a bit of confusion left for things like per ring registers.
A subsequent patch will clean this function up.
Signed-off-by: Ben Widawsky
Create logical sections in an attempt to clean up, and continue to keep
future additions clean.
v2: Reworded the comments. Added section headers (Chris)
Signed-off-by: Ben Widawsky
Reviewed-by: Chris Wilson
---
drivers/gpu/drm/i915/i915_gpu_error.c | 59 +--
1
et_status twice
(I bit my lip while reading the last patch). To me it suggests that the
interface probably ended up a bit poorly designed. I can live with it
though, I just couldn't bite my lip for 2 patches in a row :-)
I guess I've missed how this solves the issue I poked about in the
o
ext *ctx)
> return true;
>
> if (elapsed <= DRM_I915_CTX_BAN_PERIOD) {
> - DRM_ERROR("context hanging too fast, declaring banned!\n");
> + if (dev_priv->gpu_error.stop_rings == 0 &&
> + i
On Wed, Jan 29, 2014 at 05:05:36PM +0200, Mika Kuoppala wrote:
> With full ppgtt support drm_i915_file_private gained knowledge
> about the default context. Also reset stats are now inside
> i915_hw_context so we can use proper abstraction.
>
> Suggested-by: Ben Widawsky
> S
Blargh this isn't specific to HSW. Title should be s/HSW/gen6|gen7/
On Wed, Jan 29, 2014 at 12:20:54PM -0800, Ben Widawsky wrote:
> We need to do the print after we've done the math.
>
> This was broken when we introduced VLV support. Personally, I think the
> interf
e can keep it I guess.
commit 0a073b843bcd9a660f76e497182aac97cafddc4c
Author: Jesse Barnes
Date: Wed Apr 17 15:54:58 2013 -0700
drm/i915: turbo & RC6 support for VLV v7
Reported-by: Rao, Ram R
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
1 file c
gt; globally.
>
> Signed-off-by: Chris Wilson
> Cc: Daniel Vetter
> Cc: Ben Widawsky
Can you rename i915_gem_evict_something() or add a comment at the top
that the function is not used by the shrinker, and is for evicting a VM?
The comment we currently have in the function doe
This will be helpful in abstracting some of the code in preparation for
gen8 semaphores.
Cc: Mika Kuoppala
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gem.c | 10 ++--
drivers/gpu/drm/i915/i915_gpu_error.c | 6 +--
drivers/gpu/drm/i915/intel_ringbuffer.c | 84
Everything should be lined up now to make gen8 semaphores work like they
did on previous generations, so just do it.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915
Simple debugfs file to display the current state of semaphores. This is
useful if you want to see the state without hanging the GPU.
NOTE: This patch is optional to the series.
NOTE2: Like the GPU error state collection, the reads are currently
incoherent.
Signed-off-by: Ben Widawsky
he other ring's ring->id (Chris)
Update the comment to use the correct formula (Chris)
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_reg.h | 5 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 199 +-
)
Signed-off-by: Ben Widawsky
---
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 a/drivers
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gpu_error.c | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c
b/drivers/gpu/drm/i915/i915_gpu_error.c
index a8b91fc..efaad96 100644
--- a/drivers
.
v2: v1 had a stale commit message
Signed-off-by: Ben Widawsky
---
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.
: Don't print signal, and wait (they should be the same). Instead,
print sync_seqno (Chris)
v3: Free the semaphore error object (Chris)
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_gpu_error.c
Signed-off-by: Ben Widawsky
---
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 3cfcc78..3a3ba81 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers
Implement the note indicated in the bspec.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gem_context.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c
b/drivers/gpu/drm/i915/i915_gem_context.c
index 2b0598e..bb84be8 100644
--- a
.
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
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 43 +
1 file changed, 22 insertions(+), 21 deletions(-)
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
shared #define
On a related not, gen8 will use a different number of dwords for
semaphores, but not for add request.
v2: Make number of dwords an explicit part of signalling (via function
argument). (Chris)
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 39
h I was confused about is left in.
As before, the series is pushed here:
git://people.freedesktop.org/~bwidawsk/drm-intel bdw-sema
If you find yourself with a problem after running these, you can either
disable semaphores from the kernel command line, or revert "drm/i915:
unleash semaphor
dling the interrupts. Since the code is
currently disabled (and broken) I think the patch stands better by
itself.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_irq.c | 80 ++--
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_drv.h
It wasn't ever used by the caller anyway with the exception of what we
show in sysfs.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 6acb429..ae59bd9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b
It is tested and looking fairly stable now, so turn it on. It wasn't
intentionally turned off originally :P
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 944b99c..6acb429 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 34cc898..deaaaf2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915
Everything can be overridden by module parameters, so don't confuse the
users that are using them.
We have RC6 turned on for all platforms which support it, but Ironlake,
so the need to explain the situation is no longer pressing.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel
could be two patches, one to extract, and one to add gen8, but it's
trivial enough that I think one is fine. I will accept a request to
split it.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff
bwidawsk/drm-intel bdw-rc6
A quick summary:
1-4 Are cleanups
5 is a cleanup + bug fix
6-7 are small bug fixes
8 handler for all of the PM interrupts
9 is the simple "on switch"
Ben Widawsky (9):
drm/i915: Clarify RC6 enabling
drm/i915: Stop pretending VLV has rc6+
drm/i915: Just pr
Programming it outside of the rp0-rp1 range is considered a programming
error. Since we do not know that the previous value would actually be in
the range, program something we've read from the hardware, and therefore
know will work.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm
e the return value anyway, so this patch is
simply to have the code make a bit more sense.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/intel_pm.c | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
v2: Rebased upon cleaned up error state
Cc: Chris Wilson
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 9
drivers/gpu/drm/i915/i915_gpu_error.c | 39 +++
2 files changed, 48 insertions(+)
diff --git a/drivers/gpu/drm/i915
This helps make an upcoming patch a bit more reviewable
Signed-off-by: Ben Widawsky
---
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/drm/i915
Signed-off-by: Ben Widawsky
---
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/drivers/gpu/drm/i915
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
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 4
drivers/gpu/drm/i915/i915_gpu_error.c | 16
The code has become quite hairy. By relocating all the generic registers
it will become more obvious where future ones should go. There is still
admittedly a bit of confusion left for things like per ring registers.
A subsequent patch will clean this function up.
Signed-off-by: Ben Widawsky
Create logical sections in an attempt to clean up, and continue to keep
future additions clean.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gpu_error.c | 60 +--
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/i915
nt aliasing and full.
v2: Remove USES_ALIASING_PPGTT since there are currently no cases where
we need to check if we're using aliasing, but not full PPGTT. (Daniel)
Cc: Daniel Vetter
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_drv.h | 5 +++--
drivers/gpu/drm/i915/i9
; 1.8.5.2
>
> ___
> 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
WaDisableRowChickenDopClockGating:bdw - pre-production only */
> + I915_WRITE(GEN7_ROW_CHICKEN2,
> +_MASKED_BIT_ENABLE(DOP_CLOCK_GATING_DISABLE));
> +
> /*
>* This GEN8_CENTROID_PIXEL_OPT_DIS W/A is only needed for
>* pre-producti
DER_TARGET_CACHE_FLUSH;
If I am reading the same workaround as you, we only need to do this when
!flush_domains, since we satisfy the requisite in the flush_domains
case.
But I can live with it whether or not you change it.
Reviewed-by: Ben Widawsky
--
Ben Widawsky, Intel Open Source Technology Cent
On Mon, Jan 27, 2014 at 09:31:04PM +, Chris Wilson wrote:
> On Mon, Jan 27, 2014 at 12:31:08PM -0800, Ben Widawsky wrote:
> > The other issue is the existing method doesn't rely as much on proper
> > request handling, ie. this could be more resilient to driver bugs. I
>
On Mon, Jan 27, 2014 at 01:45:22PM +, Chris Wilson wrote:
> On Sun, Jan 26, 2014 at 01:47:29PM -0800, Ben Widawsky wrote:
> > 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 Mon, Jan 27, 2014 at 01:45:22PM +, Chris Wilson wrote:
> On Sun, Jan 26, 2014 at 01:47:29PM -0800, Ben Widawsky wrote:
> > 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 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:
> > >
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
> > Signed-off-by: Ben Widawsky
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 7 ++
> > drivers/g
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
> >
; On Sun, Jan 26, 2014 at 6:49 AM, Ben Widawsky 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
vinced the new mechanism works.
However, the patch looks functionally correct to me, so I'll leave the
decision up to Daniel.
Reviewed-by: Ben Widawsky
> Signed-off-by: Mika Kuoppala
> ---
> drivers/gpu/drm/i915/i915_gem.c | 87
> ++-
> 1
ot;stuck" : "no progress",
>ring->name);
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h
> b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 71a73f4..6018793 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/
(struct intel_ring_buffer *ring,
> vma->bind_vma(vma, to->obj->cache_level, GLOBAL_BIND);
> }
>
> - if (!to->is_initialized || is_default_context(to))
> + if (!to->is_initialized || i915_gem_context_is_default(to))
> hw_flags |= MI_RESTORE_INHIBIT;
>
> ret = mi_set_context(ring, to, hw_flags);
> --
> 1.7.9.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
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
>
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
>
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
> >&
Cc: Chris Wilson
Signed-off-by: Ben Widawsky
---
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/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
have 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
Date: Fri Dec 6 14:10:54 20
Reviewed-by: Ben Widawsky
---
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/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index
From: Chris Wilson
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
Reviewed-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_gem.c | 2 +-
1 file changed, 1 insertion(+), 1
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
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
1 file changed, 1 insertion(+)
diff --git a
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
>
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
---
drivers/gpu/drm/i915/i915_gem.c | 2 ++
1 file changed, 2 insertions(+)
diff
5d c3 8d b6 00 00 00 00 <0f>
> 0b 8d b6 00 00 00 00 55 89 e5 57 56 53 83 ec 64 3e 8d 74 26
> [ 161.003586] EIP: [] i915_gem_object_ggtt_unpin+0x88/0x90 [i915]
> SS:ESP 0068:dbe0fe0c
>
> Reported-by: Jesse Barnes
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73985
This statenment became false here:
commit 4fc688ce79772496503d22263d61b071a8fb596e
Author: Jesse Barnes
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
---
drivers/gpu/drm/i915/i915_drv.h | 2
ason).
v2: 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
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/Makefile | 2 +-
drivers/gp
The debugfs helper duplicates the functionality used by Armada, so let's
just use that.
Signed-off-by: Ben Widawsky
---
drivers/gpu/drm/i915/i915_debugfs.c | 25 -
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs
quested-by: Daniel Vetter
Signed-off-by: Ben Widawsky
---
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/drm/drm_debugfs.c
ind
is targeted for a new file, so there is no
reason to move it.
Signed-off-by: Ben Widawsky
---
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/drivers/gpu/drm/i915
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 wrote:
> > > > On
t;> 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,
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
> > +#include
> > +#include
> > +#include
> > +#include
> > +#if 0
> > +#include
> > +#include
901 - 1000 of 3830 matches
Mail list logo
