From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [GIT PULL] Armada DRM fixes Date: Fri, 24 Oct 2014 19:25:07 +0100 Message-ID: <20141024182507.GA27184@rmk-PC.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from pandora.arm.linux.org.uk (gw-1.arm.linux.org.uk [78.32.30.217]) by gabe.freedesktop.org (Postfix) with ESMTP id AC6256E602 for ; Fri, 24 Oct 2014 11:25:13 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@linux.ie, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org David, Please incorporate the latest Armada DRM fixes, which can be found at: git://ftp.arm.linux.org.uk/~rmk/linux-arm.git drm-armada-fixes with SHA1 178e561f514fca4863c06a4af3501172e5627eb1. Three changes for the Armada DRM driver: 1. Add back the flags which tell the DRM core that we can do vblank. This was removed in error during the recent restructuring, and came to light while trying textured Xv rendering. 2. Fixing a refcount leak with Xv overlay. 3. As per recent discussion, the drm_vblank_pre_modeset() calls can cause deadlock with other changes to generic code. This change prevents those deadlocks by switching to the drm_crtc_vblank_*() calls instead. This will update the following files: drivers/gpu/drm/armada/armada_crtc.c | 21 ++++++++++----------- drivers/gpu/drm/armada/armada_drv.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) through these changes: Russell King (3): drm/armada: add IRQ support back drm/armada: fix page_flip refcounting leak drm/armada: convert to use vblank_on/off calls Many thanks.