[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 9d1a455b0ca1 ("") from Linus' tree and commit 965e0c489f36 ("drm/i915: introduce pipe_config->dither|pipe_bpp") from the drm-intel tree. I fixed it up (see below) and can carry

Re: [Intel-gfx] [PATCH] drm/i915: implement ibx_hpd_irq_setup

On Fri, Mar 29, 2013 at 5:35 PM, Egbert Eich wrote: > Daniel Vetter writes: > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > b/drivers/gpu/drm/i915/i915_irq.c > > index 43436e0..1279a44 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -2084,

Re: [Intel-gfx] [PATCH i-g-t 3/5] tests: Use IGT_SIMULATION to tune the list of tests to run

> On Tue, Mar 26, 2013 at 10:00:23AM -0700, Ben Widawsky wrote: > > On Tue, Mar 26, 2013 at 04:38:58PM +0100, Daniel Vetter wrote: > > > On Tue, Mar 26, 2013 at 03:24:37PM +, Damien Lespiau wrote: > > > > There are two ways to run tests, directly with make check/test or > > > > through piglit.