From patchwork Mon Nov 18 06:18:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pi-Hsun Shih X-Patchwork-Id: 11249103 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40A081390 for ; Mon, 18 Nov 2019 08:37:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 27D26206A4 for ; Mon, 18 Nov 2019 08:37:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27D26206A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC3366E062; Mon, 18 Nov 2019 08:37:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5AF2589E63 for ; Mon, 18 Nov 2019 06:18:36 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id o9so9163010plk.6 for ; Sun, 17 Nov 2019 22:18:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In3dXboSGxSDc4571/sMxtCG8no6hvyudyiC85O5ndo=; b=tA9WBQdrg2vdQUOliCBtil6FDx/7l6sfhrmLFytlHn4grFUo+dVqCuu9V0ecQfUUwP 1lQrDiTs2qt8fnDv9+wzCe4kjJixx0b640PnKZRZkaElvIdpX63x6q3QKXwNelMPvEo/ hdWARmwqdiA9SefUzTZYVzE88upT3Nmjc01llQiEsyIjM9H5RW/7mWKBSp4zIk0YKjY8 8F8qiwwCCxyrbMa/hDBv4lKZlcxdakln4qu6f8W+4SeezMyn68MdOLduRAsIZTXqp5rS XAey1z+CcLqelZN1oe8jeP8UGImm1PUS3RGE/0FR8c7Zp+OYQdVydqPUk8PpQKD8JckM ZlDA== X-Gm-Message-State: APjAAAW3aaKd0A2wZgzCF4k3rlrHPYgKIZEa+JnTCtxu2uwKOj5jvyl9 3l8OGDb+mRaL5BKhZe325RF/Gw== X-Google-Smtp-Source: APXvYqxnGeAgTQrGlxhEM7cTtw/taIbeaI+NICqi0AiVOjf/RFlGTltFPJg8umDnYkhUrvkNVqGXOw== X-Received: by 2002:a17:902:8f98:: with SMTP id z24mr21453839plo.35.1574057915737; Sun, 17 Nov 2019 22:18:35 -0800 (PST) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id g4sm18589682pfh.172.2019.11.17.22.18.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Nov 2019 22:18:35 -0800 (PST) From: Pi-Hsun Shih To: Subject: [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane. Date: Mon, 18 Nov 2019 14:18:05 +0800 Message-Id: <20191118061806.52781-1-pihsun@chromium.org> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 18 Nov 2019 08:36:58 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In3dXboSGxSDc4571/sMxtCG8no6hvyudyiC85O5ndo=; b=BXpHZhA/xlBopIauk0uUtCcrKTLJpeohwqpkdx+pyeB6cHC23OkMv5szao3WoFQgWG bpGQhs8COapoRUFUUwCikZIhzDyoPIVni7BgFnJxCR8+nXcXKRftiZoiC0dq8IG2LBaL aXBBWuLKQw+ZwkDv48ctSYKopX322s7+2kZLY= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , "moderated list:ARM/Mediatek SoC support" , open list , "open list:DRM DRIVERS FOR MEDIATEK" , Matthias Brugger , Pi-Hsun Shih , Sean Paul , "moderated list:ARM/Mediatek SoC support" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't check for it. Add check for it. Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane") Signed-off-by: Pi-Hsun Shih Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) base-commit: 5a6fcbeabe3e20459ed8504690b2515dacc5246f diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index f80a8ba75977..4c4f976c994e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -310,7 +310,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) plane_state = to_mtk_plane_state(plane->state); comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - mtk_ddp_comp_layer_config(comp, local_layer, plane_state); + if (comp) + mtk_ddp_comp_layer_config(comp, local_layer, + plane_state); } return 0; @@ -386,8 +388,9 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - mtk_ddp_comp_layer_config(comp, local_layer, - plane_state); + if (comp) + mtk_ddp_comp_layer_config(comp, local_layer, + plane_state); plane_state->pending.config = false; } mtk_crtc->pending_planes = false; @@ -401,7 +404,9 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane, struct mtk_ddp_comp *comp; comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - return mtk_ddp_comp_layer_check(comp, local_layer, state); + if (comp) + return mtk_ddp_comp_layer_check(comp, local_layer, state); + return 0; } static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,