From patchwork Thu Jul 14 14:15:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9229889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 537C56075D for ; Thu, 14 Jul 2016 14:15:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44B2B2808C for ; Thu, 14 Jul 2016 14:15:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39917281A7; Thu, 14 Jul 2016 14:15:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C298D2808C for ; Thu, 14 Jul 2016 14:15:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E76A06E318; Thu, 14 Jul 2016 14:15:13 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C814E6E318 for ; Thu, 14 Jul 2016 14:15:12 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id q128so4904409wma.1 for ; Thu, 14 Jul 2016 07:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=q7tdIGJO63TtFl79A4YN+9QX+UGhLkoyUbs3p/VIdLo=; b=NMSjKBTtCTPnoJxr8HHRuvfjYE7Hsze/INDYCWoVENigngQRMwBses9sYePb4/fe// b/cQU5iXT1+qzoqu2B7AWEi6PywHH8XG6YHeIjZm1L1OWX0GHLrp5yWSiZlSEbAwfHcs dDCSCbs/AnNQg8aD48vHQ3lX0L74swUfYP880= 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; bh=q7tdIGJO63TtFl79A4YN+9QX+UGhLkoyUbs3p/VIdLo=; b=jc0nm1DVivqkFFUwp0DAqAceY1W/9X1mWCr2FzNexvIsOKV86U9aXSrSFi+27jekO+ 3CXZZs8D+AlNTg1f6wE9lg5/n8zCfuGJiewlpG1FHDydFbGdN4WdxkUIvg0F3aETqp5J ET2oNtVeVDxnb0O4V0rQMfMlYZ97AI9EiDXvtsYQGzYtjEEwiy+rx97jjRHT/UCq5pwx FpLN4zv8W9vBQW596/Sv1unqq81QhhYDgGzDM/oxjMYfgJba+ZZvbwA2zr72PuZ2bFI/ sqaaDZBklO/RaPZhhBeDT/Hg4pHyXXGYC5iyzxIHVDv/nhrjFcTwUgd70bFH0e0coAxc bPXQ== X-Gm-Message-State: ALyK8tJbkX3l4pkePfuelevNaAEd9el4qLN8QWICPL4kzr15Ac1pr8k/UbPcy3UzUknkPA== X-Received: by 10.28.150.18 with SMTP id y18mr32609250wmd.83.1468505711025; Thu, 14 Jul 2016 07:15:11 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id a2sm36957837wma.2.2016.07.14.07.15.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jul 2016 07:15:10 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 14 Jul 2016 16:15:04 +0200 Message-Id: <1468505704-17391-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Remove misleading CSR firmware loading docs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP I forgot to remove these when reworking the firmware loading sequence last year. The new sequence is that we load firmware, and if it's not there we entirely (and permanently) fail dmc setup. Reported-by: Dave Gordon Signed-off-by: Daniel Vetter Reviewed-by: Dave Gordon --- drivers/gpu/drm/i915/intel_csr.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index c3b33a10c15c..1ea0e1f43397 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -32,13 +32,6 @@ * onwards to drive newly added DMC (Display microcontroller) in display * engine to save and restore the state of display engine when it enter into * low-power state and comes back to normal. - * - * Firmware loading status will be one of the below states: FW_UNINITIALIZED, - * FW_LOADED, FW_FAILED. - * - * Once the firmware is written into the registers status will be moved from - * FW_UNINITIALIZED to FW_LOADED and for any erroneous condition status will - * be moved to FW_FAILED. */ #define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"