Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2680954imj; Mon, 11 Feb 2019 06:57:54 -0800 (PST) X-Google-Smtp-Source: AHgI3IacQNmdK24nANWnuivH56HRZe5CGGK57ZWzWmxAn6iD9rrMsImHP3jVxjaJCHB9Xnt7OaQA X-Received: by 2002:a17:902:6941:: with SMTP id k1mr15253629plt.195.1549897074328; Mon, 11 Feb 2019 06:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549897074; cv=none; d=google.com; s=arc-20160816; b=q5hHQNbobDs0xv8WRX1klZOBwEtAebrLS+NSQT9xF5QAkpiZVDF5B/F1seLKyV+j6m IzHZb0R0gNAQXid8A1t4G9K7PoV5yINH3Wa4ZvUaqIG1nYpCNg9v+LvedJkB3i5sh+En ea0gDTvvKBujy2A/kbbj04hHsnc9P5+CP8WNqCNvOyNSFgjNWzyOyAXNhchSh3UOFHVU uyDJwGcIl9XlD1Hu4EritwD+2gXhQ8aojz/5Bs4WCQ7haX6IIdZpQ+cGoLIogOFIHfWx 8znNYVJ6hmerQas8eYyENocrILoEflbjfhSaa7oa0VPbFCZGJr2FMJeB+j99SGm6f1E6 wecw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7MZQeiwcnqQbYJgJa09+ZSfQmZaMNYCcFJ53sU6iS8U=; b=Dd9jxOCLz038a9wlUgJuZqun/SJYqYGjvLZNHDrB3wLsNss4n+Z/h94VUZQ/8Hiy7w zIMaoPwbjVwk6sj4T1Fi3oD2aAPZtOriLMVvAIcRIkd9q1A25+bySYmaS3hM86tZG8O8 JIFyAoS1ICdcs8rcOEb6SCFcYXgykYtj9ofKadc68bclS1n680xtrnz2jyBj3OcVlpq+ k0cbvj935bZcY9tQXlhbD9KzrHSsHS9EGl4vzVk6/IdSevFZtPJFpKo+TvZDf18mUcVF yocyZqBK11LdMSq05t9sglXvqkm04FIdC4eFUeXtLWH+Nm+toa3ZxNzOmWZNuN+NIqhN 6tRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hLeDLtT8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p22si9763849pgl.340.2019.02.11.06.57.38; Mon, 11 Feb 2019 06:57:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hLeDLtT8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389227AbfBKO4m (ORCPT + 99 others); Mon, 11 Feb 2019 09:56:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:43872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389201AbfBKO4j (ORCPT ); Mon, 11 Feb 2019 09:56:39 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF3112229E; Mon, 11 Feb 2019 14:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896998; bh=X3pmFbiQEK9U2GuB5TIFcbf6HFeG/BPj0q0dreQXlJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLeDLtT8xKUR97K84Qwp78xmQ+lfti6Piv3o0tTSGzD5ue1eHJv2wBfnN168CHHeg 6Nv2AzF8J8a22jK2wmZzIC0ECRCh4Qs9o5marxf5gF2FeU0U685uWsogpygALKSWof S3JA/RxsGVnbzDtRVxobLPxksBAMc0zHUfGruk18= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Brezillon , Eric Anholt , Sasha Levin Subject: [PATCH 4.14 017/205] drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE Date: Mon, 11 Feb 2019 15:16:55 +0100 Message-Id: <20190211141828.283144773@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ] For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens. The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment). Fixes: fc04023fafec ("drm/vc4: Add support for YUV planes.") Signed-off-by: Boris Brezillon Reviewed-by: Eric Anholt Link: https://patchwork.freedesktop.org/patch/msgid/20181109102633.32603-1-boris.brezillon@bootlin.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 5bd3c2ef0067..6277a3f2d5d1 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -347,12 +347,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) vc4_get_scaling_mode(vc4_state->src_h[1], vc4_state->crtc_h); - /* YUV conversion requires that horizontal scaling be enabled, - * even on a plane that's otherwise 1:1. Looks like only PPF - * works in that case, so let's pick that one. + /* YUV conversion requires that horizontal scaling be enabled + * on the UV plane even if vc4_get_scaling_mode() returned + * VC4_SCALING_NONE (which can happen when the down-scaling + * ratio is 0.5). Let's force it to VC4_SCALING_PPF in this + * case. */ - if (vc4_state->is_unity) - vc4_state->x_scaling[0] = VC4_SCALING_PPF; + if (vc4_state->x_scaling[1] == VC4_SCALING_NONE) + vc4_state->x_scaling[1] = VC4_SCALING_PPF; } else { vc4_state->is_yuv = false; vc4_state->x_scaling[1] = VC4_SCALING_NONE; -- 2.19.1