From patchwork Sat Apr 8 08:52:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Lankhorst X-Patchwork-Id: 9670997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC8956020F for ; Sat, 8 Apr 2017 08:53:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5D9D28426 for ; Sat, 8 Apr 2017 08:53:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D92C9285D2; Sat, 8 Apr 2017 08:53:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C91828426 for ; Sat, 8 Apr 2017 08:53:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F27789F8B; Sat, 8 Apr 2017 08:52:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A9FC89FCE for ; Sat, 8 Apr 2017 08:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491641578; x=1523177578; h=subject:to:references:cc:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=Wlw0IR74VSZtTz/Vt9P1uynFsM+kEt7bsy9pQVO9DqI=; b=ViE6AgID/JczHjiJHKmW840VoXBqo4juZ6wdKH4oxmC6M1bsRCJ/+Dnp T/3WBG8t9PlayHTSeGfIIvBh2r85wg==; Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Apr 2017 01:52:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,171,1488873600"; d="scan'208";a="85002127" Received: from joconno1-mobl1.amr.corp.intel.com (HELO patser.lan) ([10.252.18.74]) by orsmga005.jf.intel.com with ESMTP; 08 Apr 2017 01:52:46 -0700 Subject: Re: drm_modeset_lock oops in next To: Tony Lindgren , Daniel Vetter References: <20170407155649.GI13234@atomide.com> From: Maarten Lankhorst Message-ID: <43aba628-71c3-58ca-eaa8-e1098fd20046@linux.intel.com> Date: Sat, 8 Apr 2017 10:52:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170407155649.GI13234@atomide.com> Cc: linux-omap@vger.kernel.org, Tomi Valkeinen , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hey, Op 07-04-17 om 17:56 schreef Tony Lindgren: > Hi, > > Looks like current next now oopses at least for omapdrm > when starting X. Reverting commit d20afeb3e2f9 ("Merge > remote-tracking branch 'drm-misc/for-linux-next'") makes > things work again. > > Any ideas what might be causing the oops below? Looks like fallout from the acquire_ctx patches? Could you test the below? diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 838ca742a28b..2c5b5bf68e3d 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -720,15 +720,16 @@ static int drm_mode_cursor_common(struct drm_device *dev, ret = drm_modeset_lock(&crtc->mutex, &ctx); if (ret) goto out; - ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx); - if (ret) - goto out; /* * If this crtc has a universal cursor plane, call that plane's update * handler rather than using legacy cursor handlers. */ if (crtc->cursor) { + ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx); + if (ret) + goto out; + ret = drm_mode_cursor_universal(crtc, req, file_priv, &ctx); goto out; }