Re: [git pull] drm main pull for 3.4-rc1

2012-03-29 Thread Daniel Vetter
On Wed, Mar 28, 2012 at 09:55:09AM +0100, Tony Vroon wrote:
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 On 27/03/12 21:39, Daniel Vetter wrote:
  Yet another thing to try: Can you append intel_iommu=igfx_off to
  your kernel cmdline? If you can, try this both on mainline kernels
  and with my additional patches.
 
 To confirm, intel_iommu=igfx_off is stable on both mainline and your
 for-chainsaw branch with additional SNB patching.
 
 With ppgtt and the iommu fully enabled, your SNB patches remove the
 DMAR warnings but do not address the stability problem, in that it
 still crashes in the same way.

Quick check on the things we've talked about yesterday on irc: Is the
for-chainsaw branch plus intel_iommu=igfx_off now stable for you? Or has
it again crashed after a few hours like intel_iommu=igfx_off did on the
mainline kernel?

Thanks a lot for your testing.

Yours, Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-29 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 29/03/12 13:39, Daniel Vetter wrote:
 Is the for-chainsaw branch plus intel_iommu=igfx_off now stable for
 you?

It appears to crash when I shut my machine down, but has otherwise
behaved quite well.

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk90WQEACgkQp5vW4rUFj5ojrACgiiaeq6oouCuu2pkvP64011Ca
v7AAoL90ygIhuuFNLF92cI+wsr3FmwGI
=uMQt
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-28 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 27/03/12 21:39, Daniel Vetter wrote:
 Yet another thing to try: Can you append intel_iommu=igfx_off to
 your kernel cmdline? If you can, try this both on mainline kernels
 and with my additional patches.

To confirm, intel_iommu=igfx_off is stable on both mainline and your
for-chainsaw branch with additional SNB patching.

With ppgtt and the iommu fully enabled, your SNB patches remove the
DMAR warnings but do not address the stability problem, in that it
still crashes in the same way.

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9y0e0ACgkQp5vW4rUFj5oTbgCfdY38BXScIWfvEuwdyQr4nwvK
aIMAn3QyLUiEAVxbm2HbufRi8UJXeUa7
=uPoe
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 26/03/12 15:32, Daniel Vetter wrote:
 Ok, this is ugly. Do you have any special module options for i915
 set (like i915_enable_rc6)?

None set:
adrastea ~ # cat /proc/cmdline
BOOT_IMAGE=3.3.0-04074-g53 rw root=0

 Also, can you check whether disabling vt-d does work around the
 issue?

Will try. More to follow shortly.

 Last but not least, can you please bisect where this regression got
 introduced so we have an idea why it breaks?

I do not know how to turn these 3.3.0-04074-g5375871 type indicators
into useful git bisect arguments.

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9wfwUACgkQp5vW4rUFj5pMjQCgoW9nayPhTCkLJZNuuhhpPZTK
Cy4An2GxAzqQN/1xSxF1Fsl/XX73O09d
=2eHw
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 26/03/12 15:32, Daniel Vetter wrote:
 Also, can you check whether disabling vt-d does work around the
 issue?

Yes, that does appear to stay operational for longer on:
Linux adrastea 3.3.0-06972-ge22057c #1 SMP PREEMPT Mon Mar 26 11:29:21
BST 2012 x86_64 Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz GenuineIntel
GNU/Linux

Obviously I would like to have x2apic and my IOMMU back...

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9wgNEACgkQp5vW4rUFj5rhHwCgpwcw0Ydx53CPBcsF1vdo8h1P
ffYAoJYL7RKv0hgc96ZKtFjP7v2V7iRZ
=J/HD
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Daniel Vetter
On Mon, Mar 26, 2012 at 03:36:53PM +0100, Tony Vroon wrote:
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 On 26/03/12 15:32, Daniel Vetter wrote:
  Ok, this is ugly. Do you have any special module options for i915
  set (like i915_enable_rc6)?
 
 None set:
 adrastea ~ # cat /proc/cmdline
 BOOT_IMAGE=3.3.0-04074-g53 rw root=0
 
  Also, can you check whether disabling vt-d does work around the
  issue?
 
 Will try. More to follow shortly.
 
  Last but not least, can you please bisect where this regression got
  introduced so we have an idea why it breaks?
 
 I do not know how to turn these 3.3.0-04074-g5375871 type indicators

If you replace 3.3.0 with v3.3.3 this is exactly what git can parse as a
commit ref. into useful git bisect arguments. Another thing for you to try
is booting with i915.i915_enable_ppgtt=0 (and vt-d enabled of course).

