Received: by 10.213.65.68 with SMTP id h4csp1760147imn; Mon, 19 Mar 2018 12:30:01 -0700 (PDT) X-Google-Smtp-Source: AG47ELt5rWIn7kxHF8j9JdM/KU8Cjq0ArmquXytVnMitBnVuH7Zc8rtEqL9K3+whw9ZdmwlRxVRn X-Received: by 2002:a17:902:108a:: with SMTP id c10-v6mr8415227pla.22.1521487801431; Mon, 19 Mar 2018 12:30:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521487801; cv=none; d=google.com; s=arc-20160816; b=vkCuX75omhB1JMUG9ZJME6wvMwe4evj6mBUTXCMoQmCgNb7oSnSgvNkjS5KVSLW9um 8Ixp1NAeptBbKts8Y9SXlyUm5CaJUFrzyoTTNKfZAZq5C5cjpo/iKRULt0z6hMSmbsBq dWGel/t064+o+ZyxTL8YRlVNiVmIqJqnBxGETl83fw7eEtu3Wil6kNcEg+fSpaoHMJis 7X3AcHcYwXoMPYmvJEgP0si0BOzPnJE4TvnMLda/NCV2a5dF+ZrqadXMDUBsPNnEUzyu 28iVGV0d5hBoF9vXjRboFMQoN/FOe/tXIb/OOeS4i/oFGZwdlHJgS1MIKlBRN109TS7r /eOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ls7srhmD5ZgAJsuZDFs2YtRa77mda9+9aHqi82hPCxY=; b=V6Ba/icLXtzYqqdmco2PE98vKH3++iT5tYs+TArnuBXoi3Y4CKwVrPAtNF6tKT/AVk Wc73pY6GCaaBlf5+MlIkE2vnIBFQJkLMhomeT/k67VbViw2BPHismRQX/pJpMI2d+v1K Ga491wIH6Nygv2/sAdnWAE1f5C0efPP5tJXMqcmmpkl5ZTv5gTXC93t9b1+NQ8oiQRba 9v5wW4B1MFbnyXDI9MRtPGDGaSmWqjZDR/SDmHK+xFkJohJbnsiyheyT6GI5EYlfmuIP OnzseR1Yfx5vpDd7SVtxL6TBrTKReAUu5uqiYa9ha3rojDIoiW1/eVNI0n+Z/6F5T5KV zbJQ== ARC-Authentication-Results: i=1; mx.google.com; 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 9-v6si545479plb.140.2018.03.19.12.29.47; Mon, 19 Mar 2018 12:30:01 -0700 (PDT) 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; 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 S969591AbeCSSYG (ORCPT + 99 others); Mon, 19 Mar 2018 14:24:06 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:49712 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967952AbeCSSX6 (ORCPT ); Mon, 19 Mar 2018 14:23:58 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A3946EF7; Mon, 19 Mar 2018 18:23:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kieran Bingham , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 134/241] [media] v4l: vsp1: Register pipe with output WPF Date: Mon, 19 Mar 2018 19:06:39 +0100 Message-Id: <20180319180756.740776187@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kieran Bingham [ Upstream commit 1531a208ed861e4bd287444f9466ffcf98383de2 ] The DRM object does not register the pipe with the WPF object. This is used internally throughout the driver as a means of accessing the pipe. As such this breaks operations which require access to the pipe from WPF interrupts. Register the pipe inside the WPF object after it has been declared as the output. Fixes: ff7e97c94d9f ("[media] v4l: vsp1: Store pipeline pointer in rwpf") Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/vsp1/vsp1_drm.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -596,6 +596,7 @@ int vsp1_drm_init(struct vsp1_device *vs pipe->bru = &vsp1->bru->entity; pipe->lif = &vsp1->lif->entity; pipe->output = vsp1->wpf[0]; + pipe->output->pipe = pipe; return 0; }