From patchwork Fri Nov 26 02:26:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 519680 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp1729664imj; Thu, 25 Nov 2021 18:26:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwp11b8fhKKmSwkwg2dv+Y1AV7rfCUjU+wgitpwxLAJGURBU3Pzui0ndtcApkkH6H9Nj7Qs X-Received: by 2002:a63:ce46:: with SMTP id r6mr18939017pgi.132.1637893619252; Thu, 25 Nov 2021 18:26:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637893619; cv=none; d=google.com; s=arc-20160816; b=n+BP6jTKlVEhkBTZyZwe2InZ1c++zNbUZWioRvB86gIDi+VFyb3cS75I/AP9eRADoL dcuhOuIKyM64pVVaGqpsLrlHwZYZ8pj/7qmQkkUp6UE39UgQ+iHHp0TdO2RySXw8F8c+ eHiVW9nSUdRsNc9q3R9uothL47htwVVRkanWpOGH2mKhUsmVsrAYIEVEfIv/b2ZqLxdu I9rHHMzqXbf8lo+BzY8MiI7wCn60z+3zMLOdjUOM2H8jbuUD2KRG0cVjiGOJiSyNochW 03IhsfuJamtczjHQWVYH79vTM2ORgNWhYg/v8eelZR6HvZ0wjs8yt4B77Ad4VZhLutRl VT0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=SjvwkpUPVxTN10HZUyOLDN4iEgATg5pex/yAH6C4wmk=; b=Y9h6ZGNtZk7hjJtUkHvcQ5ft+htNow2xEmZK2gd6X3tl1ufM8BWmeI/USWODOdI0Lu OSeo9CSEt4ThIBuw1CW4KNJCtty4BxrQ/CCe/Sym94PRGty3oy0APJ6y23g0bIHBV3hy Wjwq4MHh2GrKzMZpCKivXyaWCnQ2zrIE2iqs5nzE2oVRPNoNPAW/VTGnjWec45KfOMcs ZCUaS3dHcRUKWynefatB2v7+VaS71ofMj7kfU8SnVHwZeNA4kOVjZ/4723BqR4mINBbr 0PKQ1bBn/ETe3yABnv60C1os4Uko9pyrIfMUW2cXrwPOp0AL/GnIOYQQErtgx0X27+Fs h5nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bE6gsDYc; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id p36si7002667pgl.349.2021.11.25.18.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 18:26:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bE6gsDYc; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 273486E4B5; Fri, 26 Nov 2021 02:26:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 808576E466 for ; Fri, 26 Nov 2021 02:26:48 +0000 (UTC) Received: by mail-lf1-x133.google.com with SMTP id k37so20547309lfv.3 for ; Thu, 25 Nov 2021 18:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SjvwkpUPVxTN10HZUyOLDN4iEgATg5pex/yAH6C4wmk=; b=bE6gsDYcf3HpAMDe676F6s2AZyX7DtcqPXEUlAEp6XnSdElSjkBnJBq0zqFDuut5NT /+PV5yNx84b/VA0JbKoPCRepkemTp0gswj7w4CVkUkVVpwSuI9VNwvu3lYRMVLSKPSab tE/wAy9BNwefirBNHBpaaHUXFi0sL7f4zP4DVm2M+SmdzsDqqbkyv1fyf61GiEJPk09e b8bKM6lmldKzdrmHIm05TZmjvKTq8OFJ3FVAubMxvnIWrn/+vY8ZgZwMnRE0k7igRDy4 l7BbKxTXTiMM5676Xj9eDn7vUgVIeBQHLE46ZNKlElFKGiHdTs2tiVYYLO1axY41Jtiw 44AA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=SjvwkpUPVxTN10HZUyOLDN4iEgATg5pex/yAH6C4wmk=; b=haK8NMjpKG2k/aDlpf1i+oKTAh9UeVhSE2lPaARlXCuBXHxWhbklJKb2Wmz30U0Rjs SHX6VzUyQRHAdh2HXu/mr9Sc40Q6UefVv4qKy1BB1vUne2CkGcl1Ga43kYV22imuiSI2 vuz3jd7H/2+XK+5tZdXxn4fGqBpa09uXGrPBKRAa/3UiG/J9A49KFoDzeUZwnL+ubYeX EGDZoRqSuReTjKUHeU1Df1isqc9zTg0+nU8jU5H8JgRwkYfrau38RGgWPBUWLMNPADnr 30CNOsP+e+uLzWt+UOSbU/5cXWbZXFs1rQ1zTBRz0cXbe7EUb3L4SxmrlAX+b/AVmcD3 obAQ== X-Gm-Message-State: AOAM531ujvdYsnD3TUy7H60IDY1VtXesq/sfzGI9/3/vTd3y0rsprDGS JW4V/El+/Nknr5Sv8toRO1A59g== X-Received: by 2002:a05:6512:3f86:: with SMTP id x6mr26665606lfa.616.1637893606803; Thu, 25 Nov 2021 18:26:46 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id x6sm388764lff.125.2021.11.25.18.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 18:26:46 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v3 3/3] drm/msm/dpu: drop unused lm_max_width from RM Date: Fri, 26 Nov 2021 05:26:42 +0300 Message-Id: <20211126022642.1105979-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211126022642.1105979-1-dmitry.baryshkov@linaro.org> References: <20211126022642.1105979-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" No code uses lm_max_width from resource manager, so drop it. Instead of calculating the lm_max_width, code can use max_mixer_width field from the hw catalog. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 12 ------------ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 4 ---- 2 files changed, 16 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index d8d3f87a0ed2..bb69dcf2c13a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -105,18 +105,6 @@ int dpu_rm_init(struct dpu_rm *rm, goto fail; } rm->mixer_blks[lm->id - LM_0] = &hw->base; - - if (!rm->lm_max_width) { - rm->lm_max_width = lm->sblk->maxwidth; - } else if (rm->lm_max_width != lm->sblk->maxwidth) { - /* - * Don't expect to have hw where lm max widths differ. - * If found, take the min. - */ - DPU_ERROR("unsupported: lm maxwidth differs\n"); - if (rm->lm_max_width > lm->sblk->maxwidth) - rm->lm_max_width = lm->sblk->maxwidth; - } } for (i = 0; i < cat->merge_3d_count; i++) { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h index 27afe55f1f55..90f5d1d9844f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h @@ -19,8 +19,6 @@ struct dpu_global_state; * @mixer_blks: array of layer mixer hardware resources * @ctl_blks: array of ctl hardware resources * @dspp_blks: array of dspp hardware resources - * @lm_max_width: cached layer mixer maximum width - * @rm_lock: resource manager mutex */ struct dpu_rm { struct dpu_hw_blk *pingpong_blks[PINGPONG_MAX - PINGPONG_0]; @@ -28,8 +26,6 @@ struct dpu_rm { struct dpu_hw_blk *ctl_blks[CTL_MAX - CTL_0]; struct dpu_hw_blk *dspp_blks[DSPP_MAX - DSPP_0]; struct dpu_hw_blk *merge_3d_blks[MERGE_3D_MAX - MERGE_3D_0]; - - uint32_t lm_max_width; }; /**