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=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 510BBC43387 for ; Fri, 11 Jan 2019 14:41:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18EFE2133F for ; Fri, 11 Jan 2019 14:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217691; bh=VcgDXEfMs8EVoSbGv5U9uZgnDjUpx382pCNEI/mJkiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DZXaH8s+ZdpjhV+te7xAGR05uxJ+xRd1/VJtfJh37J9VksBHCcMUVNEktgyYPZ5hA sN7+2xxZMzW0HCJFbWyvBFFqwky0yZbGgLoUD5MgbEtbgWsfhjyu79yQyA9OGNNppQ NAHMYmdmRoT7nds3qVrit+UUjqrs0rVMIFNTa9UU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404030AbfAKOla (ORCPT ); Fri, 11 Jan 2019 09:41:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:34174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404013AbfAKOl2 (ORCPT ); Fri, 11 Jan 2019 09:41:28 -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 72B11206B6; Fri, 11 Jan 2019 14:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217688; bh=VcgDXEfMs8EVoSbGv5U9uZgnDjUpx382pCNEI/mJkiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpUGC1yi/Mm2fgVNpyZzxNL86oE/KvBGCcGP6Vgnf+XwwsbtKl+k5w/luj5vnicAQ 2wHwNcrNdjZJK3jeMRnV0Yn3TkdVeWUxzIsmK9OZkbceLqmR9sCUx5zymGr8sX1Egl Y1HCLm6zkpbWvvrawW9bv6RPGJIYex3bKl0OwNpM= 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.19 146/148] drm/vc4: Set ->is_yuv to false when num_planes == 1 Date: Fri, 11 Jan 2019 15:15:24 +0100 Message-Id: <20190111131120.161382020@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131114.337122649@linuxfoundation.org> References: <20190111131114.337122649@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.19-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 @@ -322,6 +322,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; }