From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87A5EC433DF for ; Fri, 16 Oct 2020 12:52:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BAA92067D for ; Fri, 16 Oct 2020 12:52:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BAA92067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=emeril.freedesktop.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CE6F6EDD7; Fri, 16 Oct 2020 12:52:27 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTP id 90E936EDD7; Fri, 16 Oct 2020 12:52:25 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id 89F7FA47E6; Fri, 16 Oct 2020 12:52:25 +0000 (UTC) MIME-Version: 1.0 From: Patchwork To: "Maarten Lankhorst" Date: Fri, 16 Oct 2020 12:52:25 -0000 Message-ID: <160285274556.8602.16177703359284147960@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20201016104444.1492028-1-maarten.lankhorst@linux.intel.com> In-Reply-To: <20201016104444.1492028-1-maarten.lankhorst@linux.intel.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915=3A_Remove_obj-=3Emm=2Elock!_=28rev6=29?= X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: intel-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: drm/i915: Remove obj->mm.lock! (rev6) URL : https://patchwork.freedesktop.org/series/82337/ State : failure == Summary == Applying: drm/i915: Move cmd parser pinning to execbuffer Applying: drm/i915: Add missing -EDEADLK handling to execbuf pinning Applying: drm/i915: Do not share hwsp across contexts any more, v4. Applying: drm/i915: Pin timeline map after first timeline pin, v3. Applying: drm/i915: Ensure we hold the object mutex in pin correctly. Applying: drm/i915: Add gem object locking to madvise. Applying: drm/i915: Move HAS_STRUCT_PAGE to obj->flags Applying: drm/i915: Rework struct phys attachment handling Applying: drm/i915: Convert i915_gem_object_attach_phys() to ww locking Applying: drm/i915: make lockdep slightly happier about execbuf. Applying: drm/i915: Disable userptr pread/pwrite support. Applying: drm/i915: No longer allow exporting userptr through dma-buf Applying: drm/i915: Reject more ioctls for userptr Applying: drm/i915: Reject UNSYNCHRONIZED for userptr Applying: drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v4. Applying: drm/i915: Flatten obj->mm.lock Applying: drm/i915: Populate logical context during first pin. Applying: drm/i915: Make ring submission compatible with obj->mm.lock removal, v2. Applying: drm/i915: Handle ww locking in init_status_page Applying: drm/i915: Rework clflush to work correctly without obj->mm.lock. Applying: drm/i915: Pass ww ctx to intel_pin_to_display_plane Applying: drm/i915: Add object locking to vm_fault_cpu Applying: drm/i915: Move pinning to inside engine_wa_list_verify() Applying: drm/i915: Take reservation lock around i915_vma_pin. Applying: drm/i915: Make intel_init_workaround_bb more compatible with ww locking. Applying: drm/i915: Make __engine_unpark() compatible with ww locking. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_engine_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_pm.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0026 drm/i915: Make __engine_unpark() compatible with ww locking. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx