From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932108AbcEMTly (ORCPT ); Fri, 13 May 2016 15:41:54 -0400 Received: from anholt.net ([50.246.234.109]:45062 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753385AbcEMTlx (ORCPT ); Fri, 13 May 2016 15:41:53 -0400 From: Eric Anholt To: David Airlie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eric Anholt Subject: [GIT PULL] drm-vc4-next-2016-05-13 Date: Fri, 13 May 2016 12:41:50 -0700 Message-Id: <1463168510-24085-1-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.8.0.rc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Here are a few late bugfixes for vc4. I figure it's best to bring them in through -next since 4.6 is about done. I've based them late in your -next branch to avoid needing conflict resolution. The following changes since commit bafb86f5bc3173479002555dea7f31d943b12332: Merge tag 'v4.6-rc7' into drm-next (2016-05-09 13:49:56 +1000) are available in the git repository at: https://github.com/anholt/linux tags/drm-vc4-next-2016-05-13 for you to fetch changes up to efea172891fc32928291a633c17a146338a73ba9: drm/vc4: Return -EBUSY if there's already a pending flip event. (2016-05-09 18:31:33 -0700) ---------------------------------------------------------------- This pull request brings in a few fixes for vc4 pageflipping. ---------------------------------------------------------------- Mario Kleiner (2): drm/vc4: Fix get_vblank_counter with proper no-op for Linux 4.4+ drm/vc4: Fix drm_vblank_put/get imbalance in page flip path. Robert Foss (1): drm/vc4: Return -EBUSY if there's already a pending flip event. drivers/gpu/drm/vc4/vc4_crtc.c | 4 ++++ drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-)