Yours, Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Daniel Vetter
On Mon, Mar 26, 2012 at 03:44:33PM +0100, Tony Vroon wrote:
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 On 26/03/12 15:32, Daniel Vetter wrote:
  Also, can you check whether disabling vt-d does work around the
  issue?
 
 Yes, that does appear to stay operational for longer on:
 Linux adrastea 3.3.0-06972-ge22057c #1 SMP PREEMPT Mon Mar 26 11:29:21
 BST 2012 x86_64 Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz GenuineIntel
 GNU/Linux
 
 Obviously I would like to have x2apic and my IOMMU back...

Can you try out the for-chainsaw branch from

git://people.freedesktop.org/~danvet/drm

Afaics it seems to help here on my snb with VT-d enabled. But that means
it'll still crash eventually with tons of DMAR fault message (like yours).
But compared to previous kernels it now doesn't insta-die for me. So no
high hopes, please, but it would be interesting to know how this fares for
you.

Meanwhile I'll be trying a few other funky tricks.
-Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Daniel Vetter
On Tue, Mar 27, 2012 at 09:31:24PM +0200, Daniel Vetter wrote:
 On Mon, Mar 26, 2012 at 03:44:33PM +0100, Tony Vroon wrote:
  -BEGIN PGP SIGNED MESSAGE-
  Hash: SHA1
  
  On 26/03/12 15:32, Daniel Vetter wrote:
   Also, can you check whether disabling vt-d does work around the
   issue?
  
  Yes, that does appear to stay operational for longer on:
  Linux adrastea 3.3.0-06972-ge22057c #1 SMP PREEMPT Mon Mar 26 11:29:21
  BST 2012 x86_64 Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz GenuineIntel
  GNU/Linux
  
  Obviously I would like to have x2apic and my IOMMU back...
 
 Can you try out the for-chainsaw branch from
 
 git://people.freedesktop.org/~danvet/drm
 
 Afaics it seems to help here on my snb with VT-d enabled. But that means
 it'll still crash eventually with tons of DMAR fault message (like yours).
 But compared to previous kernels it now doesn't insta-die for me. So no
 high hopes, please, but it would be interesting to know how this fares for
 you.
 
 Meanwhile I'll be trying a few other funky tricks.

Yet another thing to try: Can you append intel_iommu=igfx_off to your
kernel cmdline? If you can, try this both on mainline kernels and with my
additional patches.
-Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 27/03/12 11:01, Daniel Vetter wrote:
 Another thing for you to try is booting with
 i915.i915_enable_ppgtt=0 (and vt-d enabled of course).

That appears to be a winner:
adrastea ~ # uname -a
Linux adrastea 3.3.0-06972-ge22057c #1 SMP PREEMPT Tue Mar 27 11:06:46
BST 2012 x86_64 Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz GenuineIntel
GNU/Linux
adrastea ~ # cat /proc/cmdline
auto BOOT_IMAGE=3.3.0-06972-ge2 rw root=0 i915.i915_enable_ppgtt=0
adrastea ~ #

VT-d is enabled, as evidenced by DMAR entries:
adrastea ~ # cat /proc/interrupts
   CPU0   CPU1   CPU2   CPU3
  0:126  0  0  0  IR-IO-APIC-edge
 timer
  1:  8  0  0  0  IR-IO-APIC-edge
 i8042
  7:  1  0  0  0  IR-IO-APIC-edge
 parport0
  8: 32  0  0  0  IR-IO-APIC-edge
 rtc0
  9:113  0  0  0  IR-IO-APIC-fasteoi
 acpi
 12:291  0  0  0  IR-IO-APIC-edge
 i8042
 19: 35  0  0  0  IR-IO-APIC-fasteoi
 mmc0
 22:613  0  0  0  IR-IO-APIC-fasteoi
 ehci_hcd:usb2
 23:  16052  0  0  0  IR-IO-APIC-fasteoi
 ehci_hcd:usb1
 40:  0  0  0  0  DMAR_MSI-edge  dmar0
 41:  0  0  0  0  DMAR_MSI-edge  dmar1
 42:   1167  0  0  0  IR-PCI-MSI-edge
 i915
 43:   9622  0  0  0  IR-PCI-MSI-edge
 ahci
 44:   1536  0  0  0  IR-PCI-MSI-edge
 eth0
 45:   4577  0  0  0  IR-PCI-MSI-edge
 iwlwifi
 46:  1  0  0  0  IR-PCI-MSI-edge
 xhci_hcd
 47:  0  0  0  0  IR-PCI-MSI-edge
 xhci_hcd
 48:  0  0  0  0  IR-PCI-MSI-edge
 xhci_hcd
 49:  0  0  0  0  IR-PCI-MSI-edge
 xhci_hcd
 50:  0  0  0  0  IR-PCI-MSI-edge
 xhci_hcd
 51: 23  0  0  0  IR-PCI-MSI-edge  mei
 52:   1518  0  0  0  IR-PCI-MSI-edge
 snd_hda_intel
