From patchwork Fri Jan 15 18:52:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8044041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D52D9FE73 for ; Fri, 15 Jan 2016 18:52:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BAB320394 for ; Fri, 15 Jan 2016 18:52:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7FCE62039D for ; Fri, 15 Jan 2016 18:52:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C7676E18D; Fri, 15 Jan 2016 10:52:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f49.google.com (mail-qg0-f49.google.com [209.85.192.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAFD06E18D for ; Fri, 15 Jan 2016 10:52:15 -0800 (PST) Received: by mail-qg0-f49.google.com with SMTP id o11so514519580qge.2 for ; Fri, 15 Jan 2016 10:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fGM4ZUzscxqHl9YKw0MZ8Fen1aEKTOBvy3/+uesn7fo=; b=TJlV3uQJdaX9rehe/VtUmr2a9Led9Ksfw7wRrsPGzUggXdxpX5zPDz3UA8Vd01SzpB Yxc3dQD2zbsQBDYYuWmSpCUT1uha6l9AH2TJBF/E703cvl3GxedprzIun7N+zpda3gS/ HliwZzCIutC+gJLOW8ujCWnuAJMsLO+G9zwJa2Q9Rnbb+lK4ITqBxHoVWbuFn180aBR7 Ci2uIE+7kEgFWydPOn4VB2h9KoFYowHVH0K4OP5gQoj2EMP6DxitCQ7hoGgTHne0XnIe E30MqKbKNnIuxzdT01ewSmutMGPHK8//vYzjiTvP9Xy/bWOS/DANKGF+qQ6u2DmqOF0e APOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fGM4ZUzscxqHl9YKw0MZ8Fen1aEKTOBvy3/+uesn7fo=; b=DOz+OvXpHsREuJY7aGYjYqB2gKkk5S3S30fjGuxMsldgFo3jMZuAPPM05GF3Qlaqw3 h1iGOPvANgenKP5ipceFtMa1qIHcnO2Fxr5YPXlyiFR17sQ6C32P8QGr3VwP1L+Vnxkp 7g11d8bshlSQqyGDVWTNpD7X+p5OJjcrKyJs9N2uPVXW/9BjcuxAErO2UIXpJAt/y3wZ IoIQA7DDCUSuv4kOmkeaHiCj0TLNqYXxy/Lk4g9aex4Q5+iffwIcxkmfCQpojkTXuD3S txjeh+prk3kuChjzDwGC0+2z2J4RuVGubcmUAV+g880SGHxUHmU8/aox3XNIrNU9Cj+j FZ1A== X-Gm-Message-State: ALoCoQle3LYWqR4ydFze+sD0zygn/397ijH3nJlWwcX14SwAbRh9yp0pePQ5vzIWw4ZpAkhiKNOgiC2RFz9eNWMPuTtg46h/ww== X-Received: by 10.140.138.145 with SMTP id 139mr16844577qhk.18.1452883935192; Fri, 15 Jan 2016 10:52:15 -0800 (PST) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id a104sm4994485qge.43.2016.01.15.10.52.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Jan 2016 10:52:14 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 7/7] drm/amdgpu: drop hard_reset module parameter Date: Fri, 15 Jan 2016 13:52:04 -0500 Message-Id: <1452883924-13355-8-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452883924-13355-1-git-send-email-alexander.deucher@amd.com> References: <1452883924-13355-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It doesn't currently do anything and there's no need for it going forward since pci config reset will be required as a fallback even when we have fine grained reset implemented. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index ce061d3..7cc76e2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -76,7 +76,6 @@ extern int amdgpu_dpm; extern int amdgpu_smc_load_fw; extern int amdgpu_aspm; extern int amdgpu_runtime_pm; -extern int amdgpu_hard_reset; extern unsigned amdgpu_ip_block_mask; extern int amdgpu_bapm; extern int amdgpu_deep_color; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 99031ec..371f30d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -69,7 +69,6 @@ int amdgpu_dpm = -1; int amdgpu_smc_load_fw = 1; int amdgpu_aspm = -1; int amdgpu_runtime_pm = -1; -int amdgpu_hard_reset = 0; unsigned amdgpu_ip_block_mask = 0xffffffff; int amdgpu_bapm = -1; int amdgpu_deep_color = 0; @@ -125,9 +124,6 @@ module_param_named(aspm, amdgpu_aspm, int, 0444); MODULE_PARM_DESC(runpm, "PX runtime pm (1 = force enable, 0 = disable, -1 = PX only default)"); module_param_named(runpm, amdgpu_runtime_pm, int, 0444); -MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))"); -module_param_named(hard_reset, amdgpu_hard_reset, int, 0444); - MODULE_PARM_DESC(ip_block_mask, "IP Block Mask (all blocks enabled (default))"); module_param_named(ip_block_mask, amdgpu_ip_block_mask, uint, 0444);