mbox

[GIT,PULL] imx-drm: fix plane atomic_update regression

Message ID 1480935795.3005.47.camel@pengutronix.de
State New
Headers show

Pull-request

git://git.pengutronix.de/pza/linux.git tags/imx-drm-fixes-2016-12-02

Message

Philipp Zabel Dec. 5, 2016, 11:03 a.m. UTC
Hi Dave,

this tag fixes a regression in the imx-drm YUV plane support [1] that
was introduced in v4.9-rc4, as well as an error returned when changing
U/V offsets of an active plane to otherwise valid values.

[1] https://lkml.org/lkml/2016/11/17/133

Both commits are already contained in drm-next.

regards
Philipp

The following changes since commit 86126748cd5063aa888ce252f16b89b35e7d4707:

  drm/imx: ipuv3-plane: disable local alpha for planes without alpha channel (2016-10-20 14:39:51 +0200)

are available in the git repository at:

  git://git.pengutronix.de/pza/linux.git tags/imx-drm-fixes-2016-12-02

for you to fetch changes up to 3fd8b292ae6b99e3e6e96df3e470b25b100741a8:

  drm/imx: ipuv3-plane: merge ipu_plane_atomic_set_base into atomic_update (2016-10-20 14:39:53 +0200)

----------------------------------------------------------------
imx-drm: fix plane atomic_update regression

- request modeset if plane offsets changed, only the plane base
  address can be changed without disabling the plane IDMAC channel,
  stop returning an error if a valid YUV plane configuration with
  different U/V offsets from the currently active plane is requested.
- merge ipu_plane_atomic_set_base into atomic_update, also fixes a
  regression introduced by commit 81d553545a15 ("drm/imx: ipuv3-plane: Skip
  setting u/vbo only when we don't need modeset") where U/V offsets were not
  set corretly when enabling YUV planes without a modeset.

----------------------------------------------------------------
Philipp Zabel (2):
      drm/imx: ipuv3-plane: request modeset if plane offsets changed
      drm/imx: ipuv3-plane: merge ipu_plane_atomic_set_base into atomic_update

 drivers/gpu/drm/imx/ipuv3-plane.c | 103 +++++++++++++-------------------------
 1 file changed, 36 insertions(+), 67 deletions(-)

Comments

Philipp Zabel Dec. 9, 2016, 10:46 a.m. UTC | #1
Hi Dave,

Am Montag, den 05.12.2016, 12:03 +0100 schrieb Philipp Zabel:
> Hi Dave,
> 
> this tag fixes a regression in the imx-drm YUV plane support [1] that
> was introduced in v4.9-rc4, as well as an error returned when changing
> U/V offsets of an active plane to otherwise valid values.

Is there a chance for this to still make it into v4.9?

regards
Philipp

> [1] https://lkml.org/lkml/2016/11/17/133
> 
> Both commits are already contained in drm-next.
> 
> regards
> Philipp
> 
> The following changes since commit 86126748cd5063aa888ce252f16b89b35e7d4707:
> 
>   drm/imx: ipuv3-plane: disable local alpha for planes without alpha channel (2016-10-20 14:39:51 +0200)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/pza/linux.git tags/imx-drm-fixes-2016-12-02
> 
> for you to fetch changes up to 3fd8b292ae6b99e3e6e96df3e470b25b100741a8:
> 
>   drm/imx: ipuv3-plane: merge ipu_plane_atomic_set_base into atomic_update (2016-10-20 14:39:53 +0200)
> 
> ----------------------------------------------------------------
> imx-drm: fix plane atomic_update regression
> 
> - request modeset if plane offsets changed, only the plane base
>   address can be changed without disabling the plane IDMAC channel,
>   stop returning an error if a valid YUV plane configuration with
>   different U/V offsets from the currently active plane is requested.
> - merge ipu_plane_atomic_set_base into atomic_update, also fixes a
>   regression introduced by commit 81d553545a15 ("drm/imx: ipuv3-plane: Skip
>   setting u/vbo only when we don't need modeset") where U/V offsets were not
>   set corretly when enabling YUV planes without a modeset.
> 
> ----------------------------------------------------------------
> Philipp Zabel (2):
>       drm/imx: ipuv3-plane: request modeset if plane offsets changed
>       drm/imx: ipuv3-plane: merge ipu_plane_atomic_set_base into atomic_update
> 
>  drivers/gpu/drm/imx/ipuv3-plane.c | 103 +++++++++++++-------------------------
>  1 file changed, 36 insertions(+), 67 deletions(-)