From patchwork Thu Sep 6 16:49:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mandeep Singh Baines X-Patchwork-Id: 1417131 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 0BD3E3FC71 for ; Thu, 6 Sep 2012 16:49:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10DCBA0B6E for ; Thu, 6 Sep 2012 09:49:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f201.google.com (mail-qc0-f201.google.com [209.85.216.201]) by gabe.freedesktop.org (Postfix) with ESMTP id 541C99EEF1 for ; Thu, 6 Sep 2012 09:49:28 -0700 (PDT) Received: by qcha6 with SMTP id a6so153115qch.0 for ; Thu, 06 Sep 2012 09:49:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=D2IguFTfI3Qo4ORAsvCMvV+KweSzIlicZLCOHD8aTZM=; b=EZfQ0RITQASL4QxGWGVBwOYd6OVf+RT3X/r4febVUPT2bCtH5S4xlEP4u4XvYbCWMT wWmsIYm2A6ERbsWdB0hArq0u3GH72sCUXNmB9C70+Hcg75jika995zx+ZVa9keaUCKBT Do+GlZ+zHNwjoTQlk1bT1RMf9+yc+EWCxfPmCOaHrPPGE95H8Q6vZqbFUZKUhuckvqQ9 cfAYmnroC4r6cxykPxGzH7OXj5nzyXQemctL9tLOZgUtLdus5+BfOJsZM4TNwfRX55pV ggLMuYSy3LznhskQngd5BfUQTFLQICiicook8mspy4ZKN5dITWuWQ8tR3wBDI+yJwG6g Vkkw== Received: by 10.236.181.37 with SMTP id k25mr1394067yhm.15.1346950167451; Thu, 06 Sep 2012 09:49:27 -0700 (PDT) Received: by 10.236.181.37 with SMTP id k25mr1394054yhm.15.1346950167345; Thu, 06 Sep 2012 09:49:27 -0700 (PDT) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id c61si733090yhm.3.2012.09.06.09.49.27 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 06 Sep 2012 09:49:27 -0700 (PDT) Received: from nitrous.mtv.corp.google.com (nitrous.mtv.corp.google.com [172.22.73.72]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 3ED8D100047; Thu, 6 Sep 2012 09:49:27 -0700 (PDT) Received: by nitrous.mtv.corp.google.com (Postfix, from userid 55285) id DD4F080558; Thu, 6 Sep 2012 09:49:26 -0700 (PDT) From: Mandeep Singh Baines To: Inki Dae , Joonyoung Shim , Kyungmin Park , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Menzel , =?UTF-8?q?St=C3=A9phane=20Marchesin?= , Pawel Osciak Subject: [PATCH] drm/exynos: fix double call of drm_prime_(init/destroy)_file_private Date: Thu, 6 Sep 2012 09:49:23 -0700 Message-Id: <1346950163-17590-1-git-send-email-msb@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: References: X-Gm-Message-State: ALoCoQm4QH30lCPm5PkYlvh0fubnCLkkf4U8dUhP26rA76ilk2yXI2BUv4vfnmLGEgG/Rj/jqhlpPOQe7lJunM0MFd5g7mYs2HLoO0dVqPw42LWGR35+bW3VjCcMTTSUHSEUBUie6NusdBG3B+EqOTch4YcN1XPQi8g5CqzzGY2pOkRpdUaNla4ls21L5pbR2ASytnaLp64ocuDgiZdzQBg5SSsLH388kw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org The double invocations are incorrect but seem to be safe so I don't think this will fix any bugs. Before: [ 7.639366] drm_prime_init_file ee3675d0 [ 7.639377] drm_prime_init_file ee3675d0 [ 7.639507] drm_prime_destroy_file ee3675d0 [ 7.639518] drm_prime_destroy_file ee3675d0 [ 7.639802] drm_prime_init_file ee372390 [ 7.639810] drm_prime_init_file ee372390 [ 8.473316] drm_prime_init_file ee356390 [ 8.473331] drm_prime_init_file ee356390 After: [ 6.363842] drm_prime_init_file edc2e5d0 [ 6.363994] drm_prime_destroy_file edc2e5d0 [ 6.364260] drm_prime_init_file edc2e750 [ 8.004837] drm_prime_init_file ee36ded0 Signed-off-by: Mandeep Singh Baines Acked-by: Seung-Woo Kim --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index ebacec6..a27b8ff 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) if (!file_priv) return -ENOMEM; - drm_prime_init_file_private(&file->prime); file->driver_priv = file_priv; return exynos_drm_subdrv_open(dev, file); @@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev, e->base.destroy(&e->base); } } - drm_prime_destroy_file_private(&file->prime); spin_unlock_irqrestore(&dev->event_lock, flags); exynos_drm_subdrv_close(dev, file);