From patchwork Tue Nov 12 14:38:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 11239571 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 9FF5914E5 for ; Tue, 12 Nov 2019 14:38:09 +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 872192067B for ; Tue, 12 Nov 2019 14:38:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 872192067B 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 29C386EB2F; Tue, 12 Nov 2019 14:38:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B8026EB2F for ; Tue, 12 Nov 2019 14:38:08 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 06:38:08 -0800 X-IronPort-AV: E=Sophos;i="5.68,296,1569308400"; d="scan'208";a="198098012" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 06:38:06 -0800 From: Jani Nikula To: Jani Nikula , intel-gfx@lists.freedesktop.org Date: Tue, 12 Nov 2019 16:38:02 +0200 Message-Id: <20191112143802.27227-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH] drm/i915/bios: change slice count check 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" FIXME: fixup to original. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_bios.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 522c399753fe..cdd30eeda7be 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2260,11 +2260,9 @@ static void fill_dsc(struct intel_crtc_state *pipe_config, * * Also, per spec DSI supports 1, 2, 3 or 4 horizontal slices. */ - if (dsc->slices_per_line & BIT(2) && - pipe_config->hw.adjusted_mode.crtc_hdisplay % 4 == 0) { + if (dsc->slices_per_line & BIT(2)) { pipe_config->dsc.slice_count = 4; - } else if (dsc->slices_per_line & BIT(1) && - pipe_config->hw.adjusted_mode.crtc_hdisplay % 2 == 0) { + } else if (dsc->slices_per_line & BIT(1)) { pipe_config->dsc.slice_count = 2; } else { /* FIXME */ @@ -2274,6 +2272,12 @@ static void fill_dsc(struct intel_crtc_state *pipe_config, pipe_config->dsc.slice_count = 1; } + if (pipe_config->hw.adjusted_mode.crtc_hdisplay % + pipe_config->dsc.slice_count != 0) + DRM_DEBUG_KMS("DSC hdisplay %d not divisible by slice count %d\n", + pipe_config->hw.adjusted_mode.crtc_hdisplay, + pipe_config->dsc.slice_count); + /* FIXME: rc_buffer_block_size, using defaults in intel_vdsc.c */ /* FIXME: rc_buffer_size, using defaults in intel_vdsc.c */