NMI:  0  0  0  0   Non-maskable interrupts
LOC:  17667  13603  17854   6331   Local timer interrupts
SPU:  0  0  0  0   Spurious interrupts
PMI:  0  0  0  0   Performance
monitoring interrupts
IWI:  0  0  0  0   IRQ work interrupts
RTR:  0  0  0  0   APIC ICR read retries
RES:   8771   6319632370   Rescheduling interrupts
CAL: 51 59 31 52   Function call
interrupts
TLB:   1363819   1346227   TLB shootdowns
TRM:  0  0  0  0   Thermal event
interrupts
THR:  0  0  0  0   Threshold APIC
interrupts
MCE:  0  0  0  0   Machine check
exceptions
MCP:  2  2  2  2   Machine check polls
ERR:  0
MIS:  0

No DMAR complaints in dmesg yet; it would have crashed by now if the
fault was present.

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9xkmIACgkQp5vW4rUFj5oZhACfSBIL3TTnQP1ST7QI2jUsb+Dk
ZQEAn0CGx3gzw/K/it/kIMml1EFR9PJV
=CJ6X
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-27 Thread Tony Vroon
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 27/03/12 11:11, Tony Vroon wrote:
 No DMAR complaints in dmesg yet; it would have crashed by now if
 the fault was present.

To confirm, it is stable.
So ppgtt + VT-d is problematic on:
00:02.0 VGA compatible controller [0300]: Intel Corporation 2nd
Generation Core Processor Family Integrated Graphics Controller
[8086:0126] (rev 09) (prog-if 00 [VGA controller])
Subsystem: Fujitsu Limited. Device [10cf:15e9]
Flags: bus master, fast devsel, latency 0, IRQ 42
Memory at e000 (64-bit, non-prefetchable) [size=4M]
Memory at d000 (64-bit, prefetchable) [size=256M]
I/O ports at 3000 [size=64]
Expansion ROM at unassigned [disabled]
Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit-
Capabilities: [d0] Power Management version 2
Capabilities: [a4] PCI Advanced Features
Kernel driver in use: i915

For the avoidance of doubt, it is a mobile Core i7 part:
cpu family  : 6
model   : 42
model name  : Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz
stepping: 7
microcode   : 0x25

Prior to the crash, I see:
DRHD: handling fault status reg 3
DMAR:[DMA Write] Request device [00:02.0] fault addr 12806b000
DMAR:[fault reason 05] PTE Write access is not set
DRHD: handling fault status reg 3
DMAR:[DMA Write] Request device [00:02.0] fault addr 128183000
DMAR:[fault reason 05] PTE Write access is not set
DRHD: handling fault status reg 3
DMAR:[DMA Write] Request device [00:02.0] fault addr 4147562000
DMAR:[fault reason 05] PTE Write access is not set
DRHD: handling fault status reg 3
DMAR:[DMA Write] Request device [00:02.0] fault addr 4147562000
DMAR:[fault reason 05] PTE Write access is not set

So I believe a bisection should point at commit
e21af88d39796c907c38648c824be3d646ffbe35, but I am willing to run one
if you really feel there is more to it?

