Skip to content

Commit

Permalink
drm: Avoid leak of adjusted mode along quick set_mode paths
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Jan 31, 2011
1 parent ede3ff5 commit 021a845
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/gpu/drm/drm_crtc_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,12 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
struct drm_encoder *encoder;
bool ret = true;

adjusted_mode = drm_mode_duplicate(dev, mode);

crtc->enabled = drm_helper_crtc_in_use(crtc);

if (!crtc->enabled)
return true;

adjusted_mode = drm_mode_duplicate(dev, mode);

saved_hwmode = crtc->hwmode;
saved_mode = crtc->mode;
saved_x = crtc->x;
Expand Down Expand Up @@ -437,10 +436,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
*/
drm_calc_timestamping_constants(crtc);

/* XXX free adjustedmode */
drm_mode_destroy(dev, adjusted_mode);
/* FIXME: add subpixel order */
done:
drm_mode_destroy(dev, adjusted_mode);
if (!ret) {
crtc->hwmode = saved_hwmode;
crtc->mode = saved_mode;
Expand Down

0 comments on commit 021a845

Please sign in to comment.