Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp648735imu; Fri, 11 Jan 2019 06:47:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN5mzCQZqn+Z/RLl7f9jo2gHucMgLvvZ2l3DzXMsKtnIMkJGKIhUw7axbvgxTNArpFTzl1PM X-Received: by 2002:a17:902:8f83:: with SMTP id z3mr14523249plo.328.1547218032607; Fri, 11 Jan 2019 06:47:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547218032; cv=none; d=google.com; s=arc-20160816; b=PFVFo9EbnzmoksUG7TMsuiCArE8xVFS06CBG+jTAB74FTvVEvpYJuTTByeNfxsYO4E 1lw1Vie0IwaxIkI+E48KQIqaxWf4Kwdg2Hh85kZUlF8ygZQ5bpuzk5ZB4gCjcUt5/kJU uX5mPC2avDDGoV6dHhGNxlKheqNcOCLMB34+OdZPDfmzj+axJgUlC3JebT8boYm3zNY1 DMhd6InQ65WVJM63mmY0JP8UNYGhiJpH56wANVV/tyC4ww/Ie6UR7aK4bBqmhUY0q/+f UeUqN0pBwBI6skN1/9l7n7R2Ad3rM85OF+uMftHDs1abWHGgYYFMlIoD6vP/9oF0pHDy +8HQ== 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=b3vlEQyOYrw60Cl1DZsJco30uz6qCo8Qp1hryiuwFIY=; b=XcNfZnU2S/jj+6SWkQLAkvUtVL3yvJYzbtYJ+2ecE6+E4D108Qd9LouKumtygsmmN9 cRic6+13rCCJgGmTdtwUse98tbHlZpP+Md2EGefUINvEFNnwGGo+BsYwqYfd3tNLQap6 G9oY2sEqywoJsvk8BGJ1LttQ3CcbJnZSOx2SMMNbtSmmLlNxRjZfS91ymoge010DhLlB NBxhoy88KnO3aCYLTJfOHl6mT3+eU5WHlC040yJUV9Us/Tkvk6Y7Sd4BVe7plLb4dJ+3 DPRZFwW0aT/24AC2qv76ZG6YQcmmNthCPaOdiZOlbu9Xd1zqm6k3poyHAvuANeAZJuVr Lfaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kUKvZL6l; 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 v35si65194065pgl.130.2019.01.11.06.46.57; Fri, 11 Jan 2019 06:47:12 -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=kUKvZL6l; 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 S2403970AbfAKOoV (ORCPT + 99 others); Fri, 11 Jan 2019 09:44:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:37184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404569AbfAKOoO (ORCPT ); Fri, 11 Jan 2019 09:44:14 -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 89C5020872; Fri, 11 Jan 2019 14:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217854; bh=+rYH8lvAmI6yrFP2QNefAba/v+8jRraooH24duOg0Xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kUKvZL6l1wlvQpW3eJAbDBI3AMT937H/tpd5sKy2wzjLQSnZy7ja9W6VWQXzmn3cA ZVSUJViE5mWxWFeBPEpW8IFXs0GsfNEaorKaRAWyId2/BJW4Xwel7nSd6PEcz/8RrZ SoCaibIbZM9AXpJQT4+nRZxyKY8G5/j09QuiJWB4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Brezillon , Eric Anholt Subject: [PATCH 4.20 64/65] drm/vc4: Set ->is_yuv to false when num_planes == 1 Date: Fri, 11 Jan 2019 15:15:50 +0100 Message-Id: <20190111131104.489893319@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131055.331350141@linuxfoundation.org> References: <20190111131055.331350141@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.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Boris Brezillon commit 2b02a05bdc3a62d36e0d0b015351897109e25991 upstream. When vc4_plane_state is duplicated ->is_yuv is left assigned to its previous value, and we never set it back to false when switching to a non-YUV format. Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch of the vc4_plane_setup_clipping_and_scaling() function. Fixes: fc04023fafecf ("drm/vc4: Add support for YUV planes.") Cc: Signed-off-by: Boris Brezillon Reviewed-by: Eric Anholt Link: https://patchwork.freedesktop.org/patch/msgid/20181009132446.21960-1-boris.brezillon@bootlin.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vc4/vc4_plane.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -321,6 +321,7 @@ static int vc4_plane_setup_clipping_and_ if (vc4_state->is_unity) vc4_state->x_scaling[0] = VC4_SCALING_PPF; } else { + vc4_state->is_yuv = false; vc4_state->x_scaling[1] = VC4_SCALING_NONE; vc4_state->y_scaling[1] = VC4_SCALING_NONE; }