From patchwork Sun May 26 11:36:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10961447 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0A25912 for ; Sun, 26 May 2019 11:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8548228765 for ; Sun, 26 May 2019 11:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7350E28A9D; Sun, 26 May 2019 11:37:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA95928765 for ; Sun, 26 May 2019 11:37:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8DE689A67; Sun, 26 May 2019 11:37:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DBFE89A67 for ; Sun, 26 May 2019 11:37:16 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id z1so6806474ljb.3 for ; Sun, 26 May 2019 04:37:16 -0700 (PDT) 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=ENe0KZSJgieNsuFnRJ0MAE/wEgNku6S8dXunWnDiTw0=; b=eBgx1KhEWb8RqxqZqfKLZZCDVL7H7gNN8Yulws0+jXy9+CuyKEjuLw/u56aLYZZi4I t+ZowLO97dia7Z0XeSNrX978n78Xvlg7tVZGahZhm9J8DdjBhhAz9BcrSFeNsAcCjS0M pgXmEFHgp9bKKSKKAQTYZBM54Lg7hUCqwqLQMgnye2Rm0ogIafRpLJ+CjG+dD66zKSAT xUB5e0z/1k6tqulWt3PVseE5z4MV8VCXUAm2j7/iEkC621GYaji1zTmNAyqe4F6IBZ8J mT1bNmbu8MGsivBtcjfRbe9LAdPZZLkDzl5y7z/HZBmo/4IMlg++vEq/UZKYl5LhnBHT DS9A== X-Gm-Message-State: APjAAAVXfseX8BGDvxZMrxV1QCotcLKu1LwobYYfStRpz18+xIRmWgzB TJzY4BpX4D6b8NtNBZBJvLB+OdvHM0Y= X-Google-Smtp-Source: APXvYqyLCBzrnfxox32B1WVTk7L4w4p624IEa/8tYm1iQKE9sydDYhmZPI2hrOuGoT+5mw38KPx8cA== X-Received: by 2002:a2e:6817:: with SMTP id c23mr35594104lja.145.1558870634391; Sun, 26 May 2019 04:37:14 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-d2cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.210]) by smtp.gmail.com with ESMTPSA id x27sm1612630ljm.52.2019.05.26.04.37.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 26 May 2019 04:37:12 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/mcde: Fix compile problems Date: Sun, 26 May 2019 13:36:24 +0200 Message-Id: <20190526113624.6702-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ENe0KZSJgieNsuFnRJ0MAE/wEgNku6S8dXunWnDiTw0=; b=P1FveNHKs2XWkv9cbXT0oAKGv9AgWRCSRHkvi+sB0+M2laxTN6mla8+BfhUsUWpg9M lC9EenGMepirxq9cl+L0NcI3GOc8nkcC9slYnsg24w7pwacYBTBpfcussomVRcVbksaI K0JN5kdgMRJdPo3PbZ3aar70J5Xaq43tRB1+HuVgVHOwDriYv4mxV7f/JOIzpqGW4tYw rHDT27u2Xvk7xjqcJkjqr8qfyJvvO5QPEW3OxFUReryJHLN1JrpQY5X2tfMMh7u5wl7j biQXC/4conrfX/VMhOyw6vl3uWONgNEc3EPFdNJ7tWPTnUnCjpllGMb5KWlTDYiZsFPE GHlw== 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: Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sam Ravnborg Some further compile problems appeared while merging the patch, fix them up. Signed-off-by: Sam Ravnborg Signed-off-by: Linus Walleij --- drivers/gpu/drm/mcde/mcde_display.c | 2 +- drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index 17dc46d554b0..f3ef108a41d9 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -823,7 +823,7 @@ static void mcde_display_enable(struct drm_simple_display_pipe *pipe, u32 formatter_ppl = mode->hdisplay; /* pixels per line */ u32 formatter_lpf = mode->vdisplay; /* lines per frame */ int pkt_size, fifo_wtrmrk; - int cpp = drm_format_plane_cpp(format, 0); + int cpp = fb->format->cpp[0]; int formatter_cpp; struct drm_format_name_buf tmp; u32 formatter_frame; diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 456b43482448..07f7090d08b3 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -191,7 +191,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, } dev_dbg(d->dev, - "message to channel %d, %u bytes", + "message to channel %d, %zd bytes", msg->channel, txlen);