From patchwork Mon May 8 10:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 91051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2065253vqo; Mon, 8 May 2023 04:04:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OsMeBa9YliKMKjsIJKJXTZsgnc0xM8izSStfHY2Cv6D8tLjYkpmN5Zc7ZLCkqNuUDFKg1 X-Received: by 2002:a17:90b:1e51:b0:24e:d06:6912 with SMTP id pi17-20020a17090b1e5100b0024e0d066912mr12530092pjb.18.1683543882347; Mon, 08 May 2023 04:04:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683543882; cv=none; d=google.com; s=arc-20160816; b=M6GR+C7rymZz4dlgbyPCCuqeSIvqDzid3jORCa489ypVfUy1xYXqU7pLaxQz9hmOTK mpl95Jdr0DFRS68qMx6dUk9jBj/a7E5c0RZBx/Hjpp8kz7utyehEZdPaDcdcZswB9aLb 9TUbB+XCUEBUZ7ns342Jrt1blb1Z/QQt6+uaY3oRNM7QGPgReSdPvkoD3fWw8Zkg2GMk duwF4CAhhCX7cTEgLa+8QanSRuQ+jhfLOs1fbmCXdb4y6csVkCqd5Mtr0WpdseMawCce 2p122hCb+gxG92q+LSlxz8N8HB23IxSQ9SRsBuY2hQVTSFVYwEeaUIGuEcfehQd2hw3r 4HjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=D+x6UPkFapUFCRgp8EmleOOtaKQHjt0FTvIoOtvEJ8c=; b=CsvCbs4k4cLX8at5eal0Sgh24DWSjpNnv5rQuGAs4cogtDOjvcFfaPckjUNnb9kyQ8 CUsigjAhWmZLvTwsIZ9fvRN+OM/gr1KwT9Jl3oqgkb0FP5HqcCFCc/Ds27HZfl0Ie/gt G9SzlHIDcBt2PRDUrcaTopnWiYlkSr1aKL1cbF0mPZQzwk7YGafyt8GiTVV9ypSJeGqW NeYJGJa3fzTZk4D6l32Ri4felrBrZgefP0DCX0yx9Og8rEevmiu3AemhY5iIcYJY6Glu u2/Iz/ydcQn84ZDup0INK1dXfagqS/S5SfQxutyjmSyMAAU52IMRqesOQhp96vjGjyOz 3Q1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x9DNmoHf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk6-20020a17090b4a0600b002478bba4da2si1794874pjb.127.2023.05.08.04.04.29; Mon, 08 May 2023 04:04:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x9DNmoHf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234506AbjEHK3z (ORCPT + 99 others); Mon, 8 May 2023 06:29:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234562AbjEHK3l (ORCPT ); Mon, 8 May 2023 06:29:41 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B675D4C07 for ; Mon, 8 May 2023 03:29:39 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2acb6571922so22523801fa.0 for ; Mon, 08 May 2023 03:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683541778; x=1686133778; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=D+x6UPkFapUFCRgp8EmleOOtaKQHjt0FTvIoOtvEJ8c=; b=x9DNmoHffvz9zkyXfNz2/5QNP84c89e2grqLhtW70Ul+DK7SudOXKuS7qhRtjDTV90 zctPufr265A5UcOsAbEa+TAu4LmoL3BYLY/J/yujg9TZAzM5B8jTqoOKZuYB4fbpH5g2 X3ghXIz21oCoM8oxwoCj75m86/E7E8sPgDSi5UgqzWUK1k3Hoi6yqT223N/IBxH2RqSQ Bm/E6mQMUkCRXPJoXqM/5iWsNsFjdGoBuxA/vVwDqhXdBrmanyEyq69YnWhTGkEWbHk3 GQQfDTthdX2iKYbT5qGHTD9NmYZiKBkyDNlyHEiA/3PB3NRrPAUXwO1bvqL4e1E98F6q ScAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683541778; x=1686133778; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D+x6UPkFapUFCRgp8EmleOOtaKQHjt0FTvIoOtvEJ8c=; b=F8lvtO8S3IgBvQRQtp3+nJXdcd7WaAeaXAhtYffikmxryYP2HpijAU4LLlqxUH/6qk A8KPhKCoQBq4lsBUrGtUXHCrFwaEnVpBBK1zbCuRVZVEIaBdFYV2TQ8rssj2cI7psrT+ qvtYiP/GRa67GVS/d6enb7YXZKYk/vFdKcXqquQQJilb5aKmrlDHE7x3OvqCASSf+q5G jiwXK0SOVxyyadn/K+mm0O/km0EzdaotU+GiwMNpY7aRRQmd5dWRjXacKpy2eRgfMQ3L h4oIWI4xkS2ysyoNs4WBUyz4z0sw8feeyrCfhlDesS4pkVxzY8J8VWii6au4W9nVuut0 fLag== X-Gm-Message-State: AC+VfDyPlLelfvdXsOaSqV6kQyOSEprNQXM7mxyHRHUcCYwMiHi2JgfX Fm/6K5nxzmodFiqli/+XIgCYFQHCMddygkDl0k8= X-Received: by 2002:a2e:b61b:0:b0:2a7:8b35:8270 with SMTP id r27-20020a2eb61b000000b002a78b358270mr2914716ljn.35.1683541778035; Mon, 08 May 2023 03:29:38 -0700 (PDT) Received: from [192.168.1.101] (abyl248.neoplus.adsl.tpnet.pl. [83.9.31.248]) by smtp.gmail.com with ESMTPSA id w5-20020a2e9985000000b002ad8fc8dda6sm547230lji.17.2023.05.08.03.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 03:29:37 -0700 (PDT) From: Konrad Dybcio Date: Mon, 08 May 2023 12:29:32 +0200 Subject: [PATCH] drm/msm/dpu: Set DPU_DATA_HCTL_EN for in INTF_SC7180_MASK MIME-Version: 1.0 Message-Id: <20230508-topic-hctl_en-v1-1-0f8b5df60ed5@linaro.org> X-B4-Tracking: v=1; b=H4sIAAvPWGQC/x2N0QrCMAwAf2Xk2ULdUIy/IiJpjDZQstFuMhj79 wUf7+C4DZpUlQb3boMqP206msP51AFnsq8EfTtDH/shXuItzOOkHDLP5SUWBkoJEenKiOBNoiY hVTLOXtlSisupykfX/+Tx3PcDIbuao3QAAAA= To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Kalyan Thota , Shubhashree Dhar , Raviteja Tamatam Cc: Marijn Suijten , Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1683541776; l=1453; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=0xMxdhEkVRQ4tosyFddMHyURiJ2JW3BVZyyPB80D7FU=; b=UXLtqK0g6TOe8dOVFKhJB+Ssr8/cqY2ihdagjOKGWJg2LMrp0OIaCr02aMw7UXqQl/G38cbGY 7qBA7bdZbzzDTotoYkoFNw3gO+nLQUlHBNeDKCqfLjMf06A8xLCJTV1 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765323710301968086?= X-GMAIL-MSGID: =?utf-8?q?1765323710301968086?= DPU5 and newer targets enable this unconditionally. Move it from the SC7280 mask to the SC7180 one. Fixes: 7bdc0c4b8126 ("msm:disp:dpu1: add support for display for SC7180 target") Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov --- Depends on: https://lore.kernel.org/linux-arm-msm/20230405-add-dsc-support-v2-0-1072c70e9786@quicinc.com/ --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- base-commit: c47189dee0decd9ecc1e65ae376ad6d4b0b7f1f2 change-id: 20230508-topic-hctl_en-3abb999a6c99 Best regards, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 27420fc863d6..7ea8fd69d5fd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -98,9 +98,12 @@ #define INTF_SDM845_MASK (0) #define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL) | BIT(DPU_INTF_TE) | BIT(DPU_INTF_STATUS_SUPPORTED)) + (BIT(DPU_INTF_INPUT_CTRL) | \ + BIT(DPU_INTF_TE) | \ + BIT(DPU_INTF_STATUS_SUPPORTED) | \ + BIT(DPU_DATA_HCTL_EN)) -#define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_DATA_HCTL_EN) | BIT(DPU_INTF_DATA_COMPRESS) +#define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_INTF_DATA_COMPRESS) #define WB_SM8250_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \