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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham 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 73881C28EBD for ; Sun, 9 Jun 2019 17:21:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F81F20652 for ; Sun, 9 Jun 2019 17:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100864; bh=ROIPTP72i2EtjIl4JUnQR11SQqZXGgz2RDHIzQPV2EM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BYl+Dwwgo3UiwoRyaXx3l4c17ZLV+nL1ay4v8oq6Faay2xYLZM+z9rnrX9c+ZOgX7 Z/4OQHjzCz03MMZq7j5wXmDbL2T9cKes9ewQLthyAhxnBhNQpnqnWCGr56osXErYhY wbga45TjueOpjO0DWbHeN45ANbPn3LsoWRFmVvlM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730471AbfFIQq3 (ORCPT ); Sun, 9 Jun 2019 12:46:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:44610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730426AbfFIQqZ (ORCPT ); Sun, 9 Jun 2019 12:46:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8BD342081C; Sun, 9 Jun 2019 16:46:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098785; bh=ROIPTP72i2EtjIl4JUnQR11SQqZXGgz2RDHIzQPV2EM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YP1CeFeJEcFHDhXis58jnfCOncGS9FmNdfAZ55NdJ9oBfbFpl8qY8xZ/qhUobJu4l PPau9uoetCpsQU1wf+8Qfm7H5MNohmm0s4i6P9rLG0pIFbjBKKuCxPSFWt3tyV8o0N ifz688aG75ioUGL3dqQL0Wvi6K8NvEbKYWBhNPlI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Tvrtko Ursulin Subject: [PATCH 5.1 60/70] drm/i915: Fix I915_EXEC_RING_MASK Date: Sun, 9 Jun 2019 18:42:11 +0200 Message-Id: <20190609164132.502693982@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.541128197@linuxfoundation.org> References: <20190609164127.541128197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson commit d90c06d57027203f73021bb7ddb30b800d65c636 upstream. This was supposed to be a mask of all known rings, but it is being used by execbuffer to filter out invalid rings, and so is instead mapping high unused values onto valid rings. Instead of a mask of all known rings, we need it to be the mask of all possible rings. Fixes: 549f7365820a ("drm/i915: Enable SandyBridge blitter ring") Fixes: de1add360522 ("drm/i915: Decouple execbuf uAPI from internal implementation") Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: # v4.6+ Reviewed-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20190301140404.26690-21-chris@chris-wilson.co.uk Signed-off-by: Greg Kroah-Hartman --- include/uapi/drm/i915_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -972,7 +972,7 @@ struct drm_i915_gem_execbuffer2 { * struct drm_i915_gem_exec_fence *fences. */ __u64 cliprects_ptr; -#define I915_EXEC_RING_MASK (7<<0) +#define I915_EXEC_RING_MASK (0x3f) #define I915_EXEC_DEFAULT (0<<0) #define I915_EXEC_RENDER (1<<0) #define I915_EXEC_BSD (2<<0)