From patchwork Sun Oct 8 17:55:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 149766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1471786vqo; Sun, 8 Oct 2023 10:56:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjrq4lxqRERziFjBu/zQzeomAC4tTlIEixrzQsetn6cLuY+FJ+QChR4fxzYZA+MxQl11vP X-Received: by 2002:a05:6358:2605:b0:12b:e45b:3fac with SMTP id l5-20020a056358260500b0012be45b3facmr13284486rwc.32.1696787811852; Sun, 08 Oct 2023 10:56:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696787811; cv=none; d=google.com; s=arc-20160816; b=mIWqvaipWX5olC483lEoDJcU7UIDb57+gYX/2YeGiXUQq+zznYuL1TXjqnSLCMF8oP LaUkxDbfsOaeQk0gLTjOEQB6EyoSqdy8xloSzfeJzgfGpWIF8FBD/Ys/FiwHWigsBibA AcHnF9WhK7w6hwDqSQV7f9DxqdEa5dxpVPGmVUOyHO6QOWZkurCf2Uvw/OqklMpDaIus EbaWdupNpoSSpXiXBabaq0mlRdGZxpWBjRnSjbp6MI7IFeFw+kWy9uSs1dF9j6qwZK8I umkcPJtSQf+KZ1WdThJlepGSDgyFIkwaKlpxzlT5Z1eJegttaymYnD8BCzaWF30w7BlK DQ7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vzldSszU6MMY3+BPZFEE+sdPY1rkhW3V7SWMFRFvi3c=; fh=79vtCKiyy+Ue9ueRQIY/oYvBeePNOa2MaRbbV+6PNJY=; b=Vey9xqtzTzo68ZZZDv2BtMCajEodSUXru1K9HXMHnCjF3SLpjFJQCjpGnLtz3G5cP8 9FrN6l4aGXNPtWwQdluEjiDcri/dRfv1s/gEvZxY5cxNAXBenX+sFEy8BaIUkLrW/L3a Ek1SzfRCjVKAD4m/wrIv1XAHIpCjdXHYu46CaVdYWdkERX+LWrALiWxnCy/HQ3ZuJPWK d7vtpjMwxkrTCRo3xhTOq42PF/ChEobUSDyHnMEEgffpzVFTH1LsVOgLRyM5s3hd7Nce sIwORSNUkVJFpe+WqYYromTG3HbrBQdtuORSHnxT8AiwvUkMb4pOEu+8N/r9FaqzZaS1 x1BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LuLjpACP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id z14-20020a17090a1fce00b0026818f6a0c0si5463737pjz.86.2023.10.08.10.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 10:56:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LuLjpACP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3053F80C7747; Sun, 8 Oct 2023 10:56:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231167AbjJHR43 (ORCPT + 19 others); Sun, 8 Oct 2023 13:56:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234247AbjJHR41 (ORCPT ); Sun, 8 Oct 2023 13:56:27 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 735EFD8; Sun, 8 Oct 2023 10:56:25 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-68bed2c786eso2836444b3a.0; Sun, 08 Oct 2023 10:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696787785; x=1697392585; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vzldSszU6MMY3+BPZFEE+sdPY1rkhW3V7SWMFRFvi3c=; b=LuLjpACPCYI8Guxl6SnOjTWhvCbqtI3wzAn2vcSc0itj28/k6wkYxXdYWs85+L3i0i 0rleRL4yG+rXtaVDsCwAItvqpo+6rHmUim+f0rjcm9eqqj+rg6CdDAzin6ZrlFs7PFtW 1tOFb8GO1QzmPSR90gQFupwLCS88ZioSquHSVaWuXzy0RCxAjVZd3aOzR60VMPDVxreG h5lpxcrv52mNwVEkGcjXnQui7KZV7ylKB3Up4cpkKoVKrHbSRVvsF6ixWFXx69Xbv1fV aYzMS8DC+qLOcb5vSrHcvnMuwFcni5I8zTVOvhYajpZ4blC5DfJCVmr0bGb9lWQhJvnh /0+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696787785; x=1697392585; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vzldSszU6MMY3+BPZFEE+sdPY1rkhW3V7SWMFRFvi3c=; b=NClYvx0aYYObJgwVITRbEAkJMlf+wx2u3mfKwinNGkYKrAczAyBfI4sSgO6IjTLvyP ETjWzZDQVnqGYM151Ea1IRLdag8VBvI6E+CZerqQS8ZkJlUHQT7U9Sf0nmzJJtmefpNf 9Mht8QbWsz8AuAisxJ3Ny+lMl9Nz7h/CXshIueGmeJnDA/qUqLHQC6ttTUMve8kEpvp9 KKeR6ouOnIGVgkwSGYFlOCrviUPaK7A9lb76YoseI26HTTUpMcUcS60A6DN+7b1t+1on n72tPM1+F/GBG5+/CfgGKovgKgW8UShE9/gZJTdApuEcO9Axya+WeE0TR9vr8BmvVmTP 2vhw== X-Gm-Message-State: AOJu0YwByoT/u4jq2sBpczpLtetg1UP6+eSJqwvJG98JtdEf9wNzhg5j DQrjr4lNO0yKExxCbnITi3E= X-Received: by 2002:a05:6a21:a5a7:b0:15d:721e:44d5 with SMTP id gd39-20020a056a21a5a700b0015d721e44d5mr15053674pzc.49.1696787784604; Sun, 08 Oct 2023 10:56:24 -0700 (PDT) Received: from localhost (c-73-37-105-206.hsd1.or.comcast.net. [73.37.105.206]) by smtp.gmail.com with ESMTPSA id jb17-20020a170903259100b001c8836a3795sm7741992plb.271.2023.10.08.10.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 10:56:23 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Helen Koike , Rob Clark , David Airlie , Daniel Vetter , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , Tomeu Vizoso , Daniel Stone , Vinod Polimera , Kalyan Thota , Jiasheng Jiang , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/msm/dpu: Use the encoder for default CRC source Date: Sun, 8 Oct 2023 10:55:59 -0700 Message-ID: <20231008175615.413497-1-robdclark@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 08 Oct 2023 10:56:49 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779210976210387051 X-GMAIL-MSGID: 1779210976210387051 From: Rob Clark i-g-t expects the CRC to reflect any applied CTM. But the layer mixer source is upstream of the DSPP, so it is before the CTM is applied. Switch the default source to 'encoder' instead so that the CRC is captured downstream of the DSPP. Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt | 4 ---- drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 5 ----- drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 11 +---------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 +++--- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt index faf2702c223f..a51950746443 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt @@ -1,10 +1,6 @@ kms_cursor_legacy@cursor-vs-flip-toggle,Fail kms_cursor_legacy@cursor-vs-flip-varying-size,Fail kms_cursor_legacy@cursorA-vs-flipA-atomic-transitions,Crash -kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Fail -kms_plane_alpha_blend@alpha-7efc,Fail -kms_plane_alpha_blend@coverage-7efc,Fail -kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail kms_plane_alpha_blend@pipe-A-alpha-7efc,Fail kms_plane_alpha_blend@pipe-A-coverage-7efc,Fail kms_plane_alpha_blend@pipe-A-coverage-vs-premult-vs-constant,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt index 612f7e822c80..327039f70252 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt @@ -1,7 +1,2 @@ # Suspend to RAM seems to be broken on this machine .*suspend.* - -# Test incorrectly assumes that CTM support implies gamma/degamma -# LUT support. None of the subtests handle the case of only having -# CTM support -kms_color.* diff --git a/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt index ba36b92e3325..3d53c53a0659 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt @@ -1,20 +1,11 @@ kms_color@ctm-0-25,Fail kms_color@ctm-0-50,Fail -kms_color@ctm-0-75,Fail kms_color@ctm-blue-to-red,Fail kms_color@ctm-green-to-red,Fail kms_color@ctm-negative,Fail kms_color@ctm-red-to-blue,Fail kms_color@ctm-signed,Fail -kms_color@pipe-A-ctm-0-25,Fail -kms_color@pipe-A-ctm-0-5,Fail -kms_color@pipe-A-ctm-0-75,Fail -kms_color@pipe-A-ctm-blue-to-red,Fail -kms_color@pipe-A-ctm-green-to-red,Fail -kms_color@pipe-A-ctm-max,Fail -kms_color@pipe-A-ctm-negative,Fail -kms_color@pipe-A-ctm-red-to-blue,Fail -kms_color@pipe-A-legacy-gamma,Fail +kms_color@ctm-max,Fail kms_cursor_legacy@basic-flip-after-cursor-atomic,Fail kms_cursor_legacy@basic-flip-after-cursor-legacy,Fail kms_cursor_legacy@basic-flip-after-cursor-varying-size,Fail diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 8ce7586e2ddf..5eacf19382b5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -79,10 +79,10 @@ static enum dpu_crtc_crc_source dpu_crtc_parse_crc_source(const char *src_name) if (!src_name || !strcmp(src_name, "none")) return DPU_CRTC_CRC_SOURCE_NONE; - if (!strcmp(src_name, "auto") || - !strcmp(src_name, "lm")) + if (!strcmp(src_name, "lm")) return DPU_CRTC_CRC_SOURCE_LAYER_MIXER; - if (!strcmp(src_name, "encoder")) + if (!strcmp(src_name, "encoder") || + !strcmp(src_name, "auto")) return DPU_CRTC_CRC_SOURCE_ENCODER; return DPU_CRTC_CRC_SOURCE_INVALID;