From patchwork Thu Jul 15 07:11:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1505559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: 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=e0uuO8W0; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GQQXN2fHVz9sWw; Thu, 15 Jul 2021 17:11:31 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m3vWl-0001Zb-Pq; Thu, 15 Jul 2021 07:11:23 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m3vWj-0001Z2-Bu for kernel-team@lists.ubuntu.com; Thu, 15 Jul 2021 07:11:21 +0000 Received: from localhost (1.general.khfeng.us.vpn [10.172.68.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 52431409F4 for ; Thu, 15 Jul 2021 07:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626333081; bh=ytSVe7TEk/XA2dw0QNe57596P3YMwKEh+fY8F/McpiM=; h=From:To:Subject:Date:Message-Id:MIME-Version:Content-Type; b=e0uuO8W08sJogLA2IZb4yI7tYO9Tp3IPKEaPozrXP8hQy7B/+pppfbbgoQMIM52QZ wyObqZRuJOeGJn/LoilL1qrHf57IedJ2f72cWe8SK+hbLokxh+MsJ8ZaRrLquezqT7 hEL/bGyBkGULcZDUMB31/EIV/Q9+ZTVe1ssMjvBFLxaxiX+RBqCLpFvHEqDDbp5Yen i1fOJn9v+t3v1U7z+OfkwBro36usCnk/XjyuJY4MR/aKQ8HMwdopXDGJii6QIwvNDN U0/4+WvhqzUWXzifkI9OCeXqy0sMue7zNBBw2RxQwMJeq871415t7tduXcaUo038gT jqOny+CpPBlEg== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [SRU] [H/I/OEM-5.10/OEM-5.13] [PATCH 0/1] Fix display output on HP hybrid GFX laptops Date: Thu, 15 Jul 2021 15:11:15 +0800 Message-Id: <20210715071116.1426823-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.31.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" BugLink: https://bugs.launchpad.net/bugs/1936296 [Impact] Video output MUX switched from Intel GPU to Nvidia GPU after S3, so display settings are lost. [Fix] Always use Nvidia GPU to do the video output. This matches the behavior on the other OS. [Test] Connect and external monitor, and change the scaling factor or resolution, suspend the laptop. After wakeup, the custom monitor setting is kept. [Where problems could occur] If nvidia.ko or nouveau.ko is blacklisted, the video output may stop working, as it's now routed away from i915 device. Kai-Heng Feng (1): drm/i915: Invoke another _DSM to enable MUX on HP Workstation laptops drivers/gpu/drm/i915/display/intel_acpi.c | 19 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_acpi.h | 3 +++ drivers/gpu/drm/i915/display/intel_opregion.c | 3 +++ 3 files changed, 25 insertions(+) Acked-by: Tim Gardner Acked-By: AceLan Kao Acked-By: AceLan Kao Acked-by: Stefan Bader