From patchwork Thu Jan 5 10:12:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1721766 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=po1eKS+Y; 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 4Nnj2H13vHz23fC for ; Thu, 5 Jan 2023 21:12:22 +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 1pDNEJ-00067M-V6; Thu, 05 Jan 2023 10:12:11 +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 1pDNEI-000675-Pr for kernel-team@lists.ubuntu.com; Thu, 05 Jan 2023 10:12:10 +0000 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (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 2CD074431A for ; Thu, 5 Jan 2023 10:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1672913530; bh=Gn8ee3QAzkVWG/EyYElKtcADYvTcGQxwXbhrI6eLAbA=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=po1eKS+YCJ0tdkL2xkW0sclqHR8UY7Bz+CwW8q33QskatvZh5bloZkNJtS3G6HQqv R4s9/hw0k4scAgnERGPkcvxUZu6qkl59qYhKySOb/ebyChFczVCSnZHo1kTXCIiUqB DRbfq6npCVoM1U6OjbSMEOqQvg8xx6XDEM/UMwy4XmiQZuwjryfC86aqIJ/LoLQU+S 94zXKOPeBKnSxKG8NRyA3R1CBgMewmQddxRWjeE8X7b6S1pfnv7KYTuQQzEG7k0ZGN /DkDWASI5s71NUkN1Gp366y3HMIwatz6Nzm2MJLb4Swo2kUtvjHiIJOdY184g0wuAB D5FBqbTWKA3eA== Received: by mail-pf1-f197.google.com with SMTP id z62-20020a623341000000b005809a4c70efso15371851pfz.0 for ; Thu, 05 Jan 2023 02:12:10 -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:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Gn8ee3QAzkVWG/EyYElKtcADYvTcGQxwXbhrI6eLAbA=; b=bpYdDyDkzy1DyLodvX8D2a0lB4F2wPKEDPamTbLx3KURpVvASji/P/4EAQW9t4QdKg OBgKWITDxRnHT0d9kxtHn5x2374kYcbdqGBn6n6bVKIBGaLcEkNbu2Xi15QfXQvJu6lD hUACuLGQ9JaAppZW4lbBNxonpyDypDQduhC88V8MnEWbOjKkgdarxaNPsLAzESx0i+F2 5uKj0sNTlv8rXVC+OuOfGUmLEWhC/bYdYWiAe+FX4aHaWKm6VRTwFqM394BXB3iz95lR Kof8qSSSscZszmursVxwteTlpapvP/YLMUOUCYXszMkdF2uc6NP3tG+/NnTAtpyc3IJ6 HCEw== X-Gm-Message-State: AFqh2kpiwI4tL46lqdtPlc0hOYhXBW/7kQb1i9r09ZtRE3xFSZ3M884+ meM3y2s9gU2hahQukHFTiO6RWgP7cl5+30QrrFxIk8pZEfhxfjaec2olBQ8RujHabwMyuiKiBwl 0KG3/5HXv4HuX9DgEubd7DVHSluwUEnn5L1x0qVSZgg== X-Received: by 2002:a62:ee0e:0:b0:578:f6f:efab with SMTP id e14-20020a62ee0e000000b005780f6fefabmr57371180pfi.11.1672913527245; Thu, 05 Jan 2023 02:12:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXvBH0n1s2j7s6avbuPVjpBvdw949Us+S6cNQUNQ69i8Rz4FSsaaQJQa6NuCh7LjBVPloVTqpg== X-Received: by 2002:a62:ee0e:0:b0:578:f6f:efab with SMTP id e14-20020a62ee0e000000b005780f6fefabmr57371153pfi.11.1672913526658; Thu, 05 Jan 2023 02:12:06 -0800 (PST) Received: from canonical.com (2001-b011-3007-da1c-417b-2019-6636-4f9d.dynamic-ip6.hinet.net. [2001:b011:3007:da1c:417b:2019:6636:4f9d]) by smtp.gmail.com with ESMTPSA id q6-20020a655246000000b004468cb97c01sm21921674pgp.56.2023.01.05.02.12.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 02:12:05 -0800 (PST) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][SRU][U/OEM-6.1] UBUNTU: SAUCE: drm/i915/display: Drop check for doublescan mode in modevalid Date: Thu, 5 Jan 2023 18:12:01 +0800 Message-Id: <20230105101203.287382-1-koba.ko@canonical.com> X-Mailer: git-send-email 2.34.1 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 Since the DP/HDMI connector do not set connector->doublescan_allowed, the doublescan modes will get automatically filtered during drm_helper_probe_single_connector_modes(). Therefore check for double scan modes is not required and is dropped from modevalid functions for both DP and HDMI. Signed-off-by: Ankit Nautiyal (cherry picked from https://patchwork.freedesktop.org/series/109773/#rev2) Signed-off-by: Koba Ko --- drivers/gpu/drm/i915/display/intel_dp.c | 3 --- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 3ed7eeacc706b..41f0cf64ba5f7 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -962,9 +962,6 @@ intel_dp_mode_valid(struct drm_connector *_connector, enum drm_mode_status status; bool dsc = false, bigjoiner = false; - if (mode->flags & DRM_MODE_FLAG_DBLSCAN) - return MODE_NO_DBLESCAN; - if (mode->flags & DRM_MODE_FLAG_DBLCLK) return MODE_H_ILLEGAL; diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index ebd91aa69dd20..bdda7e38ab733 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1986,9 +1986,6 @@ intel_hdmi_mode_valid(struct drm_connector *connector, bool has_hdmi_sink = intel_has_hdmi_sink(hdmi, connector->state); bool ycbcr_420_only; - if (mode->flags & DRM_MODE_FLAG_DBLSCAN) - return MODE_NO_DBLESCAN; - if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) clock *= 2;