From patchwork Thu Jun 2 20:22:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 579047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C1F9C433EF for ; Thu, 2 Jun 2022 20:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238803AbiFBUWP (ORCPT ); Thu, 2 Jun 2022 16:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238711AbiFBUWO (ORCPT ); Thu, 2 Jun 2022 16:22:14 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A296FDD for ; Thu, 2 Jun 2022 13:22:11 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id a2so3417315lfg.5 for ; Thu, 02 Jun 2022 13:22:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RrzI1getV/ADdiH5dGCs6DMyqPDlpomnMlv6FBCfN08=; b=UoLzTlReBPtoSAm60o3euqpY4Sk9mVIPfEcdsDo57kir3+XJYWcH+nq4kFyoQ0U2yw Pm7Kdqb8cOSf8APRE2eeQvhA3NlFxoNTJ82Us66rhtP61vpb3r9QgWo/F6JZoHIXKGq9 4tD4zGGS2gGzdXGEucia2hJYs1llxVPIQyc+4ny3hhv7bfRK9kPM/lNwSluneLbsWgJA MqvrgYxtTBq2Qitlv8x4yEyO1eRfo6svCEzAzqcFfKDGml0hxZD3n6Ol4XRP8AI1urxw KbSGQpMNjo+F+ee5kVmhFS6yURZJPYi0uVWoDgMY+KFHkRYkgJgJ1xvjC/cBRczyuLwK gKAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RrzI1getV/ADdiH5dGCs6DMyqPDlpomnMlv6FBCfN08=; b=E1lkj2/TjYmJMZ+a6ExbUdzu1ViGMZ/UGfZ3mZ+/NR+R1ficNxgFy8sn6Fc6UqqWbI wdRe2vRSLBSKNCsEWfuwojo8jsFucNWBvrG2dLcNeUBlenmtyfjLqAxIXYt+akrcQVql VdoUqGXcSU/I0ixC6JFPkizlRgkDK0NjeebxkaNF9hG7EKn/xZlXriE0P2lr9yz1S555 XNTXXdrOz5GISZYqKeQtr4B+gzeF4bSMNlqDAr+/f+EJUp/myEOkQ2QGUakuHnmaAfc7 ZEN6jbMv8GXKQrzygsJIkvmx1ZJ6lbiwI7Z4xuhrNUVt8judOg9P/6vus+X7i5Pemm/T AAbw== X-Gm-Message-State: AOAM5339F+Izws5lyp2J2u0gaeSoP9T/airYICsQdm185O5ydWGPOKtl KEwAjN/6rLur+DKGr+rqHbjd4orok08YmA== X-Google-Smtp-Source: ABdhPJwEUXwiDUMxztF8zKjhhHhRtlRc54Z4h8FmkgESO7euNGoHEKnRxlJhpUx+2cpKYHKcEnPUvQ== X-Received: by 2002:ac2:555b:0:b0:478:7e7d:1b4 with SMTP id l27-20020ac2555b000000b004787e7d01b4mr37043095lfk.537.1654201329992; Thu, 02 Jun 2022 13:22:09 -0700 (PDT) Received: from eriador.lumag.spb.ru ([94.25.229.139]) by smtp.gmail.com with ESMTPSA id p12-20020a2e740c000000b0024f3d1daef5sm992451ljc.125.2022.06.02.13.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 13:22:09 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v3 0/7] drm/msm: clean up the hw catalog init Date: Thu, 2 Jun 2022 23:22:00 +0300 Message-Id: <20220602202207.1754351-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Replace superfluous cfg_init functions, which just assign a static config to the struct dpu_mdss_cfg, with static instances of struct dpu_mdss_cfg. Changes since v2: - Add DPU_MIXER_COMBINED_ALPHA to sc7180's mixer features mask (noted by Abhinav). Changes since v1: - Turn catalog->perf and catalog->dma_cfg to be pointers, otherwise clang complains that they are not constant. Dmitry Baryshkov (7): drm/msm/dpu: use feature bit for LM combined alpha check drm/msm/dpu: move VBIF_XINL_QOS_LVL_REMAP size to hw_catalog drm/msm/dpu: remove hwversion field from data structures drm/msm/dpu: change catalog->perf to be a const pointer drm/msm/dpu: change catalog->dma_cfg to be a const pointer drm/msm/dpu: constify struct dpu_mdss_cfg drm/msm/dpu: make dpu hardware catalog static const drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 24 +- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 12 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 502 ++++++++---------- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 20 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 1 - .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 5 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 7 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 1 - .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 +- 27 files changed, 283 insertions(+), 359 deletions(-)