From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754835AbbJOCFE (ORCPT ); Wed, 14 Oct 2015 22:05:04 -0400 Received: from ozlabs.org ([103.22.144.67]:54873 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754488AbbJOCFB (ORCPT ); Wed, 14 Oct 2015 22:05:01 -0400 Date: Thu, 15 Oct 2015 13:04:58 +1100 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= , Thierry Reding Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Message-ID: <20151015130458.030a2c01@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_irq.c between commit: fd8f507c0de9 ("drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.") from the drm-intel tree and commit: 88e72717c2de ("drm/irq: Use unsigned int pipe in public API") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_irq.c index e24378ee7eda,bc732eb52b50..000000000000 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@@ -710,11 -611,12 +710,11 @@@ static u32 i915_get_vblank_counter(stru return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff; } - static u32 g4x_get_vblank_counter(struct drm_device *dev, int pipe) -static u32 gm45_get_vblank_counter(struct drm_device *dev, unsigned int pipe) ++static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe) { struct drm_i915_private *dev_priv = dev->dev_private; - int reg = PIPE_FRMCOUNT_GM45(pipe); - return I915_READ(reg); + return I915_READ(PIPE_FRMCOUNT_G4X(pipe)); } /* raw reads, only for fast reads of display block, no need for forcewake etc. */