From patchwork Wed Dec 13 15:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 121784 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5620619qgn; Wed, 13 Dec 2017 07:33:45 -0800 (PST) X-Google-Smtp-Source: ACJfBotP10ohthO1YcXao1/sV+OwexEpPC4Et9762cZmgdpFtO4+A0OPGrGA5iIDF9tyc2vSUdgk X-Received: by 10.99.170.77 with SMTP id x13mr5745068pgo.117.1513179225330; Wed, 13 Dec 2017 07:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513179225; cv=none; d=google.com; s=arc-20160816; b=qPpckaob7xT9zhGd5sda80jdBMm7K3B95qJhA+1PZMEt8OD7VQgma78lO8IudxqNMM 8J4+OCu1L+W8i1i+ouwA72oGFuINHsyQ5WMbyD2jRDY9xHWW0phZEZavEBvEgxLaqp3l hC7fY5iZmnyJJGHD5JcrU6uPuTukaDBSueTC3DbWbnl58udpLXgj7VGwPaKoxHvWSRXU MMDsOG1+ElL1HVmAySkV2n+C175PfcFfZDXY7u/Z+jN8kMJILkHvpclTJTCqLOlRN/PV AjiVmllAo/a3mY+8ZuwrqAVF/PtBzBCmsNj9VJpyYUvKtRGA/YdW1URcCpYcVlePOJO/ 0B4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=eeyP8AT2UU4NsismrWv0hUJzP/QzCEe81vYe+icIDQQ=; b=lbv0ETRA9WX+xV6G+GRaboorswe+HEtQj3x56KFm7+a2etwuRHcltAKgztRohBOAKq 75bg5euVjkF2vTlrX8GC5sleyL9JXjKC0oxwX4x+2DFu+1sqaSWMfJDmenu0Mv/T35nu bH3S0P6A6T89hym5SEHN3WBUOlL67u1qlDoG0z2LJF1uC27GBHSc5Sq6f/qx/kNYh0KB 6fhueDPt8Iasd6sbUA2km3DVfJJecGB/HFPZk2INNKBPo8Hpsmb4cOBPAxIhiYov7GM6 aKSeKc454HFsQprG8xrGE9Ny9osWsA/rBU1EcjJU2bAqhGHrFroKYPoZ3rHrCDVeepW2 1QnQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id q1si1503943plr.363.2017.12.13.07.33.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 07:33:45 -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; 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 Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A1DB56E513; Wed, 13 Dec 2017 15:33:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id AD56F6E50D for ; Wed, 13 Dec 2017 15:33:39 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 770E320810; Wed, 13 Dec 2017 16:33:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4E2C020503; Wed, 13 Dec 2017 16:33:38 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 2/8] drm/sun4i: backend: Allow a NULL plane pointer to retrieve the format Date: Wed, 13 Dec 2017 16:33:26 +0100 Message-Id: <6a1686760e61baa9f21fd2f12e56a8de92eb1714.1513178989.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, thomas@vitsch.nl X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The function converting the DRM format to its equivalent in the backend registers was assuming that we were having a plane. However, we might want to use that function when setting up a plane using the frontend, in which case we will not have a plane associated to the backend's layer. Yet, we still need to setup the format to the one output by the frontend. Test for NULL plane pointers before referencing them, so that we can work around it. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c index c99d1a7e815a..f971d3fb5ee4 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.c +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c @@ -93,7 +93,7 @@ void sun4i_backend_layer_enable(struct sun4i_backend *backend, static int sun4i_backend_drm_format_to_layer(struct drm_plane *plane, u32 format, u32 *mode) { - if ((plane->type == DRM_PLANE_TYPE_PRIMARY) && + if (plane && (plane->type == DRM_PLANE_TYPE_PRIMARY) && (format == DRM_FORMAT_ARGB8888)) format = DRM_FORMAT_XRGB8888;