From patchwork Thu Nov 19 13:43:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 546462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 7AAFA14149A; Fri, 20 Nov 2015 00:44:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=bC03huvM; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZzPVm-0004dX-IL; Thu, 19 Nov 2015 13:44:30 +0000 Received: from mail-ig0-f181.google.com ([209.85.213.181]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZzPVh-0004dN-Ss for kernel-team@lists.ubuntu.com; Thu, 19 Nov 2015 13:44:25 +0000 Received: by igcto18 with SMTP id to18so63152751igc.0 for ; Thu, 19 Nov 2015 05:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=CgAjAmIc9ecwQP2r4AQXdeMEpE7DENVRnqV5NEfdMv8=; b=bC03huvMZCW0/85rE444kfLl3SvWEiw13jE+4hLicTBMglvEs6X/zKIW6XOfR3JCFX viwI//8xJOItoUq81u0w5I1ezuwD1OWG7kGZZyPWSQy7GTJiJOQvgC3SdsBF11e1xtpL 61mfPrjErr/s7Nap9E5p28rODD12dIxQygHr0Ng9l786Ocq0r+i0ULcbvGy1ois31o4n c9ASmusRzxbFrVyZ8iL5FLt2VCcQ0MpI4uVQJ75sLAk6B8RISFUl/UFTSJeyKY3HN7W2 d6Z3FdhEc9eGvURAOMirA0byO7u0/e/XaXcG8YGff+ZPROUC5dCENACezzBr5MN1Fb8k gn2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=CgAjAmIc9ecwQP2r4AQXdeMEpE7DENVRnqV5NEfdMv8=; b=bqDxIiTxkzm7B2XduduW3dqqfgBpBiosrhQmyfKth7+XLi1BJ+8gGffJOcsMr7l6Tr aSadt9qGaBRfFqt6LUma10E2uoHpVYnMl3uS3b+Q63P1t1F2qp8rGtrkqOiVd/2NUAPW UldQNUWdBPxS8+cUWvMhbInHGtLLldNKVW8MqJn0u5ND02+J9cyuagVqoyxpQctcu8Ul yTe+g0A5WO82s5WzffEJTDKeTfb/fPsMZiJbn4MsfJT2I+3reBiaFf6LF8+safVbfx4a 0NF18PAPvXf/QW60zQZVShNgxasQe71M6/ncRWnj4KxuDBkju/Aqorrvaugf/g5j12c7 cMNA== X-Gm-Message-State: ALoCoQm4j5zqx/335LwCVysMnw12gWSTjMCaVcLxqOprLvs2ewfo7yJReIff8YI9b6yMcCgjLu74 X-Received: by 10.50.79.131 with SMTP id j3mr13612633igx.49.1447940665252; Thu, 19 Nov 2015 05:44:25 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id 90sm3388380ioq.29.2015.11.19.05.44.24 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 19 Nov 2015 05:44:24 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][xenial/master-next] UBUNTU: [Config] CONFIG_DRM_AMDGPU_CIK=n Date: Thu, 19 Nov 2015 07:43:33 -0600 Message-Id: <1447940613-59264-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com CIK support in amdgpu is currently experimental, and the upstream maintainers do not recommend enabling it. Disabling CIK support in amdgpu will result in falling back to the radeon driver, which also supports this hardware. BugLink: http://bugs.launchpad.net/bugs/1510405 Signed-off-by: Seth Forshee --- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index ac279cf..e460188 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1324,7 +1324,7 @@ CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT note # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU CONFIG_DRM_AMDGPU policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}> -CONFIG_DRM_AMDGPU_CIK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> +CONFIG_DRM_AMDGPU_CIK policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}> CONFIG_DRM_AMDGPU_USERPTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> CONFIG_HSA_AMD policy<{'amd64': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 3f22c4c..777f4a8 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1895,7 +1895,7 @@ CONFIG_DRA752_THERMAL=y CONFIG_DRAGONRISE_FF=y # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMDGPU_CIK=y +# CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_ARMADA=m CONFIG_DRM_AST=m