From patchwork Tue Aug 27 23:14:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Summers, Stuart" X-Patchwork-Id: 11117607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 514F11398 for ; Tue, 27 Aug 2019 23:13:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B17D214DA for ; Tue, 27 Aug 2019 23:13:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B17D214DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4692E89BF1; Tue, 27 Aug 2019 23:13:43 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2963F89BF5 for ; Tue, 27 Aug 2019 23:13:42 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Aug 2019 16:13:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,439,1559545200"; d="scan'208";a="185444178" Received: from jssummer-xeon.ra.intel.com ([10.23.184.90]) by orsmga006.jf.intel.com with ESMTP; 27 Aug 2019 16:13:41 -0700 From: Stuart Summers To: Date: Tue, 27 Aug 2019 16:14:34 -0700 Message-Id: <20190827231435.398-2-stuart.summers@intel.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190827231435.398-1-stuart.summers@intel.com> References: <20190827231435.398-1-stuart.summers@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915: WARN rather than BUG with unexpected media engines X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Instead of preventing driver load when media engines enabled for a platform do not match the fuse values for those media engines, WARN_ON to indicate the observation but continue with driver load. Signed-off-by: Stuart Summers --- drivers/gpu/drm/i915/intel_device_info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index d9b5baaef5d0..caef01b1da23 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -1023,7 +1023,7 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv) } DRM_DEBUG_DRIVER("vdbox enable: %04x, instances: %04lx\n", vdbox_mask, VDBOX_MASK(dev_priv)); - GEM_BUG_ON(vdbox_mask != VDBOX_MASK(dev_priv)); + GEM_WARN_ON(vdbox_mask != VDBOX_MASK(dev_priv)); for (i = 0; i < I915_MAX_VECS; i++) { if (!HAS_ENGINE(dev_priv, _VECS(i))) @@ -1036,5 +1036,5 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv) } DRM_DEBUG_DRIVER("vebox enable: %04x, instances: %04lx\n", vebox_mask, VEBOX_MASK(dev_priv)); - GEM_BUG_ON(vebox_mask != VEBOX_MASK(dev_priv)); + GEM_WARN_ON(vebox_mask != VEBOX_MASK(dev_priv)); }