Regards,
- -- 
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: t...@linx.net
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9xlUEACgkQp5vW4rUFj5q9mACgkyyW7PNZ4/vne++JXDrESaE8
D4AAn1hzqKHoMlwDCWxI+TbVkzrEZfGj
=SBBH
-END PGP SIGNATURE-
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-26 Thread Daniel Vetter
On Mon, Mar 26, 2012 at 02:59:43PM +0100, Tony Vroon wrote:
 On 21/03/12 10:47, Dave Airlie wrote:
  i915: re-enabling GMBUS, finish gpu patch (might help hibernation who 
  knows), missed irq fixes, stencil tiling fixes, interlaced support, 
  aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB, semaphore fixes
 
 This causes an eventual (after barely a minute of use) lockup that I can
 not recover from on my Lifebook S761. It does not switch to a text
 console for me, but by stopping my graphical login manager (slim) early
 I got this:
 DRHD: handling fault status reg 3
 DMAR:[DMA Write] Request device [00:02.0] fault addr 12806b000
 DMAR:[fault reason 05] PTE Write access is not set
 DRHD: handling fault status reg 3
 DMAR:[DMA Write] Request device [00:02.0] fault addr 128183000
 DMAR:[fault reason 05] PTE Write access is not set
 DRHD: handling fault status reg 3
 DMAR:[DMA Write] Request device [00:02.0] fault addr 4147562000
 DMAR:[fault reason 05] PTE Write access is not set
 DRHD: handling fault status reg 3
 DMAR:[DMA Write] Request device [00:02.0] fault addr 4147562000
 DMAR:[fault reason 05] PTE Write access is not set
 
 (The full dmesg is attached so you can see it in context)
 In the interest of full disclosure, this is a dual-screen setup:
 Screen 0: minimum 320 x 200, current 1680 x 1818, maximum 8192 x 8192
 LVDS1 connected 1366x768+0+1050 (normal left inverted right x axis y
 axis) 293mm x 165mm
 HDMI2 connected 1680x1050+0+0 (normal left inverted right x axis y axis)
 459mm x 296mm
 
 To confirm, that is the i915 graphics:
 00:02.0 VGA compatible controller: Intel Corporation 2nd Generation Core
 Processor Family Integrated Graphics Controller (rev 09) (prog-if 00
 [VGA controller])
   Subsystem: Fujitsu Limited. Device 15e9
   Flags: bus master, fast devsel, latency 0, IRQ 42
   Memory at e000 (64-bit, non-prefetchable) [size=4M]
   Memory at d000 (64-bit, prefetchable) [size=256M]
   I/O ports at 3000 [size=64]
   Expansion ROM at unassigned [disabled]
   Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit-
   Capabilities: [d0] Power Management version 2
   Capabilities: [a4] PCI Advanced Features
   Kernel driver in use: i915
 
 Please let me know if you want a full lspci, and what your favourite
 options are. I am back on a Thursday git snapshot now, which runs fine:
 Linux adrastea 3.3.0-04074-g5375871 #1 SMP PREEMPT Thu Mar 22 09:27:24
 GMT 2012 x86_64 Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz GenuineIntel
 GNU/Linux

Ok, this is ugly. Do you have any special module options for i915 set
(like i915_enable_rc6)? Also, can you check whether disabling vt-d does
work around the issue? Last but not least, can you please bisect where
this regression got introduced so we have an idea why it breaks?

Thanks a lot,

Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-24 Thread Linus Torvalds
Btw, I think this came in through the DRM merge:

  ERROR: mdfld_set_brightness [drivers/gpu/drm/gma500/gma500_gfx.ko]
undefined!
  make[1]: *** [__modpost] Error 1
  make: *** [modules] Error 2

this is just make ARCH=i386 with allmodconfig.

   Linus

On Wed, Mar 21, 2012 at 3:47 AM, Dave Airlie airl...@linux.ie wrote:

 This is the main drm pull request, I'm probably going to send two more
 smaller ones, will explain below.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-24 Thread Daniel Vetter
On Sat, Mar 24, 2012 at 12:15:27PM -0700, Linus Torvalds wrote:
 Btw, I think this came in through the DRM merge:
 
   ERROR: mdfld_set_brightness [drivers/gpu/drm/gma500/gma500_gfx.ko]
 undefined!
   make[1]: *** [__modpost] Error 1
   make: *** [modules] Error 2
 
 this is just make ARCH=i386 with allmodconfig.

Message-Id: 1332540112-469-1-git-send-email-kirill.shute...@linux.intel.com

... on lkml (cross-posted to dri-devel, too) looks like the patch you want.
-Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-22 Thread Linus Torvalds
On Wed, Mar 21, 2012 at 3:47 AM, Dave Airlie airl...@linux.ie wrote:

 (oh and any warnings you see in i915 are gcc's fault from what anyone can
 see).

Christ those are annoying. Has anybody contacted the gcc people about this?

Linus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [git pull] drm main pull for 3.4-rc1

2012-03-21 Thread Dave Airlie
On Wed, Mar 21, 2012 at 5:31 PM, InKi Dae daei...@gmail.com wrote:
 Hi Linus,

 now mainline has a duplicated patch set for exynos drm driver so
 please revert the patch below from mainline before merging with
 drm-next to avoid conflict.
 subject: drm exynos: use drm_fb_helper_set_par directly
 commit id: 34418c25d64844625118b5eedc493f7904d77659

 this patch had already been included in Dave's drm-next. I am sorry to 
 trouble.

Inki it shouldn't be a problem, Linus can resolve conflicts fine. If
there is any.

Dave.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel