evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm: msm: fix potential NULL pointer dereference"

Browse source
This commit is contained in:
Linux Build Service Account 2018-04-02 01:45:28 -07:00 • committed by Gerrit - the friendly Code Review server
commit d83747f35c
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2015, 2018 The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com>
*
@ -242,7 +242,7 @@ static void blend_setup(struct drm_crtc *crtc)
/* The reset for blending */
for (i = STAGE0; i <= STAGE_MAX; i++) {
if (!pstates[i])
if (!pstates[i] || !pstates[i]->base.fb)
continue;
format = to_mdp_format(

6
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014-2015 The Linux Foundation. All rights reserved.
* Copyright (C) 2014-2015, 2018 The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com>
*
@ -218,8 +218,10 @@ mdp5_plane_duplicate_state(struct drm_plane *plane)
mdp5_state = kmemdup(to_mdp5_plane_state(plane->state),
sizeof(*mdp5_state), GFP_KERNEL);
if (!mdp5_state)
return NULL;
if (mdp5_state && mdp5_state->base.fb)
if (mdp5_state->base.fb)
drm_framebuffer_reference(mdp5_state->base.fb);
mdp5_state->mode_changed = false;

7
drivers/gpu/drm/msm/sde/sde_kms.c
View file

@ -389,13 +389,12 @@ static void sde_kms_wait_for_commit_done(struct msm_kms *kms,
struct drm_device *dev;
int ret;
if (!kms || !crtc || !crtc->state) {
SDE_ERROR("invalid params\n");
dev = crtc->dev;
if (!dev) {
SDE_ERROR("invalid dev\n");
return;
}
dev = crtc->dev;
if (!crtc->state->enable) {
SDE_DEBUG("[crtc:%d] not enable\n", crtc->base.id);
return;