Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp3179365imw; Mon, 11 Jul 2022 03:40:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sg2TmzjuuRZLWQdejknSN83TgaBg534rkTgUaQ4ZkkluQR224fGajLlZxRL30q+AHVZbp0 X-Received: by 2002:a17:907:7256:b0:722:e5a8:e3a3 with SMTP id ds22-20020a170907725600b00722e5a8e3a3mr17889256ejc.599.1657536037926; Mon, 11 Jul 2022 03:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657536037; cv=none; d=google.com; s=arc-20160816; b=g6y3iDqdU1Kgr1/ksX7XpXEO+cirlc6nlxN/wrw+NXxUDOyZ8WSCgpc9rLPrYjrkft 5a10mGxrYwenwmYPSfYlbDWSooaif4qfK9BiNV5bqMo1jcYlbaITS+X3/RT9+B/8Fhb/ Dy0d5VkaLk7x6777vvVY0pduxp7njw30ATvCdyCjl04AkZQsmRfNGBqIGFytstAkbVv9 TrlfpxT0IH5YXeCjGw4oFyXjGtlgwD5gclSmTX91CmglTtjS3qr5UhbLF4DdF+A/Tflf 3UqMCmhVWILYIBWEpsDy/8+4C8TsglsxjwdQpbu7h3DIFVed/qQMz4CZxRPrWNAd+vE6 mZ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=50XwRWFi5uMwSvJUSEWqL9+YQtDYOEKwP04ayDisrkA=; b=Hb4YmMma+wyjAwNdDKBgISaMakE4Xj5041ECQmyP6cTZffNqvaSU6W7GAcIWPiD0g0 0rDLcHXDhmAVhLnLWo/TIYzLCKYR9GVtHHb1sj0//dyWijeK2/1hQ/fa00qT6qRy3tYv xvdZkJ7Gi3ojSgqeTNI5ieF7pVz032+5l9cfOAzELjUbGPq39WBcb1dIBJpgz+m2aSGJ 8VngUi013vRNgu1Cso4AU/Rc5Fx76tu33oaHkVQJjwz2toZen4Un9aVmqWGxZrEEXMFS /8jU9ok+Ys0VAPf57pUegajxuQpmJAdiMAwAZvA2igWsDU6Dwh6KA3gCnxoE32nox1Ii Hcog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iNnAc6+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020aa7d88d000000b0043aa13e06d8si8755166edq.367.2022.07.11.03.40.13; Mon, 11 Jul 2022 03:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iNnAc6+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232607AbiGKJlB (ORCPT + 99 others); Mon, 11 Jul 2022 05:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233258AbiGKJkf (ORCPT ); Mon, 11 Jul 2022 05:40:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 657B35289A; Mon, 11 Jul 2022 02:20:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1EA44B80E7A; Mon, 11 Jul 2022 09:20:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44F8DC34115; Mon, 11 Jul 2022 09:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1657531236; bh=Oc8LmOjFtOIVcOaO6TY+N7i6SkFtqCkhytIlUUqIE84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iNnAc6+ejm+pORN3xmd56F4tyttPHp99UVySseM3AO/H2S0vY89Fw/jUil5qhMdoO h5kZc0/K8zJMkzorcDJg88vAqk77rB3IkIFujMai3Fo5iqYOTN/pxZ7iQpWnpk3vh3 Gx/CLunp40o70he0v11edxgViunAKpLz+4RwjvEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Brost , John Harrison , Daniel Vetter , Matt Roper , Sasha Levin Subject: [PATCH 5.15 031/230] drm/i915: Disable bonding on gen12+ platforms Date: Mon, 11 Jul 2022 11:04:47 +0200 Message-Id: <20220711090604.961757355@linuxfoundation.org> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220711090604.055883544@linuxfoundation.org> References: <20220711090604.055883544@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Brost [ Upstream commit ce7e75c7ef1bf8ea3d947da8c674d2f40fd7d734 ] Disable bonding on gen12+ platforms aside from ones already supported by the i915 - TGL, RKL, and ADL-S. Signed-off-by: Matthew Brost Reviewed-by: John Harrison Acked-by: Daniel Vetter Signed-off-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20210728192100.132425-1-matthew.brost@intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index ee0c0b712522..ba2e037a82e4 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -442,6 +442,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) u16 idx, num_bonds; int err, n; + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { + drm_dbg(&i915->drm, + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not supported\n"); + return -ENODEV; + } + if (get_user(idx, &ext->virtual_index)) return -EFAULT; -- 2.35.1