From patchwork Wed Sep 5 21:47:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mandeep Singh Baines X-Patchwork-Id: 1411161 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 DEF3140220 for ; Wed, 5 Sep 2012 21:47:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D84EC9EB09 for ; Wed, 5 Sep 2012 14:47:25 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ey0-f201.google.com (mail-ey0-f201.google.com [209.85.215.201]) by gabe.freedesktop.org (Postfix) with ESMTP id 7266D9E752 for ; Wed, 5 Sep 2012 14:47:15 -0700 (PDT) Received: by eabm6 with SMTP id m6so59211eab.0 for ; Wed, 05 Sep 2012 14:47:14 -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:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=wd5iX8LvFas1ldtUMpzdLuSLUy0kakdpiguGkAtVQqY=; b=TDrnrN9YqNPxCQ+iFuUwyD4FaS9ObgEyMFWlPJrG8bfiWHKftV66zGJXazJGSActx7 Z5ahMjooSb1CGPc003GVx72DT10gy6Y3O+1gSMj/IGOWgbmmftVfF0X7T4G1fM530m0b BjPgC8TRHMTWQbu+64Dy7lUgqheYWQAqT6SDPxuXFGjj6S+BPqrlxU+UsR87HVyDCuOm cXI+lUK/e9Tp74TNdirxjiWRRHC6Jldpbwn8hoZznvZT557F2ujz2P9+HrR6BIGpGWDa QdCYEcFRJ/0SKcVVc9MW+3momzYLh6ez/KypT4zopkqgsO6mWOCvGKp405hOiaPvyH81 v/aw== Received: by 10.180.75.168 with SMTP id d8mr27170wiw.1.1346881634138; Wed, 05 Sep 2012 14:47:14 -0700 (PDT) Received: by 10.180.75.168 with SMTP id d8mr27154wiw.1.1346881634081; Wed, 05 Sep 2012 14:47:14 -0700 (PDT) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id em7si45030wib.2.2012.09.05.14.47.14 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 05 Sep 2012 14:47:14 -0700 (PDT) Received: from nitrous.mtv.corp.google.com (nitrous.mtv.corp.google.com [172.22.73.72]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id AB7545C006A; Wed, 5 Sep 2012 14:47:13 -0700 (PDT) Received: by nitrous.mtv.corp.google.com (Postfix, from userid 55285) id D195A80558; Wed, 5 Sep 2012 14:47:12 -0700 (PDT) From: Mandeep Singh Baines To: Inki Dae , linux-kernel@vger.kernel.org Subject: [PATCH] drm/exynos: fix double call of drm_prime_(init/destroy)_file_private Date: Wed, 5 Sep 2012 14:47:03 -0700 Message-Id: <1346881623-388-1-git-send-email-msb@chromium.org> X-Mailer: git-send-email 1.7.7.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlayOrHVSMMyqyAtBSmJfvMNwyvHLUWDHy0v6s0Np9LD8oGi2CdhvndsBztmz2R710irKyl8XKu0ZIpnGWAfrGpk7d+eIrMWOuz2wwCT0nvIZu1yIQ3qJGBMVw0o3KL547TX1jPw37xZ6O6zEnc/zrOlAUfZgeuPqV92FVnYgH7pBGqOLW9mjQ4yrkDvXLqexVktuWDC2oZ4cZrzHOtdD2PSXPv+w== Cc: dri-devel@lists.freedesktop.org, Kyungmin Park , =?UTF-8?q?St=C3=A9phane=20Marchesin?= 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: , 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 CC: Stéphane Marchesin CC: Pawel Osciak CC: Inki Dae CC: Joonyoung Shim CC: Seung-Woo Kim CC: Kyungmin Park CC: David Airlie CC: dri-devel@lists.freedesktop.org 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);