From patchwork Mon Apr 20 13:34:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shankar, Uma" X-Patchwork-Id: 11498921 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 84992913 for ; Mon, 20 Apr 2020 13:06:12 +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 6C6B520735 for ; Mon, 20 Apr 2020 13:06:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C6B520735 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 D63516E550; Mon, 20 Apr 2020 13:06:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 834936E550 for ; Mon, 20 Apr 2020 13:06:11 +0000 (UTC) IronPort-SDR: K5eMdIFtu2xkTPfnMXUXT2gAVmA/7zD59MTLq5TUJwLo3IYMiLqycdW3H2uXrreHHo7YnaZUqz NlFcMCgILutg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2020 06:06:11 -0700 IronPort-SDR: Qol7vwuhujDOlTjzrv5EKdnaR52itphhMvVjur6pOtAdApffKE46mJo3tfHI1RkXi0i8VlBf2q bQkfpMNeqpjw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,406,1580803200"; d="scan'208";a="258337353" Received: from unknown (HELO linuxpresi1-desktop.iind.intel.com) ([10.223.74.152]) by orsmga006.jf.intel.com with ESMTP; 20 Apr 2020 06:06:08 -0700 From: Uma Shankar To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Apr 2020 19:04:25 +0530 Message-Id: <20200420133425.30289-1-uma.shankar@intel.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/display: Fixed kernel taint in audio codec init X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kai.vehmanen@intel.com, chris-wilson.co.uk@freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This patch fixes a kernel taint on non DSC DP monitors. Fixes: 48b8b04c7 ("drm/i915/display: Enable DP Display Audio WA") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1750 Signed-off-by: Uma Shankar --- drivers/gpu/drm/i915/display/intel_audio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 2663e71059af..0ff7c3f07fa5 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -606,7 +606,7 @@ static void enable_audio_dsc_wa(struct intel_encoder *encoder, h_active = crtc_state->hw.adjusted_mode.hdisplay; if (!(h_active && crtc_state->port_clock && crtc_state->lane_count && - crtc_state->dsc.compressed_bpp && i915->cdclk.hw.cdclk)) { + i915->cdclk.hw.cdclk)) { drm_err(&i915->drm, "Null Params rcvd for hblank early enabling\n"); WARN_ON(1); return; @@ -620,8 +620,9 @@ static void enable_audio_dsc_wa(struct intel_encoder *encoder, val |= HBLANK_EARLY_ENABLE_TGL(pipe); if (crtc_state->dsc.compression_enable && + crtc_state->dsc.compressed_bpp && (crtc_state->hw.adjusted_mode.hdisplay >= 3840 && - crtc_state->hw.adjusted_mode.vdisplay >= 2160)) { + crtc_state->hw.adjusted_mode.vdisplay >= 2160)) { /* Get hblank early enable value required */ hblank_early_prog = get_hblank_early_enable_config(encoder, crtc_state);