From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 019/170] drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE Date: Mon, 28 Jan 2019 11:09:29 -0500 Message-ID: <20190128161200.55107-19-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE52B6E507 for ; Mon, 28 Jan 2019 16:12:46 +0000 (UTC) In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Boris Brezillon , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AYm9vdGxpbi5jb20+CgpbIFVw c3RyZWFtIGNvbW1pdCAwNTYwMDU0ZGE1NjczYjI1ZDU2YmVhNmM1N2M4ZDA2OTY3M2FmNzNiIF0K CkZvciB0aGUgWVVWIGNvbnZlcnNpb24gdG8gd29yayBwcm9wZXJseSwgLT54X3NjYWxpbmdbMV0g c2hvdWxkIG5ldmVyCmJlIHNldCB0byBWQzRfU0NBTElOR19OT05FLCBidXQgdmM0X2dldF9zY2Fs aW5nX21vZGUoKSBtaWdodCByZXR1cm4KVkM0X1NDQUxJTkdfTk9ORSBpZiB0aGUgaG9yaXpvbnRh bCBzY2FsaW5nIHJhdGlvIGV4YWN0bHkgbWF0Y2hlcyB0aGUKaG9yaXpvbnRhbCBzdWJzYW1wbGlu ZyBmYWN0b3IuIEFkZCBhIHRlc3QgdG8gdHVybiBWQzRfU0NBTElOR19OT05FCmludG8gVkM0X1ND QUxJTkdfUFBGIHdoZW4gdGhhdCBoYXBwZW5zLgoKVGhlIG9sZCAtPnhfc2NhbGluZ1swXSBhZGp1 c3RtZW50IGlzIGRyb3BwZWQgYXMgSSBjb3VsZG4ndCBmaW5kIGFueQptZW50aW9uIHRvIHRoaXMg Y29uc3RyYWludCBpbiB0aGUgc3BlYyBhbmQgaXQncyBwcm92ZW4gdG8gYmUKdW5uZWNlc3Nhcnkg KEkgdGVzdGVkIHZhcmlvdXMgbXVsdGktcGxhbmFyIFlVViBmb3JtYXRzIHdpdGggc2NhbGluZwpk aXNhYmxlZCwgYW5kIGFsbCBvZiB0aGVtIHdvcmtlZCBmaW5lIHdpdGhvdXQgdGhpcyBhZGp1c3Rt ZW50KS4KCkZpeGVzOiBmYzA0MDIzZmFmZWMgKCJkcm0vdmM0OiBBZGQgc3VwcG9ydCBmb3IgWVVW IHBsYW5lcy4iKQpTaWduZWQtb2ZmLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlzLmJyZXppbGxv bkBib290bGluLmNvbT4KUmV2aWV3ZWQtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+ Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE4 MTEwOTEwMjYzMy4zMjYwMy0xLWJvcmlzLmJyZXppbGxvbkBib290bGluLmNvbQpTaWduZWQtb2Zm LWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJt L3ZjNC92YzRfcGxhbmUuYyB8IDEyICsrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5z ZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v dmM0L3ZjNF9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYwppbmRleCA1 YmQzYzJlZjAwNjcuLjYyNzdhM2YyZDVkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Zj NC92YzRfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jCkBAIC0z NDcsMTIgKzM0NywxNCBAQCBzdGF0aWMgaW50IHZjNF9wbGFuZV9zZXR1cF9jbGlwcGluZ19hbmRf c2NhbGluZyhzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIAkJCXZjNF9nZXRfc2NhbGlu Z19tb2RlKHZjNF9zdGF0ZS0+c3JjX2hbMV0sCiAJCQkJCSAgICAgdmM0X3N0YXRlLT5jcnRjX2gp OwogCi0JCS8qIFlVViBjb252ZXJzaW9uIHJlcXVpcmVzIHRoYXQgaG9yaXpvbnRhbCBzY2FsaW5n IGJlIGVuYWJsZWQsCi0JCSAqIGV2ZW4gb24gYSBwbGFuZSB0aGF0J3Mgb3RoZXJ3aXNlIDE6MS4g TG9va3MgbGlrZSBvbmx5IFBQRgotCQkgKiB3b3JrcyBpbiB0aGF0IGNhc2UsIHNvIGxldCdzIHBp Y2sgdGhhdCBvbmUuCisJCS8qIFlVViBjb252ZXJzaW9uIHJlcXVpcmVzIHRoYXQgaG9yaXpvbnRh bCBzY2FsaW5nIGJlIGVuYWJsZWQKKwkJICogb24gdGhlIFVWIHBsYW5lIGV2ZW4gaWYgdmM0X2dl dF9zY2FsaW5nX21vZGUoKSByZXR1cm5lZAorCQkgKiBWQzRfU0NBTElOR19OT05FICh3aGljaCBj YW4gaGFwcGVuIHdoZW4gdGhlIGRvd24tc2NhbGluZworCQkgKiByYXRpbyBpcyAwLjUpLiBMZXQn cyBmb3JjZSBpdCB0byBWQzRfU0NBTElOR19QUEYgaW4gdGhpcworCQkgKiBjYXNlLgogCQkgKi8K LQkJaWYgKHZjNF9zdGF0ZS0+aXNfdW5pdHkpCi0JCQl2YzRfc3RhdGUtPnhfc2NhbGluZ1swXSA9 IFZDNF9TQ0FMSU5HX1BQRjsKKwkJaWYgKHZjNF9zdGF0ZS0+eF9zY2FsaW5nWzFdID09IFZDNF9T Q0FMSU5HX05PTkUpCisJCQl2YzRfc3RhdGUtPnhfc2NhbGluZ1sxXSA9IFZDNF9TQ0FMSU5HX1BQ RjsKIAl9IGVsc2UgewogCQl2YzRfc3RhdGUtPmlzX3l1diA9IGZhbHNlOwogCQl2YzRfc3RhdGUt Pnhfc2NhbGluZ1sxXSA9IFZDNF9TQ0FMSU5HX05PTkU7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C326BC282C8 for ; Mon, 28 Jan 2019 17:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92DD621741 for ; Mon, 28 Jan 2019 17:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548695250; bh=U0X9FgZimIjCcs6PbcZXK38k1lpZZLe3iFPD8GcePQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=y18GWJIOgVMrO1+NJBJhKfgKGQMZga+yn9p+AK+wJ9srqxoa6W0KuSkvD2WzwRv7f VvMW+nQciH8HaBRUZ/KDCW5qmBPKscIqfc2zsHgLxTZ88UIJztb5jZ1l6Ke9qBu8uV yZttq0TW+flr0y0RArkcPrMt+2cfWkbLD0XP/CjA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387553AbfA1RH3 (ORCPT ); Mon, 28 Jan 2019 12:07:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:41236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733208AbfA1QMr (ORCPT ); Mon, 28 Jan 2019 11:12:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A919A2148E; Mon, 28 Jan 2019 16:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691966; bh=U0X9FgZimIjCcs6PbcZXK38k1lpZZLe3iFPD8GcePQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=01gsrGH7gJzHibxDVFck35LV8tkp12SY9DQelSauCVSItle9r6VR3V4WysKu2kCdz AscJYUqeC3EJWVYK/N63ALZFxBpKHrk+r76Nk68WFflTOT+4vVI+5hQfJsnbfUFVzY iiExQ/+OhV7BoAmRIcTaSLASBt4BjjVJ1IpVteLQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Boris Brezillon , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 019/170] drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE Date: Mon, 28 Jan 2019 11:09:29 -0500 Message-Id: <20190128161200.55107-19-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Boris Brezillon [ 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