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

Commit 6c94804f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-10-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 

Quick 4.15 misc pull for the build fix:

Cross-subsystem Changes:
- piles an piles of misc/trivial patches all over, some more from
  outreachy applicants

Core Changes:
- build fix for the bridge/of cleanup (Maarten)
- fix vblank count in arm_vblank_event (Ville)
- some kerneldoc typo fixes from Thierry

Driver Changes:
- vc4: Fix T-format tiling scanout, cleanup clock divider w/a (Anholt)
- sun4i: small cleanups and improved code comments all over (Chen-Yu
  Tsai)

* tag 'drm-misc-next-2017-10-16' of git://anongit.freedesktop.org/drm/drm-misc: (21 commits)
  drm/via: use ARRAY_SIZE
  drm/gma500: use ARRAY_SIZE
  drm/sun4i: hdmi: Move PAD_CTRL1 setting to mode_set function
  drm/sun4i: hdmi: Document PAD_CTRL1 output invert bits
  drm/sun4i: backend: Add comment explaining why registers are cleared
  drm/sun4i: backend: Use drm_fb_cma_get_gem_addr() to get display memory
  drm/sun4i: backend: Create regmap after access is possible
  drm/sun4i: don't add components that are already in the queue
  drm/vc4: Fix pitch setup for T-format scanout.
  drm/vc4: Move the DSI clock divider workaround closer to the clock call.
  drm: Replace kzalloc with kcalloc
  drm/tinydrm: Remove explicit .best_encoder assignment
  drm/tinydrm: Replace dev_error with DRM_DEV_ERROR
  drm/drm_of: Move drm_of_panel_bridge_remove_function into header.
  drm/atomic-helper: Fix reference to drm_crtc_send_vblank_event()
  drm/atomic-helper: Fix typo
  drm: Add missing __user annotation to drm_syncobj_array_find()
  drm/rockchip: add PINCTRL dependency for LVDS
  drm/kirin: Checking for IS_ERR() instead of NULL
  driver:gpu: return -ENOMEM on allocation failure.
  ...
parents 787e1b74 2e20c9dd

drivers/gpu/drm/drm_atomic_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ crtc_or_fake_commit(struct drm_atomic_state *state, struct drm_crtc *crtc) 
 * drm_atomic_helper_commit_cleanup_done().

 *

 * This is all implemented by in drm_atomic_helper_commit(), giving drivers a

 * complete and esay-to-use default implementation of the atomic_commit() hook.

 * complete and easy-to-use default implementation of the atomic_commit() hook.

 *

 * The tracking of asynchronously executed and still pending commits is done

 * using the core structure &drm_crtc_commit.
@@ -1819,7 +1819,7 @@ EXPORT_SYMBOL(drm_atomic_helper_setup_commit); 
 * This function waits for all preceeding commits that touch the same CRTC as

 * @old_state to both be committed to the hardware (as signalled by

 * drm_atomic_helper_commit_hw_done) and executed by the hardware (as signalled

 * by calling drm_crtc_vblank_send_event() on the &drm_crtc_state.event).

 * by calling drm_crtc_send_vblank_event() on the &drm_crtc_state.event).

 *

 * This is part of the atomic helper support for nonblocking commits, see

 * drm_atomic_helper_setup_commit() for an overview.

drivers/gpu/drm/drm_crtc_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -562,12 +562,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, 
	 * Allocate space for the backup of all (non-pointer) encoder and

	 * connector data.

	 */

	save_encoder_crtcs = kzalloc(dev->mode_config.num_encoder *

	save_encoder_crtcs = kcalloc(dev->mode_config.num_encoder,

				sizeof(struct drm_crtc *), GFP_KERNEL);

	if (!save_encoder_crtcs)

		return -ENOMEM;



	save_connector_encoders = kzalloc(dev->mode_config.num_connector *

	save_connector_encoders = kcalloc(dev->mode_config.num_connector,

				sizeof(struct drm_encoder *), GFP_KERNEL);

	if (!save_connector_encoders) {

		kfree(save_encoder_crtcs);

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -2266,7 +2266,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, 
	if (modes[n] == NULL)

		return best_score;



	crtcs = kzalloc(fb_helper->connector_count *

	crtcs = kcalloc(fb_helper->connector_count,

			sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);

	if (!crtcs)

		return best_score;

drivers/gpu/drm/drm_of.c

+0 −33
Original line number Diff line number Diff line
@@ -262,36 +262,3 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, 
	return ret;

}

EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge);
 


#ifdef CONFIG_DRM_PANEL_BRIDGE

/*

 * drm_of_panel_bridge_remove - remove panel bridge

 * @np: device tree node containing panel bridge output ports

 *

 * Remove the panel bridge of a given DT node's port and endpoint number

 *

 * Returns zero if successful, or one of the standard error codes if it fails.

 */

int drm_of_panel_bridge_remove(const struct device_node *np,

			       int port, int endpoint)

{

	struct drm_bridge *bridge;

	struct device_node *remote;



	remote = of_graph_get_remote_node(np, port, endpoint);

	if (!remote)

		return -ENODEV;



	bridge = of_drm_find_bridge(remote);

	drm_panel_bridge_remove(bridge);



	return 0;

}

#else

int drm_of_panel_bridge_remove(const struct device_node *np,

			       int port, int endpoint)

{

	return -EINVAL;

}

#endif

EXPORT_SYMBOL_GPL(drm_of_panel_bridge_remove);

drivers/gpu/drm/drm_plane_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, 
	/* Find current connectors for CRTC */

	num_connectors = get_connectors_for_crtc(crtc, NULL, 0);

	BUG_ON(num_connectors == 0);

	connector_list = kzalloc(num_connectors * sizeof(*connector_list),

	connector_list = kcalloc(num_connectors, sizeof(*connector_list),

				 GFP_KERNEL);

	if (!connector_list)

		return -ENOMEM;