From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c" Date: Thu, 4 Apr 2019 10:52:02 -0400 Message-ID: <20190404145202.GC17077@art_vandelay> References: <20190404144342.15238-1-narmstrong@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190404144342.15238-1-narmstrong@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org To: Neil Armstrong Cc: sean@poorly.run, dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, maxime.ripard@bootlin.com, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org On Thu, Apr 04, 2019 at 04:43:42PM +0200, Neil Armstrong wrote: > This reverts commit a3f98bb22cbfaaf67717e156f79e2bfeb42d4cac. > > Patch "Documentation/gpu/meson: Remove link to meson_canvas.c" was > incorrectly applied on the wrong branch not containing the fixed > commit 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module") > > Signed-off-by: Neil Armstrong Acked-by: Sean Paul and I'll leave this for Maxime to apply if he so chooses. Sean > --- > Documentation/gpu/meson.rst | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst > index b9e2f9aa3bd8..479f6f51a13b 100644 > --- a/Documentation/gpu/meson.rst > +++ b/Documentation/gpu/meson.rst > @@ -42,6 +42,12 @@ Video Encoder > .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c > :doc: Video Encoder > > +Video Canvas Management > +======================= > + > +.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c > + :doc: Canvas > + > Video Clocks > ============ > > -- > 2.21.0 > -- Sean Paul, Software Engineer, Google / Chromium OS