openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Two patches, one to fix a null pointer dereference in msm, and one to 

fix an unused warning for in fbdev when PROCFS is disabled.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYJPgewAKCRDj7w1vZxhR
 xWkzAP9qRoMCPxB96qAva/vFekGUwnzzv0WdNK9IjAGUT3ZnjwD/bNy/LOL9Y8MP
 nZd5IkZkZfPLl7fEsd1xw/QTufXNJQU=
 =/pVi
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2021-05-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Two patches, one to fix a null pointer dereference in msm, and one to
fix an unused warning for in fbdev when PROCFS is disabled.

Signed-off-by: Dave Airlie <airlied@redhat.com>

# gpg: Signature made Thu 06 May 2021 22:26:35 AEST
# gpg:                using ? key E3EF0D6F671851C5
# gpg: Can't check signature: unknown pubkey algorithm
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210506122723.oqadel7oacazywij@gilmour
This commit is contained in:
Dave Airlie 2021-05-07 12:37:37 +10:00
parent 365002da3c b9d79e4ca4
commit 59e528c5bc
4 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
View File

@ -648,16 +648,6 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc,
if (unlikely(!cstate->num_mixers)) if (unlikely(!cstate->num_mixers))
return; return;
/*
* For planes without commit update, drm framework will not add
* those planes to current state since hardware update is not
* required. However, if those planes were power collapsed since
* last commit cycle, driver has to restore the hardware state
* of those planes explicitly here prior to plane flush.
*/
drm_atomic_crtc_for_each_plane(plane, crtc)
dpu_plane_restore(plane, state);
/* update performance setting before crtc kickoff */ /* update performance setting before crtc kickoff */
dpu_core_perf_crtc_update(crtc, 1, false); dpu_core_perf_crtc_update(crtc, 1, false);

16
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
View File

@ -1258,22 +1258,6 @@ static void dpu_plane_atomic_update(struct drm_plane *plane,
} }
} }
void dpu_plane_restore(struct drm_plane *plane, struct drm_atomic_state *state)
{
struct dpu_plane *pdpu;
if (!plane || !plane->state) {
DPU_ERROR("invalid plane\n");
return;
}
pdpu = to_dpu_plane(plane);
DPU_DEBUG_PLANE(pdpu, "\n");
dpu_plane_atomic_update(plane, state);
}
static void dpu_plane_destroy(struct drm_plane *plane) static void dpu_plane_destroy(struct drm_plane *plane)
{ {
struct dpu_plane *pdpu = plane ? to_dpu_plane(plane) : NULL; struct dpu_plane *pdpu = plane ? to_dpu_plane(plane) : NULL;

6
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
View File

@ -84,12 +84,6 @@ bool is_dpu_plane_virtual(struct drm_plane *plane);
void dpu_plane_get_ctl_flush(struct drm_plane *plane, struct dpu_hw_ctl *ctl, void dpu_plane_get_ctl_flush(struct drm_plane *plane, struct dpu_hw_ctl *ctl,
u32 *flush_sspp); u32 *flush_sspp);
/**
* dpu_plane_restore - restore hw state if previously power collapsed
* @plane: Pointer to drm plane structure
*/
void dpu_plane_restore(struct drm_plane *plane, struct drm_atomic_state *state);
/** /**
* dpu_plane_flush - final plane operations before commit flush * dpu_plane_flush - final plane operations before commit flush
* @plane: Pointer to drm plane structure * @plane: Pointer to drm plane structure

2
drivers/video/fbdev/core/fbmem.c
View File

@ -733,7 +733,7 @@ static int fb_seq_show(struct seq_file *m, void *v)
return 0; return 0;
} }
static const struct seq_operations proc_fb_seq_ops = { static const struct __maybe_unused seq_operations proc_fb_seq_ops = {
.start = fb_seq_start, .start = fb_seq_start,
.next = fb_seq_next, .next = fb_seq_next,
.stop = fb_seq_stop, .stop = fb_seq_stop,