From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [3.14.0-rc4] regression: drm FIFO underruns Date: Tue, 13 May 2014 15:22:00 +0200 Message-ID: <20140513132200.GC3908@phenom.ffwll.local> References: <20140509161438.GH31479@strange.amr.corp.intel.com> <20140509170335.GZ18465@intel.com> <20140512190300.GF25056@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by gabe.freedesktop.org (Postfix) with ESMTP id E66666EA99 for ; Tue, 13 May 2014 06:22:05 -0700 (PDT) Received: by mail-we0-f179.google.com with SMTP id q59so369632wes.24 for ; Tue, 13 May 2014 06:22:04 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: =?iso-8859-1?Q?J=F6rg?= Otte Cc: David Airlie , Linux Kernel Mailing List , Dave Airlie , Linus Torvalds , intel-gfx List-Id: intel-gfx@lists.freedesktop.org On Tue, May 13, 2014 at 12:38:41PM +0200, Daniel Vetter wrote: > On Tue, May 13, 2014 at 12:29 PM, J=F6rg Otte wrote: > >>> Branch drm-intel-nightly as of > >>> ed60c27 drm-intel-nightly: 2014y-05m-09d-21h-51m-45s integration mani= fest > >>> looks badly: > >>> - KDE splash screen on boot-up is not visible > >>> - x-windows don't have title and menu bars > >>> - KDE system menu is not visible > >>> - moving windows around destroys its content > >> > >> Ugh, that's ugly. Nothing else change like e.g. the version of > >> xfree-video-intel? > > > > (II) Loading /usr/lib/xorg/modules/drivers/intel_drv.so > > (II) Module intel: vendor=3D"X.Org Foundation" > > compiled for 1.11.3, module version =3D 2.17.0 > > Module class: X.Org Video Driver > > ABI class: X.Org Video Driver, version 11.0 > = > Chris, any ideas? It's an ivybridge apparently. > = > For the fifo underruns I think we've fully confirmed that they only > happen on boot-up. I'll try to come up with some ideas what could have > gone wrong there. Please test the below patch. -Daniel diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_ir= q.c index b10fbde1d5ee..63ced2dee027 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -427,9 +427,6 @@ bool __intel_set_cpu_fifo_underrun_reporting(struct drm= _device *dev, = ret =3D !intel_crtc->cpu_fifo_underrun_disabled; = - if (enable =3D=3D ret) - goto done; - intel_crtc->cpu_fifo_underrun_disabled =3D !enable; = if (enable && (INTEL_INFO(dev)->gen < 5 || IS_VALLEYVIEW(dev))) @@ -441,7 +438,6 @@ bool __intel_set_cpu_fifo_underrun_reporting(struct drm= _device *dev, else if (IS_GEN8(dev)) broadwell_set_fifo_underrun_reporting(dev, pipe, enable); = -done: return ret; } = -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch