From patchwork Mon Jan 17 08:38:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Tang X-Patchwork-Id: 12714986 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DDBE7C433F5 for ; Mon, 17 Jan 2022 08:38:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C9C110E361; Mon, 17 Jan 2022 08:38:39 +0000 (UTC) Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92FE110E3DE for ; Mon, 17 Jan 2022 08:38:37 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id t18so20494870plg.9 for ; Mon, 17 Jan 2022 00:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f3dMb3L6alEHiAdLanjhoWI6FKkNSSFPHoeSh767vk0=; b=lVmAx9LIJmnrwluVwigCccYGNdJ3TijZkDjlw/Q2z3yxktk3EFUQ+7TjP9eL/X1q4p thm8OwOcBOiLNi4Wa+fzi3vPk6xUT0hI+uxjRRyisbi8SPOi1y/O+zXB25xPoDFNRDFI Ig3EeRAsck/F6GwjrZkSV0GJq3FN9dvJ57fMbLVU857fl8pNyGNezQjVZAMDsuYFImg0 y7eGDcQc8atsOp+DylHX5YJJjksxqCOMe+ZbBy4IIUM6NnPGyhHPBmm/XBOFry5RmL/J 6o/OeD1dM0+uXfOmCJKSRZzjF4vcWI6LJ6T/4djB4tr60/PHw13EPiyRHSCMAs+w6ofT +bug== 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=f3dMb3L6alEHiAdLanjhoWI6FKkNSSFPHoeSh767vk0=; b=JrEqALzCEM0bzGAeE5nBuWoefLAHHTLipxx8hmv4c/KLJcG/LGBiF/VMyh9mWQcG8c pTyu4bX9sSeSYoDacAAz0w2lbBkSHqAD6DMc+YmdainqGPmuf3ovNVVnq7jTwdGwC1m2 SQWofjJZy9ew+DLkxcAJbpRa0zQN9XEmEOcg3WrzZwcYb7YzEpAHnxpgH9i2xb4RK51z BGxQwDMo/bc9dpQ92DpHgDrCQWUIQpU/u42cYsRhpgGcnkmx/8nT6AEwBO95mBsNSmUO GKdByXhMWLYhIjiIQcrk/Xs1v1W4/1s0r2ODoA1tMsJ73fgx4Ep0WhTl8HfZydBkDvHF DDXQ== X-Gm-Message-State: AOAM5319SbumLvxDylb8jDK/hm5NBg4bLKSSuLsq3VdTeih8oXgDINNK k5SRq0EanoWP3ojwM4CAmIw= X-Google-Smtp-Source: ABdhPJwqtjOW+jcPjrQBChZw59j+MKfYUcjzeqZtqLvQ0rh9JvbLq/1phu/gffQa8KpYOdtz5L+EPw== X-Received: by 2002:a17:90b:38c1:: with SMTP id nn1mr9329697pjb.224.1642408717272; Mon, 17 Jan 2022 00:38:37 -0800 (PST) Received: from nj08008nbu.spreadtrum.com ([103.6.5.6]) by smtp.gmail.com with ESMTPSA id pg9sm7260181pjb.44.2022.01.17.00.38.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jan 2022 00:38:36 -0800 (PST) From: Kevin Tang To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, mark.rutland@arm.com, javierm@redhat.com, tzimmermann@suse.de, lukas.bulwahn@gmail.com Subject: [PATCH v2 1/3] drm/sprd: remove the selected DRM_KMS_CMA_HELPER in kconfig Date: Mon, 17 Jan 2022 16:38:18 +0800 Message-Id: <20220117083820.6893-2-kevin3.tang@gmail.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20220117083820.6893-1-kevin3.tang@gmail.com> References: <20220117083820.6893-1-kevin3.tang@gmail.com> 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: devicetree@vger.kernel.org, kevin3.tang@gmail.com, zhang.lyra@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, orsonzhai@gmail.com, zou_wei@huawei.com, pony1.wu@gmail.com, dan.carpenter@oracle.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On commit 43531edd53f0 ("drm/sprd: add Unisoc's drm kms master"), adds the config DRM_SPRD, which selects DRM_KMS_CMA_HELPER. However, commit 09717af7d13d ("drm: Remove CONFIG_DRM_KMS_CMA_HELPER option") just removed the DRM_KMS_CMA_HELPER. So the select DRM_KMS_CMA_HELPER refers to a non-existing kconfig symbol. Reported-by: Lukas Bulwahn Signed-off-by: Kevin Tang Reviewed-by: Javier Martinez Canillas Acked-by: Thomas Zimmermann Reviewed-by: Lukas Bulwahn v1 -> v2: - fix commit comments long lines issue and drop "On linux-next" comments --- drivers/gpu/drm/sprd/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/sprd/Kconfig b/drivers/gpu/drm/sprd/Kconfig index 3edeaeca0..9a9c7ebfc 100644 --- a/drivers/gpu/drm/sprd/Kconfig +++ b/drivers/gpu/drm/sprd/Kconfig @@ -3,7 +3,6 @@ config DRM_SPRD depends on ARCH_SPRD || COMPILE_TEST depends on DRM && OF select DRM_GEM_CMA_HELPER - select DRM_KMS_CMA_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI select VIDEOMODE_HELPERS From patchwork Mon Jan 17 08:40:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Tang X-Patchwork-Id: 12714987 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 240AAC433FE for ; Mon, 17 Jan 2022 08:41:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 352AF10E3F2; Mon, 17 Jan 2022 08:41:03 +0000 (UTC) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5802710E3D0 for ; Mon, 17 Jan 2022 08:41:02 +0000 (UTC) Received: by mail-pl1-x62e.google.com with SMTP id c3so20546044pls.5 for ; Mon, 17 Jan 2022 00:41:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BEtzxmnMM6Tm4aFw5dyzl7Dg82zrHDn+xLKCSqcIoYA=; b=BZoX3xjzmctBGdLOcR11a7mx2a7G4JSQKkCEsd1DEAWP237u5GCSv9nlsVkLCatXR0 5CQmYevH5xmHtOf9XE9BOJJZU0R1WNFSlKLue7aU+bHtIozo34kbZ5jp62JAUooIOCE+ mvB5bGwdlLyAmazE6sCyNOsSoIqH8KCD7OBHTlxZtqeY2/wVZBlY6mkdko+QMWTviSns 1HXzL9gP+EnsuY6dbKFhtQqit01ts+nIGF+aa954ja2A1kDb6krSsMlEGGmaDAvYXAE/ F5j8iaN8yaDAL9mqsG9bUE7Ksp52819NVVF//7rt/q0PAp+xGQONraWH6UQpW1bNoFdU YxBQ== 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=BEtzxmnMM6Tm4aFw5dyzl7Dg82zrHDn+xLKCSqcIoYA=; b=Rd/YM+je4mkoc6xJkk6E8DwKwUYP3+OZe2fpWnj6MdXzshBI3Mx10A3WaVeMAcMQoF UcfY86FRHpMRdLWpp7fP9BYrb3N1EopxSnzqNczBLJpSl3tvdqVHjsHvcRxA9mFDmX4j 22Ri9mpT9QpT2FOWkXF7/AHFdF4db43CdaNwnlDvwsReuIiab8aSUWITKDoRRhycZBBf nc0UzbEwepIxTy3GL83KP32aJau7mf0rxNuJin736LieOB7dBDdR1KqEfVnj72WR+RdS W+2l8O91MPwxbWdEH7pGUA/rh3mrCZIZZq7aQT49a2YcgUeRk4IP1XvtqBj1iQsgFxjk o5nw== X-Gm-Message-State: AOAM5328l2fYYx8QA0RWhrMj3pgVhGeShl5hPHAr7aq0H4W2gj/M5rLf HusYoUV1g6dDq8uUm8HfdQw= X-Google-Smtp-Source: ABdhPJyKUf4iLLOgGSynqegS/pHGDCtLdascpbGORC9N0SwxRb5unf7azIBgzWg08E/buvKorUGnBw== X-Received: by 2002:a17:90b:3884:: with SMTP id mu4mr16707808pjb.82.1642408862007; Mon, 17 Jan 2022 00:41:02 -0800 (PST) Received: from nj08008nbu.spreadtrum.com ([240e:47b:800:d5d1:d9c9:3c3f:6ba3:517a]) by smtp.gmail.com with ESMTPSA id a9sm12673695pfo.169.2022.01.17.00.40.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jan 2022 00:41:01 -0800 (PST) From: Kevin Tang To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, mark.rutland@arm.com, javierm@redhat.com, tzimmermann@suse.de, lukas.bulwahn@gmail.com Subject: [PATCH v2 2/3] drm/sprd: fix potential NULL dereference Date: Mon, 17 Jan 2022 16:40:44 +0800 Message-Id: <20220117084044.9210-1-kevin3.tang@gmail.com> X-Mailer: git-send-email 2.29.0 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: devicetree@vger.kernel.org, kevin3.tang@gmail.com, zhang.lyra@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, orsonzhai@gmail.com, zou_wei@huawei.com, pony1.wu@gmail.com, dan.carpenter@oracle.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 'drm' could be null in sprd_drm_shutdown, and drm_warn maybe dereference it, remove this warning log. Reported-by: Dan Carpenter Signed-off-by: Kevin Tang Reviewed-by: Javier Martinez Canillas Acked-by: Thomas Zimmermann v1 -> v2: - Split checking platform_get_resource() return value to a separate patch - Use dev_warn() instead of removing the warning log --- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sprd/sprd_drm.c b/drivers/gpu/drm/sprd/sprd_drm.c index a077e2d4d..af2be97d5 100644 --- a/drivers/gpu/drm/sprd/sprd_drm.c +++ b/drivers/gpu/drm/sprd/sprd_drm.c @@ -155,7 +155,7 @@ static void sprd_drm_shutdown(struct platform_device *pdev) struct drm_device *drm = platform_get_drvdata(pdev); if (!drm) { - drm_warn(drm, "drm device is not available, no shutdown\n"); + dev_warn(&pdev->dev, "drm device is not available, no shutdown\n"); return; } From patchwork Mon Jan 17 08:41:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Tang X-Patchwork-Id: 12714988 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5EFA5C433F5 for ; Mon, 17 Jan 2022 08:42:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80D5B10E3F4; Mon, 17 Jan 2022 08:42:07 +0000 (UTC) Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id D5ECF10E3D0 for ; Mon, 17 Jan 2022 08:42:06 +0000 (UTC) Received: by mail-pl1-x635.google.com with SMTP id b3so11444272plc.7 for ; Mon, 17 Jan 2022 00:42:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5onbuFYOFRTdmiOefhelTPb1vtwXuvBGEeko4zL+Gus=; b=lTFBGVb3VI9Pp2XzCX2o8oK0JNGpsLGozrM3M1pjfrgUTyKilWjfe018znEQQv00kV uCJ9mZYr2imldsl/X7kKLT/qOTkXfTGSVPjsHAj0hnD5X0jhxQF6pY8Vin51SsJOmeFH M79mBIFgVl02iGw6F8gXajYURE5fbTboA6l6Qctc8hRcIdEsAqLNzvPTvnLVJlIa2K2w P4aFuwve2uJhkrbDpOESzn8uZUoZdO1BaVxYm5yvxvGRCXcf/QNl9pSPUJ1axlU7jpA6 IK9On/cYQtiTwawot8vSXJ7AjbBUGfq/B3vtkjSBgMVRtncEg0OqgxJ6T+Am3FQ1FO7E DFAw== 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=5onbuFYOFRTdmiOefhelTPb1vtwXuvBGEeko4zL+Gus=; b=mXxR8sU9IryH0PRrlj5IBmkLjt7wwKOaL+qvzaMNN+Ff4n0bdI8z8d4INWpzZjwWSs ah/qZU++tBykdKfCeE2Cn7ZWecLktk8MDqSlRX+vZfgswUGsVJZ2zXztAK02CjK9GaXl hkVuhcnedHADVZx48utfEUCtCNJuLxCqEaWEU9UgMFeFhB5DEy7Msgi8JqS/cZaks7cb 3ydO0p0g3Dyq9rYDYw31nyLv4BAYLvbmq2kxQxWxBI0qb/3JugOf8O9PC8HP9BpxrW4A 8cogANjGSJXZth9w9xbWPaOSKS04KgY+uBQSuxPkHE5c7k2UO2U8bMfJlf6xBrMdqY4p L4HA== X-Gm-Message-State: AOAM533fC10KADgvC0a1bd3KDskn9m5wIFcurbRkwegkEhGFcZk+ZXlp yzDPUiQm68PSHWKI+ldSgn4= X-Google-Smtp-Source: ABdhPJyUyt6ygJ1Q5CL/MBBOFkS0XS5iZbCH1+5RzfcHne//TAXKgwCe8S9+NnrYFtBqbf2mb0udFA== X-Received: by 2002:a17:90a:380b:: with SMTP id w11mr23856163pjb.113.1642408926493; Mon, 17 Jan 2022 00:42:06 -0800 (PST) Received: from nj08008nbu.spreadtrum.com ([240e:47b:800:d5d1:d9c9:3c3f:6ba3:517a]) by smtp.gmail.com with ESMTPSA id b7sm6385498pff.61.2022.01.17.00.42.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jan 2022 00:42:05 -0800 (PST) From: Kevin Tang To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, mark.rutland@arm.com, javierm@redhat.com, tzimmermann@suse.de, lukas.bulwahn@gmail.com Subject: [PATCH v2 3/3] drm/sprd: check the platform_get_resource() return value Date: Mon, 17 Jan 2022 16:41:56 +0800 Message-Id: <20220117084156.9338-1-kevin3.tang@gmail.com> X-Mailer: git-send-email 2.29.0 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: devicetree@vger.kernel.org, kevin3.tang@gmail.com, zhang.lyra@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, orsonzhai@gmail.com, zou_wei@huawei.com, pony1.wu@gmail.com, dan.carpenter@oracle.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" platform_get_resource() may fail and return NULL, so check it's value before using it. Reported-by: Zou Wei Signed-off-by: Kevin Tang Reviewed-by: Javier Martinez Canillas Acked-by: Thomas Zimmermann v1 -> v2: - new patch --- drivers/gpu/drm/sprd/sprd_dpu.c | 5 +++++ drivers/gpu/drm/sprd/sprd_dsi.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/sprd/sprd_dpu.c b/drivers/gpu/drm/sprd/sprd_dpu.c index 06a3414ee..1637203ea 100644 --- a/drivers/gpu/drm/sprd/sprd_dpu.c +++ b/drivers/gpu/drm/sprd/sprd_dpu.c @@ -790,6 +790,11 @@ static int sprd_dpu_context_init(struct sprd_dpu *dpu, int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(dev, "failed to get I/O resource\n"); + return -EINVAL; + } + ctx->base = devm_ioremap(dev, res->start, resource_size(res)); if (!ctx->base) { dev_err(dev, "failed to map dpu registers\n"); diff --git a/drivers/gpu/drm/sprd/sprd_dsi.c b/drivers/gpu/drm/sprd/sprd_dsi.c index 911b3cddc..12b67a5d5 100644 --- a/drivers/gpu/drm/sprd/sprd_dsi.c +++ b/drivers/gpu/drm/sprd/sprd_dsi.c @@ -907,6 +907,11 @@ static int sprd_dsi_context_init(struct sprd_dsi *dsi, struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(dev, "failed to get I/O resource\n"); + return -EINVAL; + } + ctx->base = devm_ioremap(dev, res->start, resource_size(res)); if (!ctx->base) { drm_err(dsi->drm, "failed to map dsi host registers\n");