From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C1831F7560; Tue, 3 Dec 2024 15:07:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238459; cv=none; b=dAZaS+CkH/GK7qdNc5vTRa9O9x8UKPqRQFLk9DEHn/4d7tDsxBLi2yJ9+VPZ6TJfsFRlMVZlOUBt7/WRo+f3zPxzfv/EDFW7EK7+YIiqvdUcgVGkaGuLkjHJeldbRgxblwO/Ezf+HLacV7/1p/PMVSd8BYe/k/o/fVY1LpzNQzI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238459; c=relaxed/simple; bh=FzKHRwArrEtrlS9QW0CDn7BzYiZQbbIXiGq2Hv2Vc6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=reyRxmjGQQUgT127W6f3nzcZ0a7YpwYb+pUqhVhkvu/1wqyEzi+oD9QaqMFDAnlSGXUevuUCyAQbQBiX1Wlj69s00XwtdmN0P57ofZ0PB30krJTYcMXSsY7JOr/2WZ6MIUgsQ9OtTvJxbJ8ohnLZ7cokDwpaJuV3Y00Q69CgSKI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SurjCit8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SurjCit8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECECDC4CED6; Tue, 3 Dec 2024 15:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238459; bh=FzKHRwArrEtrlS9QW0CDn7BzYiZQbbIXiGq2Hv2Vc6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SurjCit8x3fMPOXVpX8P7fESrw4SLlos8WsrXkJ/9QzuoRq4ev6nlymbqQgavuabw vsOAgGRJb1PKVvNPBfmLQ5hVL4oMumSDJ5p5OAGcPYZcVWZFmt8tHAAwOjHPi0QAp0 yIMT5pGGJfCXFxL9N98f/A2tuJpObKrD/GphNCpE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abhinav Kumar , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 6.11 285/817] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 Date: Tue, 3 Dec 2024 15:37:37 +0100 Message-ID: <20241203144006.933995995@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit c59afe50773d5c972f6684f9bbd9a2ddb2fb92fa ] On the MSM8998 platform ther are no LM_3 and LM_4 blocks. Drop them from the MSM8998 catalog. Fixes: 94391a14fc27 ("drm/msm/dpu1: Add MSM8998 to hw catalog") Reported-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar Patchwork: https://patchwork.freedesktop.org/patch/612585/ Link: https://lore.kernel.org/r/20240905-dpu-fix-sdm845-catalog-v1-3-3363d03998bd@linaro.org Signed-off-by: Sasha Levin --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 1d3e9666c7411..64c94e919a698 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h @@ -156,18 +156,6 @@ static const struct dpu_lm_cfg msm8998_lm[] = { .sblk = &msm8998_lm_sblk, .lm_pair = LM_5, .pingpong = PINGPONG_2, - }, { - .name = "lm_3", .id = LM_3, - .base = 0x47000, .len = 0x320, - .features = MIXER_MSM8998_MASK, - .sblk = &msm8998_lm_sblk, - .pingpong = PINGPONG_NONE, - }, { - .name = "lm_4", .id = LM_4, - .base = 0x48000, .len = 0x320, - .features = MIXER_MSM8998_MASK, - .sblk = &msm8998_lm_sblk, - .pingpong = PINGPONG_NONE, }, { .name = "lm_5", .id = LM_5, .base = 0x49000, .len = 0x320, -- 2.43.0