From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 13/15] vmwgfx: Add a get_vblank_counter function Date: Mon, 27 Sep 2010 15:20:30 +0200 Message-ID: <1285593632-10585-14-git-send-email-thellstrom@vmware.com> References: <1285593632-10585-1-git-send-email-thellstrom@vmware.com> <1285593632-10585-2-git-send-email-thellstrom@vmware.com> <1285593632-10585-3-git-send-email-thellstrom@vmware.com> <1285593632-10585-4-git-send-email-thellstrom@vmware.com> <1285593632-10585-5-git-send-email-thellstrom@vmware.com> <1285593632-10585-6-git-send-email-thellstrom@vmware.com> <1285593632-10585-7-git-send-email-thellstrom@vmware.com> <1285593632-10585-8-git-send-email-thellstrom@vmware.com> <1285593632-10585-9-git-send-email-thellstrom@vmware.com> <1285593632-10585-10-git-send-email-thellstrom@vmware.com> <1285593632-10585-11-git-send-email-thellstrom@vmware.com> <1285593632-10585-12-git-send-email-thellstrom@vmware.com> <1285593632-10585-13-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [65.115.85.73]) by gabe.freedesktop.org (Postfix) with ESMTP id C3DF99EF3E for ; Mon, 27 Sep 2010 06:31:35 -0700 (PDT) In-Reply-To: <1285593632-10585-13-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@redhat.com Cc: Thomas Hellstrom , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Avoids an oops during drm_irq_uninstall. Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 ++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 +++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index b819535..bd6ff3e 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -877,6 +877,7 @@ static struct drm_driver driver = { .irq_postinstall = vmw_irq_postinstall, .irq_uninstall = vmw_irq_uninstall, .irq_handler = vmw_irq_handler, + .get_vblank_counter = vmw_get_vblank_counter, .reclaim_buffers_locked = NULL, .ioctls = vmw_ioctls, .num_ioctls = DRM_ARRAY_SIZE(vmw_ioctls), diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index f65e19f..5e9d61f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -525,6 +525,8 @@ void vmw_kms_idle_workqueues(struct vmw_master *vmaster); bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, uint32_t pitch, uint32_t height); +u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc); + /** * Overlay control - vmwgfx_overlay.c diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3ee2492..5fb68f3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1139,3 +1139,8 @@ bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, { return ((u64) pitch * (u64) height) < (u64) dev_priv->vram_size; } + +u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc) +{ + return 0; +} -- 1.6.2.5