From patchwork Fri Feb 10 06:30:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1740270 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=tv8HoV+N; 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 4PCkQf2snBz23hX 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 1pQMw9-0004h6-CC; Fri, 10 Feb 2023 06:31:09 +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 1pQMw7-0004fO-7A for kernel-team@lists.ubuntu.com; Fri, 10 Feb 2023 06:31:07 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 B1EF73F126 for ; Fri, 10 Feb 2023 06:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1676010666; bh=d74WPaff9sbqlg9HxcxNfT3u5pqPeLf88MtVadEGPzo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tv8HoV+NxtAAc90kj3tRHFf45q4lAH1o85HUStcumX0IDErxZ8qSCEle7a2YybhEb 5ErFSeeoFnyc8k8HSYByMPs8P5Nqf52RK3fYEfqnDW3iowWw7oCVkq9X+zgvNk79s5 AP7r53Gw1keK9Z1hes2mhBiPpQ3rZdvM6+1lyTTleKvUy9ka+Q7nHfz8mDfoGbeUO/ fqKgZ8H81AO6mJDAELFRvy3UpsqWXTLt3AxbBqNpeRdOFQOkxf0nl5w9vscR7xMJU9 +bgP8AbvJNgeKLyUMX4y3RWrN/huGEc0X7zzp3VIFPD4ULxOpO7VaSd2ksH/Oup8K8 e3hvzK4myetlA== Received: by mail-pg1-f200.google.com with SMTP id c15-20020a63ea0f000000b004fb3ed8a500so2145308pgi.10 for ; Thu, 09 Feb 2023 22:31:06 -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=d74WPaff9sbqlg9HxcxNfT3u5pqPeLf88MtVadEGPzo=; b=aNq4UQ49xuv2BSySmBwxcnmNc0ho6r3Z+aRM7nT+SvGQm/Odvamt47o0hMZOmmFFg2 YszO8zMqSOfNP/R0K17MUa4dQ1hQNO7JIxCjiYiWIqZC/2AA0eYtxXevoUo2WUPXq6s3 19H3aDzkBsYilCur41u97LivTWhr+jCvSfsy+/mUIlVb/K/ZgR6sgQv0yVxHtUCnVK4H xu2KlwZ8yM1oruAkid0RNfoXR0MA08qlfLZQMforj2HJS9bPLsn0xZzn5rFkBVdHBttW l91GGwaS6AUVbSSdFoXnGi32EQMQ4ECd+iN7zckXvFKwGI/NzqlicNig2LI4vL0cqa4c LhCw== X-Gm-Message-State: AO0yUKUx8w7u/mVw+ja+I9Zcc97b11ZoMMhHUfbfbE0cSN0/ih1DzLco u/ETh8Qb1/x/qt7TfwD7/Gs5hP44l6N2tm6nBHjYUgezTJebFlGww29i9GcttAW0x4gdNOeaWt7 IRjOUn2eQvfBTn1cgD/aARXSng2MlbEPZF7o56VKHtuOdjOA= X-Received: by 2002:a17:903:1d2:b0:199:1c9e:bfa8 with SMTP id e18-20020a17090301d200b001991c9ebfa8mr17066542plh.38.1676010664610; Thu, 09 Feb 2023 22:31:04 -0800 (PST) X-Google-Smtp-Source: AK7set8eMho5HhQSD+7njAEiv1OXWeTPT0YYGczBCASGTwad1Dcw8Jj0bJTM0Tyh0YvRcYvozvPXVA== X-Received: by 2002:a17:903:1d2:b0:199:1c9e:bfa8 with SMTP id e18-20020a17090301d200b001991c9ebfa8mr17066522plh.38.1676010664244; Thu, 09 Feb 2023 22:31:04 -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 p10-20020a170902a40a00b0019663238703sm2570929plq.109.2023.02.09.22.31.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:31:03 -0800 (PST) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][SRU][J] drm/i915/display: Prune Interlace modes for Display >=12 Date: Fri, 10 Feb 2023 14:30:55 +0800 Message-Id: <20230210063055.1193675-4-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 (backported 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 6aca93556b4dc..4097721ec779f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1661,7 +1661,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 (!intel_connector->base.interlace_allowed && adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) return -EINVAL; @@ -4904,7 +4904,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 aac35ba6aaa03..999c1821d750e 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2194,6 +2194,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); @@ -2885,9 +2889,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;