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

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

Merge tag 'drm-misc-next-fixes-2019-09-23' of... 

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

 into drm-next

 - Multiple panfrost fixes for regulator support and page fault handling
 - Some cleanups and fixes in the self-refresh helpers
 - Some cleanups and fixes in the atomic helpers

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

From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190923160946.nvaqiw5j7fpcdhc7@gilmour
parents 945b584c 65e51e30

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −3
Original line number Diff line number Diff line
@@ -5770,8 +5770,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
		 * change FB pitch, DCC state, rotation or mirroing.

		 */

		bundle->flip_addrs[planes_count].flip_immediate =

			(crtc->state->pageflip_flags &

			 DRM_MODE_PAGE_FLIP_ASYNC) != 0 &&

			crtc->state->async_flip &&

			acrtc_state->update_type == UPDATE_TYPE_FAST;



		timestamp_ns = ktime_get_ns();
@@ -6348,7 +6347,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
	amdgpu_dm_enable_crtc_interrupts(dev, state, true);



	for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)

		if (new_crtc_state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)

		if (new_crtc_state->async_flip)

			wait_for_vblank = false;



	/* update planes when needed per crtc*/

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+3 −9
Original line number Diff line number Diff line
@@ -874,6 +874,9 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge) 
				 &adv7511_connector_helper_funcs);

	drm_connector_attach_encoder(&adv->connector, bridge->encoder);



	if (adv->type == ADV7533)

		ret = adv7533_attach_dsi(adv);



	if (adv->i2c_main->irq)

		regmap_write(adv->regmap, ADV7511_REG_INT_ENABLE(0),

			     ADV7511_INT0_HPD);
@@ -1219,17 +1222,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 
	drm_bridge_add(&adv7511->bridge);



	adv7511_audio_init(dev, adv7511);



	if (adv7511->type == ADV7533) {

		ret = adv7533_attach_dsi(adv7511);

		if (ret)

			goto err_remove_bridge;

	}



	return 0;



err_remove_bridge:

	drm_bridge_remove(&adv7511->bridge);

err_unregister_cec:

	i2c_unregister_device(adv7511->i2c_cec);

	if (adv7511->cec_clk)

drivers/gpu/drm/drm_atomic_helper.c

+21 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 */



#include <linux/dma-fence.h>

#include <linux/ktime.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>
@@ -1580,9 +1581,23 @@ static void commit_tail(struct drm_atomic_state *old_state) 
{

	struct drm_device *dev = old_state->dev;

	const struct drm_mode_config_helper_funcs *funcs;

	ktime_t start;

	s64 commit_time_ms;



	funcs = dev->mode_config.helper_private;



	/*

	 * We're measuring the _entire_ commit, so the time will vary depending

	 * on how many fences and objects are involved. For the purposes of self

	 * refresh, this is desirable since it'll give us an idea of how

	 * congested things are. This will inform our decision on how often we

	 * should enter self refresh after idle.

	 *

	 * These times will be averaged out in the self refresh helpers to avoid

	 * overreacting over one outlier frame

	 */

	start = ktime_get();



	drm_atomic_helper_wait_for_fences(dev, old_state, false);



	drm_atomic_helper_wait_for_dependencies(old_state);
@@ -1592,6 +1607,11 @@ static void commit_tail(struct drm_atomic_state *old_state) 
	else

		drm_atomic_helper_commit_tail(old_state);



	commit_time_ms = ktime_ms_delta(ktime_get(), start);

	if (commit_time_ms > 0)

		drm_self_refresh_helper_update_avg_times(old_state,

						 (unsigned long)commit_time_ms);



	drm_atomic_helper_commit_cleanup_done(old_state);



	drm_atomic_state_put(old_state);
@@ -3275,7 +3295,7 @@ static int page_flip_common(struct drm_atomic_state *state, 
		return PTR_ERR(crtc_state);



	crtc_state->event = event;

	crtc_state->pageflip_flags = flags;

	crtc_state->async_flip = flags & DRM_MODE_PAGE_FLIP_ASYNC;



	plane_state = drm_atomic_get_plane_state(state, plane);

	if (IS_ERR(plane_state))

drivers/gpu/drm/drm_atomic_state_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, 
	state->zpos_changed = false;

	state->commit = NULL;

	state->event = NULL;

	state->pageflip_flags = 0;

	state->async_flip = false;



	/* Self refresh should be canceled when a new update is available */

	state->active = drm_atomic_crtc_effectively_active(state);

drivers/gpu/drm/drm_atomic_uapi.c

+1 −2
Original line number Diff line number Diff line
@@ -1305,8 +1305,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
	if (arg->reserved)

		return -EINVAL;



	if ((arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) &&

			!dev->mode_config.async_page_flip)

	if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC)

		return -EINVAL;



	/* can't test and expect an event at the same time. */