From patchwork Fri Feb 10 06:30:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1740272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ah4KNiAw; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PCkQf3Gszz23yH for ; Fri, 10 Feb 2023 17:31:21 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pQMw7-0004fP-5Q; Fri, 10 Feb 2023 06:31:07 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pQMw5-0004f2-7E for kernel-team@lists.ubuntu.com; Fri, 10 Feb 2023 06:31:05 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D15B53F126 for ; Fri, 10 Feb 2023 06:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1676010664; bh=kLJ2/hgjlxopD5j60wDr6aZB01IHFNpkF9fADBIcwU0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ah4KNiAwznokUE0J97yIgyWqgvcGlDM6NdOfoOeSaYLjBuWOAktmmhLNimwa+Fv2Q OdIp7+h2ltphzr4yJ4PFdJ4K98Y0O2uv9zqCKU1J3K6l+Yl02rlFoL5l9NRJFeyzFE jLRPJIfvZfJhgY7f+SMRfn2UgOqSUu0jP9chzGz2XXvY59AgsQeLsVk+YmsWR6PBWr O4UE6RwyowIKk9/pfS1NAD729HA0MGFaNpLW985/QN+lfG4qyUsAJefllLj+f9+PVF tgZpblG26X0XlFqhnFmBLnv8c6Bb9Qm//0vUjgZbc3ccxVwof6MPdxKBSYP2w/rk7C fo4lUVOK8JbIw== Received: by mail-pf1-f198.google.com with SMTP id s8-20020a056a00178800b00593e2189278so2200218pfg.19 for ; Thu, 09 Feb 2023 22:31:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kLJ2/hgjlxopD5j60wDr6aZB01IHFNpkF9fADBIcwU0=; b=un46M/KDHg8ZoAfV6mNbK4DgV64Q2RoAKShVkfBaJzbL1NVdwrXiP1Rr76q+ND/9D0 CCBk7FaXA5gFWn0rzbxcbIToquCPmjHO+uzbifLxizth5aoOourrGe9vh52Ph+WH7p0D O9R9vnzFAi+9tQ269+JTTYgt2caLoUwTIQraqT2C5x1iZ2cxxCCzhmSli7IvLBJ0A12E 4Qz0v/kcvrfVCNAW3SJMrLbpPMGqd3FRupwBwVld1abTLjVW0weOtlT/eyPyCtDuNT47 Lyo9p9K8vDb78j44pVu6RBt5TvueJqSSvqqMme8iLfZy/6AYMaSijCDqvGGKwclAGEVy mBow== X-Gm-Message-State: AO0yUKXO+c2mNTjJK6XFqrEljgIL7N9GSFYJTPJj6WCcgpop+h4O6m8y v4hxiO8Zd+lUjPol1jL22atLscfCotEzQuwWu6/U2e+i7ZsBm+w4AbW7G0JQPa1dlzcmUAw/hOa Ce0KtwVI/UAgryrl7pCF/hLMBcWWYljUgcIWEd/U9XP7DqmA= X-Received: by 2002:aa7:8f2c:0:b0:5a8:663b:a806 with SMTP id y12-20020aa78f2c000000b005a8663ba806mr2427850pfr.16.1676010662772; Thu, 09 Feb 2023 22:31:02 -0800 (PST) X-Google-Smtp-Source: AK7set/bnzQiNDet9NpAiwd7VFtNZN5XveGYukbhkIq7fWuZWSoAXZFRNCJRH6W5ZBNnMSx6NpQ9ow== X-Received: by 2002:aa7:8f2c:0:b0:5a8:663b:a806 with SMTP id y12-20020aa78f2c000000b005a8663ba806mr2427835pfr.16.1676010662187; Thu, 09 Feb 2023 22:31:02 -0800 (PST) Received: from canonical.com (2001-b011-3007-3d69-65d0-077b-a548-5440.dynamic-ip6.hinet.net. [2001:b011:3007:3d69:65d0:77b:a548:5440]) by smtp.gmail.com with ESMTPSA id i20-20020aa78b54000000b00580e3917af7sm2466652pfd.117.2023.02.09.22.31.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:31:01 -0800 (PST) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3][SRU][L/K] drm/i915/display: Prune Interlace modes for Display >=12 Date: Fri, 10 Feb 2023 14:30:54 +0800 Message-Id: <20230210063055.1193675-3-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210063055.1193675-1-koba.ko@canonical.com> References: <20230210063055.1193675-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ankit Nautiyal BugLink: https://bugs.launchpad.net/bugs/1993561 Defeature Display Interlace support. Support for interlace modes is removed from Gen 12 onwards. Pruning the interlace modes for HDMI for Display >=12. Bspec: 50490 v2: Add check for both DP and HDMI. (Ville) Get rid of redundant check for interlace mode in modevalid. (Ville) v3: Simplify the condition to avoid interlace modes. (Jani) Signed-off-by: Ankit Nautiyal Reviewed-by: Jani Nikula Signed-off-by: Uma Shankar Link: https://patchwork.freedesktop.org/patch/msgid/20230105124125.1129653-1-ankit.k.nautiyal@intel.com (cherry picked from commit f71c9b7bc35ff7c1fb68d114903876eec658439b) Signed-off-by: Koba Ko --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/display/intel_hdmi.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 7360effb724eb..a912ef24be11f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1981,7 +1981,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) return -EINVAL; - if (HAS_GMCH(dev_priv) && + if (!connector->base.interlace_allowed && adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) return -EINVAL; @@ -5323,7 +5323,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, drm_connector_init(dev, connector, &intel_dp_connector_funcs, type); drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs); - if (!HAS_GMCH(dev_priv)) + if (!HAS_GMCH(dev_priv) && DISPLAY_VER(dev_priv) < 12) connector->interlace_allowed = true; connector->doublescan_allowed = 0; diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 0cff29ac3c2d1..894973d36d73a 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2234,6 +2234,10 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) return -EINVAL; + if (!connector->interlace_allowed && + adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) + return -EINVAL; + pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; pipe_config->has_hdmi_sink = intel_has_hdmi_sink(intel_hdmi, conn_state); @@ -2943,9 +2947,12 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, ddc); drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); - connector->interlace_allowed = 1; + if (DISPLAY_VER(dev_priv) < 12) + connector->interlace_allowed = true; + connector->doublescan_allowed = 0; - connector->stereo_allowed = 1; + + connector->stereo_allowed = true; if (DISPLAY_VER(dev_priv) >= 10) connector->ycbcr_420_allowed = true;