Message ID | 1432133847-348-1-git-send-email-sviau@codeaurora.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Wed, May 20, 2015 at 10:57 AM, Stephane Viau <sviau@codeaurora.org> wrote: > The index of ->planes[] array (3rd parameter) cannot be equal to MAX_PLANE. > This looks like a typo that is now fixed. > > Signed-off-by: Stephane Viau <sviau@codeaurora.org> Acked-by: Rob Clark <robdclark@gmail.com> Dave, since it looks like you've merged my earlier fixes pull but haven't sent to linus yet, do you mind applying this one directly on msm-fixes? BR, -R > --- > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > index 18a3d20..57b8f56 100644 > --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > @@ -273,7 +273,7 @@ static void set_scanout_locked(struct drm_plane *plane, > mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC2_ADDR(pipe), > msm_framebuffer_iova(fb, mdp5_kms->id, 2)); > mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC3_ADDR(pipe), > - msm_framebuffer_iova(fb, mdp5_kms->id, 4)); > + msm_framebuffer_iova(fb, mdp5_kms->id, 3)); > > plane->fb = fb; > } > -- > Qualcomm Innovation Center, Inc. > > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project >
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 18a3d20..57b8f56 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -273,7 +273,7 @@ static void set_scanout_locked(struct drm_plane *plane, mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC2_ADDR(pipe), msm_framebuffer_iova(fb, mdp5_kms->id, 2)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC3_ADDR(pipe), - msm_framebuffer_iova(fb, mdp5_kms->id, 4)); + msm_framebuffer_iova(fb, mdp5_kms->id, 3)); plane->fb = fb; }
The index of ->planes[] array (3rd parameter) cannot be equal to MAX_PLANE. This looks like a typo that is now fixed. Signed-off-by: Stephane Viau <sviau@codeaurora.org> --- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)