From patchwork Tue Nov 8 04:26:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1701107 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=j7vP01Gg; 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 4N5w6S4L1Hz23mG for ; Tue, 8 Nov 2022 15:26:54 +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 1osGCA-00031Q-7b; Tue, 08 Nov 2022 04:26:42 +0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1osGC7-0002zC-PV for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 04:26:39 +0000 Received: by mail-pl1-f182.google.com with SMTP id v17so13135157plo.1 for ; Mon, 07 Nov 2022 20:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SdPp4/o6kS123q+C/wI7k+gP6PIWyzScsF+T6QMxJB0=; b=j7vP01GgT3nldcd+OCmoRA87oeOuxhp4+mrG/oQEbvGz0DFPN+A30uI4L/UUWLky5J KJwEbZgc0DlG/thMeTyw7Yo/yt20cq5u4uzxOunOQZ7UOPRX1xdMMReZL/VeyEGfeI7/ qQ/qVa+FUUqS488rPu9WFsZIsW+rNjKDR+YmbfJvLd66ScHBqsNlKDeuySwL08cW6qRO wWcditnTbI7ffOSTUCJKfOYy2NdiPYfoJM4KMhKyq1dHmEP/Qv9uLOUPovSlinsITMHk icsvVq6ZKgbADQqK7hOz3XAZ+dXPs86DkbZc7y8+kTuVY9gTZnmK6Trvmyq2WBtRlTnU eH3A== 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:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SdPp4/o6kS123q+C/wI7k+gP6PIWyzScsF+T6QMxJB0=; b=8HJEHSeYE/Vja3EVZsagpxXLmMt2tgY2jH9UsT1MrajDqW1phgVwU398AxzqCwIvYW CSriSIRvMOcHoizdWiQCjM8C1E0ACB1recIc1pYTokyHZI6VDXRmee4kpQb7f+vRa/ut 5vPiyqguRg/6eMR5jOxU8Sq61g1zArI5XNrjFugbIcL5MtK9SEN+siEy879F7F7/UhX/ 5sDYuqC0QF4jCxiYXJJziIvQqmggbT8mgH3A1dL9LZCxcG48pHVXKpiD+ZoBT8AM9vVA eSAzZZorigP5KC26ZR9QCO+L/aC+UUJeb52PfiToQld+crLyRjF5LjEkOGjZWvVhLhd/ LWlQ== X-Gm-Message-State: ACrzQf2UuYC3MdFmUbOqul/UyoS34JFnHUwnIX+AlsBkq4tamwT50vcM NKYwgfii97hwn3Nuva931u8X1tAFrhM= X-Google-Smtp-Source: AMsMyM7E7V/ARsrwxjes3eMCXOlAOzmMflVWgwOIBFHsDTaca9lJIU3wk96t86JLQ4sJ9/VczTQ6CQ== X-Received: by 2002:a17:90b:1b50:b0:213:c304:1d2f with SMTP id nv16-20020a17090b1b5000b00213c3041d2fmr50468132pjb.64.1667881597119; Mon, 07 Nov 2022 20:26:37 -0800 (PST) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id u130-20020a627988000000b0056bb99db338sm5499022pfc.175.2022.11.07.20.26.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 20:26:36 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 0/6][SRU][K][OEM-5.17] Screen cannot turn on after screen off with Matrox G200eW3 [102b:0536] Date: Tue, 8 Nov 2022 12:26:25 +0800 Message-Id: <20221108042634.24176-1-acelan.kao@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.182; envelope-from=acelan@gmail.com; helo=mail-pl1-f182.google.com 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: "Chia-Lin Kao (AceLan)" BugLink: https://launchpad.net/bugs/1995573 [Impact] Screen cannot turn on after screen is off [Fix] Below commit from v6.0-rc1 fixes the issue c577b2f43e80 drm/mgag200: Enable atomic gamma lut update And applied some other commits to fix the conflicts c48a36301634 drm/mgag200: Optimize damage clips 3064debaf55e drm/mgag200: Add FB_DAMAGE_CLIPS support 5913ab941d6e drm/mgag200: Acquire I/O lock while reading EDID 931e3f3a0e99 drm/mgag200: Protect concurrent access to I/O registers with lock e13f13e039dc drm: Add DRM-managed mutex_init() [Tests] Verified on the machine with Matrox G200eW3 [102b:0536] graphics card. [Where problems could occur] The commits to solve the conflicts are trivial, and not likely to introduce regressions. The fix patch change a lot of code and hard to evaluate the risk, but check the latest linus/master tree and linux-next/master tree, there is no fixed commit for all these cherry-picked commits, so should be safe to include them. Jocelyn Falempe (3): drm/mgag200: Optimize damage clips drm/mgag200: Add FB_DAMAGE_CLIPS support drm/mgag200: Enable atomic gamma lut update Thomas Zimmermann (3): drm: Add DRM-managed mutex_init() drm/mgag200: Protect concurrent access to I/O registers with lock drm/mgag200: Acquire I/O lock while reading EDID drivers/gpu/drm/drm_managed.c | 27 ++++ drivers/gpu/drm/mgag200/mgag200_drv.c | 6 + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 169 ++++++++++++++++++------- include/drm/drm_managed.h | 3 + 5 files changed, 157 insertions(+), 49 deletions(-) Acked-by: Tim Gardner Acked-by: Kleber Sacilotto de Souza