Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a2d7822 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes 

Just one vc4 fix from Eric, cc: stable

* tag 'drm-misc-fixes-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc:
  drm/vc4: Allocate the right amount of space for boot-time CRTC state.
parents b61d6075 6d6e5003

drivers/gpu/drm/vc4/vc4_crtc.c

+12 −1
Original line number Diff line number Diff line
@@ -846,6 +846,17 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc, 
	drm_atomic_helper_crtc_destroy_state(crtc, state);

}



static void

vc4_crtc_reset(struct drm_crtc *crtc)

{

	if (crtc->state)

		__drm_atomic_helper_crtc_destroy_state(crtc->state);



	crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL);

	if (crtc->state)

		crtc->state->crtc = crtc;

}



static const struct drm_crtc_funcs vc4_crtc_funcs = {

	.set_config = drm_atomic_helper_set_config,

	.destroy = vc4_crtc_destroy,
@@ -853,7 +864,7 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { 
	.set_property = NULL,

	.cursor_set = NULL, /* handled by drm_mode_cursor_universal */

	.cursor_move = NULL, /* handled by drm_mode_cursor_universal */

	.reset = drm_atomic_helper_crtc_reset,

	.reset = vc4_crtc_reset,

	.atomic_duplicate_state = vc4_crtc_duplicate_state,

	.atomic_destroy_state = vc4_crtc_destroy_state,

	.gamma_set = vc4_crtc_gamma_set,