Commit 61647c77 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2018-11-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v4.21:

Core Changes:
- Merge drm_info.c into drm_debugfs.c
- Complete the fake drm_crtc_commit's hw_done/flip_done sooner.
- Remove deprecated drm_obj_ref/unref functions. All drivers use get/put now.
- Decrease stack use of drm_gem_prime_mmap.
- Improve documentation for dumb callbacks.

Driver Changes:
- Add edid support to virtio.
- Wait on implicit fence in meson and sun4i.
- Add support for BGRX8888 to sun4i.
- Preparation patches for sun4i driver to start supporting linear and tiled YUV formats.
- Add support for HDMI 1.4 4k modes to meson, and support for VIC alternate timings.
- Drop custom dumb_map in vkms.
- Small fixes and cleanups to v3d.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/151a3270-b1be-ed75-bd58-6b29d741f592@linux.intel.com
parents 1a31c26e 08f73d66

Documentation/gpu/todo.rst

+7 −13
Original line number Diff line number Diff line
@@ -28,22 +28,16 @@ them, but also all the virtual ones used by KVM, so everyone qualifies). 


Contact: Daniel Vetter, Thierry Reding, respective driver maintainers



Switch from reference/unreference to get/put

--------------------------------------------



For some reason DRM core uses ``reference``/``unreference`` suffixes for

refcounting functions, but kernel uses ``get``/``put`` (e.g.

``kref_get``/``put()``). It would be good to switch over for consistency, and

it's shorter. Needs to be done in 3 steps for each pair of functions:



* Create new ``get``/``put`` functions, define the old names as compatibility

  wrappers

* Switch over each file/driver using a cocci-generated spatch.

* Once all users of the old names are gone, remove them.

Remove custom dumb_map_offset implementations

---------------------------------------------



This way drivers/patches in the progress of getting merged won't break.

All GEM based drivers should be using drm_gem_create_mmap_offset() instead.

Audit each individual driver, make sure it'll work with the generic

implementation (there's lots of outdated locking leftovers in various

implementations), and then remove it.



Contact: Daniel Vetter

Contact: Daniel Vetter, respective driver maintainers



Convert existing KMS drivers to atomic modesetting

--------------------------------------------------

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_scatter.o drm_pci.o \

		drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \

		drm_info.o drm_encoder_slave.o \

		drm_encoder_slave.o \

		drm_trace_points.o drm_prime.o \

		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o drm_atomic.o drm_bridge.o \

drivers/gpu/drm/arc/arcpgu_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ err_unload: 
	arcpgu_unload(drm);



err_unref:

	drm_dev_unref(drm);

	drm_dev_put(drm);



	return ret;

}
@@ -201,7 +201,7 @@ static int arcpgu_remove(struct platform_device *pdev) 


	drm_dev_unregister(drm);

	arcpgu_unload(drm);

	drm_dev_unref(drm);

	drm_dev_put(drm);



	return 0;

}

drivers/gpu/drm/bridge/tc358764.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void tc358764_detach(struct drm_bridge *bridge) 
	drm_fb_helper_remove_one_connector(drm->fb_helper, &ctx->connector);

	drm_panel_detach(ctx->panel);

	ctx->panel = NULL;

	drm_connector_unreference(&ctx->connector);

	drm_connector_put(&ctx->connector);

}



static const struct drm_bridge_funcs tc358764_bridge_funcs = {

drivers/gpu/drm/drm_atomic_helper.c

+6 −1
Original line number Diff line number Diff line
@@ -1460,6 +1460,9 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev, 
			DRM_ERROR("[CRTC:%d:%s] flip_done timed out\n",

				  crtc->base.id, crtc->name);

	}



	if (old_state->fake_commit)

		complete_all(&old_state->fake_commit->flip_done);

}

EXPORT_SYMBOL(drm_atomic_helper_wait_for_flip_done);
@@ -2217,8 +2220,10 @@ void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *old_state) 
		spin_unlock(&crtc->commit_lock);

	}



	if (old_state->fake_commit)

	if (old_state->fake_commit) {

		complete_all(&old_state->fake_commit->cleanup_done);

		WARN_ON(!try_wait_for_completion(&old_state->fake_commit->hw_done));

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done);

CRA Git | Maintained and supported by SUSTech CRA and CCSE