Re: [Intel-gfx] [PATCH 4/6] drm/i915: don't memset the fb buffer if preallocated

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:17:07PM -0800, Jesse Barnes wrote: > On Sat, 14 Dec 2013 12:28:49 +0100 > Daniel Vetter wrote: > > > On Thu, Dec 12, 2013 at 12:41:55PM -0800, Jesse Barnes wrote: > > > We want to preserve the BIOS/bootloader contents for later. > > > > > > Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Handle failure to kick out a conflicting fb driver

2013-12-16 Thread Jani Nikula
On Mon, 16 Dec 2013, Chris Wilson wrote: > Signed-off-by: Chris Wilson Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_dma.c | 21 +++-- > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_d

Re: [Intel-gfx] [PATCH 1/2] video/fb: Propagate error code from failing to unregister conflicting fb

2013-12-16 Thread Jani Nikula
On Mon, 16 Dec 2013, Chris Wilson wrote: > If we fail to remove a conflicting fb driver, we need to abort the > loading of the second driver to avoid likely kernel panics. > > Signed-off-by: Chris Wilson > Cc: Jean-Christophe Plagniol-Villard > Cc: Tomi Valkeinen > Cc: linux-fb...@vger.kernel.o

Re: [Intel-gfx] [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled

2013-12-16 Thread Jani Nikula
On Mon, 16 Dec 2013, Daniel Vetter wrote: > Otherwise we don't kick out firmware framebuffers like vesafb and > efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y. > > There's still the pesky issue with vgacon which we should somehow > replace with the dummy console at least. We have a similar iss

[Intel-gfx] [PATCH 1/5] drm/i915: Adding VBT fields to support eDP DRRS feature

2013-12-16 Thread Vandana Kannan
From: Pradeep Bhat This patch reads the DRRS support and Mode type from VBT fields. The read information will be stored in VBT struct during BIOS parsing. The above functionality is needed for decision making whether DRRS feature is supported in i915 driver for eDP panels. This information helps

[Intel-gfx] [PATCH 2/5] drm/i915: Parse EDID probed modes for DRRS support

2013-12-16 Thread Vandana Kannan
From: Pradeep Bhat This patch and finds out the lowest refresh rate supported for the resolution same as the fixed_mode, based on the implementaion find_panel_downclock. It also checks the VBT fields to see if panel supports seamless DRRS or not. Based on above data it marks whether eDP panel sup

[Intel-gfx] [PATCH 5/5] drm/i915/bdw: Add support for DRRS to switch RR

2013-12-16 Thread Vandana Kannan
For Broadwell, there is one instance of Transcoder MN values per transcoder. For dynamic switching between multiple refreshr rates, M/N values may be reprogrammed on the fly. Link N programming triggers update of all data and link M & N registers and the new M/N values will be used in the next fram

[Intel-gfx] [PATCH 4/5] drm/i915: Idleness detection for DRRS

2013-12-16 Thread Vandana Kannan
Adding support to detect display idleness by tracking page flip from user space. Switch to low refresh rate is triggered after 2 seconds of idleness. The delay is configurable. If there is a page flip or call to update the plane, then high refresh rate is applied. The feature is not used in dual-di

[Intel-gfx] [PATCH 0/5] Enabling DRRS support in the kernel

2013-12-16 Thread Vandana Kannan
Dynamic Refresh Rate Switching (DRRS) is a power conservation feature which enables switching between low and high refresh rates based on the usage scenario. This feature is applicable for internal eDP panel. Indication that the panel can support DRRS is given by the panel EDID, w

[Intel-gfx] [PATCH 3/5] drm/i915: Add support for DRRS to switch RR

2013-12-16 Thread Vandana Kannan
From: Pradeep Bhat This patch computes and stored 2nd M/N/TU for switching to different refresh rate dynamically. PIPECONF_EDP_RR_MODE_SWITCH bit helps toggle between alternate refresh rates programmed in 2nd M/N/TU registers. Signed-off-by: Pradeep Bhat Signed-off-by: Vandana Kannan --- driv

[Intel-gfx] [PATCH 14/15] drm/i915: unleash semaphores on gen8

2013-12-16 Thread Ben Widawsky
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/i91

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

2013-12-16 Thread Ben Widawsky
Semaphore signalling works similarly to previous GENs with the exception that the per ring mailboxes no longer exist. Instead you must define your own space, somewhere in the GTT. The comments in the code define the layout I've opted for, which should be fairly future proof. Ie. I tried to define

[Intel-gfx] [PATCH 03/15] drm/i915: Move semaphore specific ring members to struct

2013-12-16 Thread Ben Widawsky
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 ++

[Intel-gfx] [PATCH 15/15] drm/i915: semaphore debugfs

2013-12-16 Thread Ben Widawsky
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 --- drive

[Intel-gfx] [PATCH 05/15] drm/i915: Move ring_begin to signal()

2013-12-16 Thread Ben Widawsky
Add_request has always contained both the semaphore mailbox updates as well as the breadcrumb writes. Since the semaphore signal is the one which actually knows about the number of dwords it needs to emit to the ring, we move the ring_begin to that function. This allows us to remove the hideously s

[Intel-gfx] [PATCH 13/15] drm/i915/bdw: collect semaphore error state

2013-12-16 Thread Ben Widawsky
Since the semaphore information is in an object, just dump it, and let the user parse it later. NOTE: The page being used for the semaphores are incoherent with the CPU. No matter what I do, I cannot figure out a way to read anything but 0s. Note that the semaphore waits are indeed working. v2: D

[Intel-gfx] [PATCH 10/15] drm/i915: FORCE_RESTORE for gen8 semaphores

2013-12-16 Thread Ben Widawsky
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 e08acab..a14a3b3 100644 --- a/d

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

2013-12-16 Thread Ben Widawsky
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 a577640..ebdc8a7 100644 --- a/drivers/gp

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

2013-12-16 Thread Ben Widawsky
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 cf20140..66f6e1c 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/

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

2013-12-16 Thread Ben Widawsky
Reposting this as a new series since two of the patches dropped off since last time. Functionally it's the same as before. Like before, the patch "drm/i915: unleash semaphores on gen8" should probably not be merged as it's not 100% clear where the hang is currently coming from. Everything else sho

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

2013-12-16 Thread Ben Widawsky
Gen8 has already had some differentiation with how it handles rings. Semaphores bring yet more differences, and now is as good a time as any to do the split. Also, since gen8 doesn't actually use semaphores up until this point, put the proper "NULL" values in for the mbox info. v2: v1 had a stale

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

2013-12-16 Thread Ben Widawsky
Semaphore waits use a new instruction, MI_SEMAPHORE_WAIT. The seqno to wait on is all well defined by the table in the previous patch. There is nothing else different from previous GEN's semaphore synchronization code. v2: Update macros to not require the other ring's ring->id (Chris) Signed-off-

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

2013-12-16 Thread Ben Widawsky
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 to emit for semaphore signalling. This was not possible (easily) previously. There should be no functional impact, simply fewer instructions emitted. Whi

[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 --- drivers/gpu/drm/i915/i915_reg.h | 52 - 1 file changed, 26 insertions(+), 26 deletions(-) diff --gi

[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 --- drivers/gpu/drm/i915/intel_

[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 Widaws

[Intel-gfx] [PATCH 6/8] drm/i915: Wrap the preallocated BIOS framebuffer and preserve for KMS fbcon v7

2013-12-16 Thread Jesse Barnes
Retrieve current framebuffer config info from the regs and create an fb object for the buffer the BIOS or boot loader left us. This should allow for smooth transitions to userspace apps once we finish the initial configuration construction. v2: check for non-native modes and adjust (Jesse) fi

[Intel-gfx] [PATCH 1/8] drm/i915: unconditionally copy mode into crtc at boot time

2013-12-16 Thread Jesse Barnes
The BIOS code will need this to properly inherit the mode. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index af3717a..1ae3d44

[Intel-gfx] [PATCH 5/8] drm/i915: retrieve current fb config into new plane_config structure at init v7

2013-12-16 Thread Jesse Barnes
Read out the current plane configuration at init time into a new plane_config structure. This allows us to track any existing framebuffers attached to the plane and potentially re-use them in our fbdev code for a smooth handoff. v2: update for new pitch_for_width function (Jesse) comment how

[Intel-gfx] [PATCH 4/8] drm/i915: read out hw state earlier

2013-12-16 Thread Jesse Barnes
We want to do this early on before we try to fetch the plane config, which depends on some of the pipe config state. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_disp

[Intel-gfx] [PATCH 8/8] drm/i915: inform drm_fb_helper if we abandoned a connected output v2

2013-12-16 Thread Jesse Barnes
Otherwise subsequent fb activity will try to do blank/unblank on outputs that were never fully enabled. v2: drop unnecessary enabled[] modifications in failure cases (Chris) Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_fbdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dr

[Intel-gfx] [PATCH 7/8] drm/i915: don't memset the fb buffer if preallocated

2013-12-16 Thread Jesse Barnes
We want to preserve the BIOS/bootloader contents for later. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_fbdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index db75f22..53675d2 10

[Intel-gfx] [PATCH 2/8] drm/i915/vlv: add early DPIO init v3

2013-12-16 Thread Jesse Barnes
Just add an early init since we may need to access DPIO regs early on. The init call in modeset_init_hw is also needed for the resume case, when we need to reset DPIO to keep things happy. v2: split reset and reg init v3: split patches (Daniel) Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i9

[Intel-gfx] [PATCH 3/8] drm/i915/vlv: split DPIO init and reset

2013-12-16 Thread Jesse Barnes
We only need to init the reg offset for DPIO once, but we need to reset DPIO at resume time and at init time. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c

Re: [Intel-gfx] [PATCH 1/6] drm/i915: unconditionally copy mode into crtc at boot time

2013-12-16 Thread Jesse Barnes
On Thu, 12 Dec 2013 14:44:33 -0800 Jesse Barnes wrote: > On Thu, 12 Dec 2013 23:39:39 +0100 > Daniel Vetter wrote: > > > On Thu, Dec 12, 2013 at 01:29:39PM -0800, Jesse Barnes wrote: > > > On Thu, 12 Dec 2013 22:21:29 +0100 > > > Daniel Vetter wrote: > > > > > > > On Thu, Dec 12, 2013 at 12:4

Re: [Intel-gfx] [PATCH 6/6] drm/i915: inform drm_fb_helper if we abandoned a connected output

2013-12-16 Thread Jesse Barnes
On Thu, 12 Dec 2013 22:30:41 + Chris Wilson wrote: > On Thu, Dec 12, 2013 at 12:41:57PM -0800, Jesse Barnes wrote: > > Otherwise subsequent fb activity will try to do blank/unblank on outputs > > that were never fully enabled. > > Hmm, actually this highlights a bug in drm_setup_crtcs() that

Re: [Intel-gfx] [PATCH 4/6] drm/i915: don't memset the fb buffer if preallocated

2013-12-16 Thread Jesse Barnes
On Sat, 14 Dec 2013 12:28:49 +0100 Daniel Vetter wrote: > On Thu, Dec 12, 2013 at 12:41:55PM -0800, Jesse Barnes wrote: > > We want to preserve the BIOS/bootloader contents for later. > > > > Signed-off-by: Jesse Barnes > > --- > > drivers/gpu/drm/i915/intel_fbdev.c | 4 +++- > > 1 file change

Re: [Intel-gfx] [PATCH 5/6] drm/i915/vlv: move DPIO init earlier v2

2013-12-16 Thread Jesse Barnes
On Sat, 14 Dec 2013 11:47:36 +0100 Daniel Vetter wrote: > On Thu, Dec 12, 2013 at 12:41:56PM -0800, Jesse Barnes wrote: > > It's needed for early mode state readout, which is in turn needed to > > inherit the BIOS config. So split out the reset, which we need on > > resume too, from the DPIO reg

Re: [Intel-gfx] [PATCH 2/6] drm/i915: retrieve current fb config into new plane_config structure at init

2013-12-16 Thread Jesse Barnes
On Sat, 14 Dec 2013 12:01:47 +0100 Daniel Vetter wrote: > But I still think the fb lifetime management is a bit broken here and we > need a few small changes: > > 1. Right here in this loop we need to assign the fb from the plane_config > ot the crtc->fb pointer and grab an fb reference for that.

Re: [Intel-gfx] [PATCH 11/14] drm/i915: Move ILK/SNB/IVB over to the HSW WM code

2013-12-16 Thread Imre Deak
On Thu, 2013-12-05 at 15:51 +0200, ville.syrj...@linux.intel.com wrote: > From: Ville Syrjälä > > The new HSW watermark code can now handle ILK/SNB/IVB as well, so > switch them over. Kill the old code. > > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > d

Re: [Intel-gfx] [PATCH 06/14] drm/i915: Fix LP1+ watermark disabling ILK

2013-12-16 Thread Imre Deak
On Thu, 2013-12-05 at 15:51 +0200, ville.syrj...@linux.intel.com wrote: > From: Ville Syrjälä > > On ILK disabling LP1+ watermarks must be done carefully to avoid > underruns. If we just write 0 to the register in the middle of the scan > cycle we often get an underrun. So instead we have to leav

Re: [Intel-gfx] [PATCH 04/14] Revert "drm/i915/sprite: Always enable the scaler on IronLake"

2013-12-16 Thread Imre Deak
On Thu, 2013-12-05 at 15:51 +0200, ville.syrj...@linux.intel.com wrote: > From: Ville Syrjälä > > Apparently always enabling the sprite scaler magically made > sprites work on ILK in the past. > > I think the real reason for the failure was missing sprite > watermark programming, and enabling th

Re: [Intel-gfx] [PATCH 00/14] drm/i915: Make ILK/SNB/IVB use HSW watermark code

2013-12-16 Thread Imre Deak
On Thu, 2013-12-05 at 15:51 +0200, ville.syrj...@linux.intel.com wrote: > Back on the watermark horse. This series moves ILK/SNB/IVB over to the HSW > watermark code. > > This series still has some underrun issues since the safe watermark > update mechanism is yet to be introduced. However it shou

Re: [Intel-gfx] [RFC 00/13] TDR and Watchdog Reset

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:20PM +, Lister, Ian wrote: > This patchset contains TDR and Watchdog reset against a 3.13 > drm-intel-nightly tree that is now about 2 weeks old. > > I have re-worked the TDR and Watchdog Reset features to integrate > them more closely with the existing TDR and sc

Re: [Intel-gfx] [PATCH] RFC hax: drm/i915: Kick out vga console

2013-12-16 Thread Paulo Zanoni
2013/12/16 Daniel Vetter : > On Mon, Dec 16, 2013 at 05:19:25PM +, Chris Wilson wrote: >> Touching the VGA resources on an IVB EFI machine causes hard hangs when >> we then kick out the efifb. Ouch. Please take a look at arch/x86/kernel/setup.c, at the end of function setup_arch: #ifdef CONFI

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

2013-12-16 Thread Chris Wilson
On Mon, Dec 16, 2013 at 12:01:07PM +, Chris Wilson wrote: > If i915_driver_load fails before i915_gem_load we try to unlink the ggtt > prior to initialising the list and triggering an oops. This is incomplete. > Signed-off-by: Chris Wilson > --- > drivers/gpu/drm/i915/i915_dma.c | 2 +- >

Re: [Intel-gfx] [PATCH] RFC hax: drm/i915: Kick out vga console

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 05:19:25PM +, Chris Wilson wrote: > Touching the VGA resources on an IVB EFI machine causes hard hangs when > we then kick out the efifb. Ouch. > > Signed-off-by: Chris Wilson Like I've said on irc I think we want a select DUMMY_CONSOLE here, at least if none of the c

Re: [Intel-gfx] [RFC 13/13] drm/i915: Exec buffer inserts watchdog commands

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:03:52PM +, Lister, Ian wrote: > From f71a7de85e9d81be3aa3962c8fe2557235ff21c1 Mon Sep 17 00:00:00 2001 > Message-Id: > > In-Reply-To: > References: > From: ian-lister > Date: Wed, 11 Dec 2013 11:25:44 + > Subject: [RFC 13/13] drm/i915: Exec buffer inserts wat

Re: [Intel-gfx] [RFC 11/13] drm/i915: Added watchdog interrupt handling

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:03:34PM +, Lister, Ian wrote: > From 65c61c6e71f8d01840eef1e373e91bf8849b978d Mon Sep 17 00:00:00 2001 > Message-Id: > <65c61c6e71f8d01840eef1e373e91bf8849b978d.1387201899.git.ian.lis...@intel.com> > In-Reply-To: > References: > From: ian-lister > Date: Tue, 10 De

Re: [Intel-gfx] [RFC 09/13] drm/i915: Watchdog timer support functions

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:03:24PM +, Lister, Ian wrote: > From f49cbb9fd7131e49414a15c9041195d089411973 Mon Sep 17 00:00:00 2001 > Message-Id: > > In-Reply-To: > References: > From: ian-lister > Date: Tue, 10 Dec 2013 16:37:12 + > Subject: [RFC 09/13] drm/i915: Watchdog timer support

Re: [Intel-gfx] [RFC 08/13] drm/i915: TDR loose ends

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:03:18PM +, Lister, Ian wrote: > From b6c143ee1f0b65053186be2602f876cc4fd944ab Mon Sep 17 00:00:00 2001 > Message-Id: > > In-Reply-To: > References: > From: ian-lister > Date: Tue, 10 Dec 2013 15:01:55 + > Subject: [RFC 08/13] drm/i915: TDR loose ends > > Add

Re: [Intel-gfx] [RFC 06/13] drm/i915: Communicating reset requests

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:03:03PM +, Lister, Ian wrote: > From 0f1092b19d66cfe803b22f9e982c5e5be5a5ff23 Mon Sep 17 00:00:00 2001 > Message-Id: > <0f1092b19d66cfe803b22f9e982c5e5be5a5ff23.1387201899.git.ian.lis...@intel.com> > In-Reply-To: > References: > From: ian-lister > Date: Tue, 10 De

Re: [Intel-gfx] [RFC 05/13] drm/i915: Per-engine recovery

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:55PM +, Lister, Ian wrote: > From de7ad64c6b112e2950b31fc6daa52dc6247f11cb Mon Sep 17 00:00:00 2001 > Message-Id: > > In-Reply-To: > References: > From: ian-lister > Date: Mon, 9 Dec 2013 13:59:53 + > Subject: [RFC 05/13] drm/i915: Per-engine recovery > >

Re: [Intel-gfx] [RFC 04/13] drm/i915: Force wake restore for TDR

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:49PM +, Lister, Ian wrote: > From 698fdaf8a85fb7039dacdff3068be2018a486816 Mon Sep 17 00:00:00 2001 > Message-Id: > <698fdaf8a85fb7039dacdff3068be2018a486816.1387201899.git.ian.lis...@intel.com> > In-Reply-To: > References: > From: ian-lister > Date: Mon, 9 Dec

Re: [Intel-gfx] [RFC 03/13] drm/i915: Additional ring operations for TDR

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:41PM +, Lister, Ian wrote: > From 6efa3d541d49006564371377819974708dab58d0 Mon Sep 17 00:00:00 2001 > Message-Id: > <6efa3d541d49006564371377819974708dab58d0.1387201899.git.ian.lis...@intel.com> > In-Reply-To: > References: > From: ian-lister > Date: Fri, 6 Dec

[Intel-gfx] [PATCH] RFC hax: drm/i915: Kick out vga console

2013-12-16 Thread Chris Wilson
Touching the VGA resources on an IVB EFI machine causes hard hangs when we then kick out the efifb. Ouch. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_dma.c | 29 + drivers/video/console/dummycon.c | 1 + 2 files changed, 30 insertions(+) diff --git a/

Re: [Intel-gfx] [RFC 02/13] drm/i915: Improved hang detection logic

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:34PM +, Lister, Ian wrote: > From 53c34924274048bed18364ba71b83b2c8fcabe9b Mon Sep 17 00:00:00 2001 > Message-Id: > <53c34924274048bed18364ba71b83b2c8fcabe9b.1387201899.git.ian.lis...@intel.com> > In-Reply-To: > References: > From: ian-lister > Date: Thu, 5 Dec

Re: [Intel-gfx] [RFC 01/13] drm/i915: Periodic sampling for hang detection

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:23PM +, Lister, Ian wrote: > From c3b6469bd01017a121a52f02453a41b2fd8bc424 Mon Sep 17 00:00:00 2001 > Message-Id: > > In-Reply-To: > References: > From: ian-lister > Date: Wed, 4 Dec 2013 17:13:46 + > Subject: [RFC 01/13] drm/i915: Periodic sampling for ha

Re: [Intel-gfx] [RFC 00/13] TDR and Watchdog Reset

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 04:02:20PM +, Lister, Ian wrote: > This patchset contains TDR and Watchdog reset against a 3.13 > drm-intel-nightly tree that is now about 2 weeks old. > > I have re-worked the TDR and Watchdog Reset features to integrate > them more closely with the existing TDR and sc

[Intel-gfx] [RFC 13/13] drm/i915: Exec buffer inserts watchdog commands

2013-12-16 Thread Lister, Ian
>From f71a7de85e9d81be3aa3962c8fe2557235ff21c1 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Wed, 11 Dec 2013 11:25:44 + Subject: [RFC 13/13] drm/i915: Exec buffer inserts watchdog commands A start timer command is inserted before the batch buffer st

[Intel-gfx] [RFC 11/13] drm/i915: Added watchdog interrupt handling

2013-12-16 Thread Lister, Ian
>From 65c61c6e71f8d01840eef1e373e91bf8849b978d Mon Sep 17 00:00:00 2001 Message-Id: <65c61c6e71f8d01840eef1e373e91bf8849b978d.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 17:08:47 + Subject: [RFC 11/13] drm/i915: Added watchdog interr

[Intel-gfx] [RFC 08/13] drm/i915: TDR loose ends

2013-12-16 Thread Lister, Ian
>From b6c143ee1f0b65053186be2602f876cc4fd944ab Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 15:01:55 + Subject: [RFC 08/13] drm/i915: TDR loose ends Added check for HANGCHECK_IDLE in i915_set_reset_status as a request should not be

[Intel-gfx] [RFC 04/13] drm/i915: Force wake restore for TDR

2013-12-16 Thread Lister, Ian
>From 698fdaf8a85fb7039dacdff3068be2018a486816 Mon Sep 17 00:00:00 2001 Message-Id: <698fdaf8a85fb7039dacdff3068be2018a486816.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Mon, 9 Dec 2013 09:47:20 + Subject: [RFC 04/13] drm/i915: Force wake restore for

[Intel-gfx] [RFC 12/13] drm/i915: Enabled watchdog timer interrupts

2013-12-16 Thread Lister, Ian
>From ff920051053d564177639a92e50240116e837a48 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Wed, 11 Dec 2013 10:47:10 + Subject: [RFC 12/13] drm/i915: Enabled watchdog timer interrupts Enables the counter timeout interrupts for the render and video

[Intel-gfx] [RFC 09/13] drm/i915: Watchdog timer support functions

2013-12-16 Thread Lister, Ian
>From f49cbb9fd7131e49414a15c9041195d089411973 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 16:37:12 + Subject: [RFC 09/13] drm/i915: Watchdog timer support functions This is part of a series of patches to enable watchdog support. T

[Intel-gfx] [RFC 10/13] drm/i915: MI_LOAD_REGISTER_IMM fix

2013-12-16 Thread Lister, Ian
>From 8f392d11c51beb66e01a63af33d90cb0bf01eda4 Mon Sep 17 00:00:00 2001 Message-Id: <8f392d11c51beb66e01a63af33d90cb0bf01eda4.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 16:46:51 + Subject: [RFC 10/13] drm/i915: MI_LOAD_REGISTER_IMM

[Intel-gfx] [RFC 05/13] drm/i915: Per-engine recovery

2013-12-16 Thread Lister, Ian
>From de7ad64c6b112e2950b31fc6daa52dc6247f11cb Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Mon, 9 Dec 2013 13:59:53 + Subject: [RFC 05/13] drm/i915: Per-engine recovery Added i915_handle_hung_ring function. This function will be called when a hang

[Intel-gfx] [RFC 01/13] drm/i915: Periodic sampling for hang detection

2013-12-16 Thread Lister, Ian
>From c3b6469bd01017a121a52f02453a41b2fd8bc424 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Wed, 4 Dec 2013 17:13:46 + Subject: [RFC 01/13] drm/i915: Periodic sampling for hang detection Convert the hang detection logic to sample the rings periodica

[Intel-gfx] [RFC 06/13] drm/i915: Communicating reset requests

2013-12-16 Thread Lister, Ian
>From 0f1092b19d66cfe803b22f9e982c5e5be5a5ff23 Mon Sep 17 00:00:00 2001 Message-Id: <0f1092b19d66cfe803b22f9e982c5e5be5a5ff23.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 11:53:25 + Subject: [RFC 06/13] drm/i915: Communicating reset r

[Intel-gfx] [RFC 07/13] drm/i915: Additional debug for TDR

2013-12-16 Thread Lister, Ian
>From d9e59b16738684ccbc8a82db5b46ab6c0daf507e Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: ian-lister Date: Tue, 10 Dec 2013 14:56:06 + Subject: [RFC 07/13] drm/i915: Additional debug for TDR Additional debug in i915_request_guilty and gen6_do_reset. Signed-off-by

[Intel-gfx] [RFC 00/13] TDR and Watchdog Reset

2013-12-16 Thread Lister, Ian
This patchset contains TDR and Watchdog reset against a 3.13 drm-intel-nightly tree that is now about 2 weeks old. I have re-worked the TDR and Watchdog Reset features to integrate them more closely with the existing TDR and scoring mechanism. This is still a work-in-progress and I am currently d

[Intel-gfx] [RFC 03/13] drm/i915: Additional ring operations for TDR

2013-12-16 Thread Lister, Ian
>From 6efa3d541d49006564371377819974708dab58d0 Mon Sep 17 00:00:00 2001 Message-Id: <6efa3d541d49006564371377819974708dab58d0.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Fri, 6 Dec 2013 16:09:58 + Subject: [RFC 03/13] drm/i915: Additional ring operat

[Intel-gfx] [RFC 02/13] drm/i915: Improved hang detection logic

2013-12-16 Thread Lister, Ian
>From 53c34924274048bed18364ba71b83b2c8fcabe9b Mon Sep 17 00:00:00 2001 Message-Id: <53c34924274048bed18364ba71b83b2c8fcabe9b.1387201899.git.ian.lis...@intel.com> In-Reply-To: References: From: ian-lister Date: Thu, 5 Dec 2013 15:52:37 + Subject: [RFC 02/13] drm/i915: Improved hang detectio

[Intel-gfx] [PATCH 1/2] drm/i915: Propagate PCI read/write errors during vga_set_state()

2013-12-16 Thread Chris Wilson
This has very little effect other than log the errors in case of failure, and we then hope for the best. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b

[Intel-gfx] [PATCH 2/2] drm/i915: Short-circuit no-op vga_set_state()

2013-12-16 Thread Chris Wilson
Touching the VGA registers risks a hard machine hang, at least on this ivb machine after removing a conflicting efifb. This is more than likely related to the discovery that VGA IO decode on the more recent PCH platforms is terminally broken. Signed-off-by: Chris Wilson Cc: Ville Syrjälä --- dr

[Intel-gfx] [PATCH 2/2] drm/i915: Handle failure to kick out a conflicting fb driver

2013-12-16 Thread Chris Wilson
Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_dma.c | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6364c503f97d..6de3a43e3acf 100644 --- a/drivers/gpu/drm/i915/i915_dma.

[Intel-gfx] [PATCH 1/2] video/fb: Propagate error code from failing to unregister conflicting fb

2013-12-16 Thread Chris Wilson
If we fail to remove a conflicting fb driver, we need to abort the loading of the second driver to avoid likely kernel panics. Signed-off-by: Chris Wilson Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fb...@vger.kernel.org Cc: dri-de...@lists.freedesktop.org --- drivers/vid

Re: [Intel-gfx] [PATCH] drm/i915: only build i915_debugfs.c when CONFIG_DEBUG_FS is enabled

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 01:10:36PM +0200, Jani Nikula wrote: > The whole file is wrapped around in #if defined(CONFIG_DEBUG_FS) anyway, > so skip the file at the build level already. > > Signed-off-by: Jani Nikula Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/Make

[Intel-gfx] [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled

2013-12-16 Thread Daniel Vetter
Otherwise we don't kick out firmware framebuffers like vesafb and efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y. There's still the pesky issue with vgacon which we should somehow replace with the dummy console at least. We have a similar issue at module un/reload, since vgacon state is termin

[Intel-gfx] [PATCH igt] intel_error_decode: Factor out common decoding code

2013-12-16 Thread Damien Lespiau
4 pieces of code were looking very similar. Let's factor out a common function in the not so unlikely case we need to tweak that code. Signed-off-by: Damien Lespiau --- tools/intel_error_decode.c | 52 +++--- 1 file changed, 21 insertions(+), 31 deletions(

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

2013-12-16 Thread Chris Wilson
If i915_driver_load fails before i915_gem_load we try to unlink the ggtt prior to initialising the list and triggering an oops. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/dr

[Intel-gfx] [PATCH] drm/i915: only build i915_debugfs.c when CONFIG_DEBUG_FS is enabled

2013-12-16 Thread Jani Nikula
The whole file is wrapped around in #if defined(CONFIG_DEBUG_FS) anyway, so skip the file at the build level already. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/Makefile |3 ++- drivers/gpu/drm/i915/i915_debugfs.c |4 2 files changed, 2 insertions(+), 5 deletions(-)

Re: [Intel-gfx] [PATCH -next] drm/i915: fix return value check of debugfs_create_file()

2013-12-16 Thread Damien Lespiau
On Mon, Dec 16, 2013 at 02:13:25PM +0800, Wei Yongjun wrote: > From: Wei Yongjun > > In case of error, the function debugfs_create_file() returns NULL > pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test in > the return value check should be replaced with NULL test. > > Signed-off-by

Re: [Intel-gfx] Generate raw batches for unit testing the decoder

2013-12-16 Thread Damien Lespiau
On Fri, Dec 13, 2013 at 06:15:45PM +, Damien Lespiau wrote: > libdrm has a way to unit-test the CS decoder: test_decode can decode a raw > batch and compare it to a reference output. > > However, one still needs to genarate the raw, binary, batches to feed to > test_decode. This couple of patc

Re: [Intel-gfx] [PATCH -next] drm/i915: fix return value check of debugfs_create_file()

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 02:13:25PM +0800, Wei Yongjun wrote: > From: Wei Yongjun > > In case of error, the function debugfs_create_file() returns NULL > pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test in > the return value check should be replaced with NULL test. > > Signed-off-by

Re: [Intel-gfx] [PATCH] build: Create version and config information files in Android

2013-12-16 Thread Daniel Vetter
On Mon, Dec 16, 2013 at 10:16 AM, Mateo Lozano, Oscar wrote: >> Oops, we seem to be pretty bad at breaking the Android build :( > > Or very good, depends on how you look at it :) > > It´s my bad: preparing our Jenkins to automatically compile-test i-g-t after > every check-in is in my backlog, bu

Re: [Intel-gfx] [PATCH] build: Create version and config information files in Android

2013-12-16 Thread Mateo Lozano, Oscar
> Oops, we seem to be pretty bad at breaking the Android build :( Or very good, depends on how you look at it :) It´s my bad: preparing our Jenkins to automatically compile-test i-g-t after every check-in is in my backlog, but I have no bandwidth at the moment. I´ll try to give it a go after t

Re: [Intel-gfx] [PATCH 2/5] drm/i915: parse backlight modulation frequency from the BIOS VBT

2013-12-16 Thread Daniel Vetter
On Sat, Dec 14, 2013 at 08:38:29PM -0200, Rodrigo Vivi wrote: > From: Jani Nikula > > We don't actually do anything with the information yet, but parse and > log what's in the VBT. > > Signed-off-by: Jani Nikula > Signed-off-by: Rodrigo Vivi > Reviewed-by: Rodrigo Vivi Queued for -next, than