Commit 20975806 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-10-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Two fixes for komeda, one for typos and one to prevent an hardware issue
when flushing inactive pipes

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

From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191023112643.evpp6f23mpjwdsn4@gilmour
parents 7d194c21 8ae501e2

drivers/gpu/drm/arm/display/komeda/komeda_kms.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static void komeda_kms_commit_tail(struct drm_atomic_state *old_state) 


	drm_atomic_helper_commit_modeset_disables(dev, old_state);



	drm_atomic_helper_commit_planes(dev, old_state, 0);

	drm_atomic_helper_commit_planes(dev, old_state,

					DRM_PLANE_COMMIT_ACTIVE_ONLY);



	drm_atomic_helper_commit_modeset_enables(dev, old_state);

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

+2 −2
Original line number Diff line number Diff line
@@ -564,8 +564,8 @@ komeda_splitter_validate(struct komeda_splitter *splitter, 
	}



	if (!in_range(&splitter->vsize, dflow->in_h)) {

		DRM_DEBUG_ATOMIC("split in_in: %d exceed the acceptable range.\n",

				 dflow->in_w);

		DRM_DEBUG_ATOMIC("split in_h: %d exceeds the acceptable range.\n",

				 dflow->in_h);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE