Message ID | 20191217145020.14645-10-andrzej.p@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=gpLF=2H=lists.freedesktop.org=dri-devel-bounces@kernel.org> 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 3B1BB13B6 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 17 Dec 2019 14:52:42 +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 22D1024655 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 17 Dec 2019 14:52:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22D1024655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com 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 8BD3C6EA02; Tue, 17 Dec 2019 14:52:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3F436EA07 for <dri-devel@lists.freedesktop.org>; Tue, 17 Dec 2019 14:52:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id C4548292765 From: Andrzej Pietrasiewicz <andrzej.p@collabora.com> To: dri-devel@lists.freedesktop.org Subject: [PATCHv5 09/34] drm/komeda: Explicitly require 1 plane for AFBC Date: Tue, 17 Dec 2019 15:49:55 +0100 Message-Id: <20191217145020.14645-10-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217145020.14645-1-andrzej.p@collabora.com> References: <20191213173350.GJ624164@phenom.ffwll.local> <20191217145020.14645-1-andrzej.p@collabora.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: Ayan Halder <Ayan.Halder@arm.com>, kernel@collabora.com, David Airlie <airlied@linux.ie>, Liviu Dudau <liviu.dudau@arm.com>, Sandy Huang <hjc@rock-chips.com>, Andrzej Pietrasiewicz <andrzej.p@collabora.com>, James Wang <james.qian.wang@arm.com>, Mihail Atanassov <mihail.atanassov@arm.com>, Sean Paul <sean@poorly.run> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> |
Series |
Add AFBC support for Rockchip
|
expand
|
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index 7004c3c8f8de..c0bc499a9c29 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -169,6 +169,11 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, info = kfb->base.format; if (kfb->base.modifier) { + if (info->num_planes != 1) { + DRM_DEBUG_KMS("AFBC requires exactly 1 plane.\n"); + kfree(kfb); + return ERR_PTR(-EINVAL); + } ret = komeda_fb_afbc_size_check(kfb, info, file, mode_cmd); } else { if (komeda_fb_check_src_coords(kfb, 0, 0, kfb->base.width,
Apparently komeda silently assumes that there is only 1 plane in an AFBC buffer. Make this assumption explicit. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> --- drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | 5 +++++ 1 file changed, 5 insertions(+)