Commit 9e154001 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.13-rc7' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Fixes for rc7, nothing too crazy, some core, i915, and sunxi fixes,
  Intel CI has been responsible for some of these fixes being required"

* tag 'drm-fixes-for-v4.13-rc7' of git://people.freedesktop.org/~airlied/linux:
  drm/i915/gvt: Fix the kernel null pointer error
  drm: Release driver tracking before making the object available again
  drm/i915: Clear lost context-switch interrupts across reset
  drm/i915/bxt: use NULL for GPIO connection ID
  drm/i915/cnl: Fix LSPCON support.
  drm/i915/vbt: ignore extraneous child devices for a port
  drm/i915: Initialize 'data' in intel_dsi_dcs_backlight.c
  drm/atomic: If the atomic check fails, return its value first
  drm/atomic: Handle -EDEADLK with out-fences correctly
  drm: Fix framebuffer leak
  drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane
  gpu: ipu-v3: add DRM dependency
  drm/rockchip: Fix suspend crash when drm is not bound
  drm/sun4i: Implement drm_driver lastclose to restore fbdev console
parents 90a6cd50 da611979

drivers/gpu/drm/drm_atomic.c

+8 −3
Original line number Diff line number Diff line
@@ -1655,6 +1655,9 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	if (config->funcs->atomic_check)

		ret = config->funcs->atomic_check(state->dev, state);



	if (ret)

		return ret;



	if (!state->allow_modeset) {

		for_each_new_crtc_in_state(state, crtc, crtc_state, i) {

			if (drm_atomic_crtc_needs_modeset(crtc_state)) {
@@ -1665,7 +1668,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
		}

	}



	return ret;

	return 0;

}

EXPORT_SYMBOL(drm_atomic_check_only);
@@ -2167,10 +2170,10 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
	struct drm_atomic_state *state;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_plane *plane;

	struct drm_out_fence_state *fence_state = NULL;

	struct drm_out_fence_state *fence_state;

	unsigned plane_mask;

	int ret = 0;

	unsigned int i, j, num_fences = 0;

	unsigned int i, j, num_fences;



	/* disallow for drivers not supporting atomic: */

	if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
@@ -2211,6 +2214,8 @@ retry: 
	plane_mask = 0;

	copied_objs = 0;

	copied_props = 0;

	fence_state = NULL;

	num_fences = 0;



	for (i = 0; i < arg->count_objs; i++) {

		uint32_t obj_id, count_props;

drivers/gpu/drm/drm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -255,13 +255,13 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
	struct drm_gem_object *obj = ptr;

	struct drm_device *dev = obj->dev;



	if (dev->driver->gem_close_object)

		dev->driver->gem_close_object(obj, file_priv);



	if (drm_core_check_feature(dev, DRIVER_PRIME))

		drm_gem_remove_prime_handles(obj, file_priv);

	drm_vma_node_revoke(&obj->vma_node, file_priv);



	if (dev->driver->gem_close_object)

		dev->driver->gem_close_object(obj, file_priv);



	drm_gem_object_handle_put_unlocked(obj);



	return 0;

drivers/gpu/drm/drm_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ int drm_mode_setplane(struct drm_device *dev, void *data, 


		crtc = drm_crtc_find(dev, plane_req->crtc_id);

		if (!crtc) {

			drm_framebuffer_put(fb);

			DRM_DEBUG_KMS("Unknown crtc ID %d\n",

				      plane_req->crtc_id);

			return -ENOENT;

drivers/gpu/drm/i915/gvt/cmd_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -2714,7 +2714,7 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
unmap_src:

	i915_gem_object_unpin_map(obj);

put_obj:

	i915_gem_object_put(wa_ctx->indirect_ctx.obj);

	i915_gem_object_put(obj);

	return ret;

}

drivers/gpu/drm/i915/intel_bios.c

+9 −6
Original line number Diff line number Diff line
@@ -1120,8 +1120,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
	bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;

	uint8_t aux_channel, ddc_pin;

	/* Each DDI port can have more than one value on the "DVO Port" field,

	 * so look for all the possible values for each port and abort if more

	 * than one is found. */

	 * so look for all the possible values for each port.

	 */

	int dvo_ports[][3] = {

		{DVO_PORT_HDMIA, DVO_PORT_DPA, -1},

		{DVO_PORT_HDMIB, DVO_PORT_DPB, -1},
@@ -1130,7 +1130,10 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
		{DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE},

	};



	/* Find the child device to use, abort if more than one found. */

	/*

	 * Find the first child device to reference the port, report if more

	 * than one found.

	 */

	for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {

		it = dev_priv->vbt.child_dev + i;
@@ -1140,14 +1143,14 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 


			if (it->common.dvo_port == dvo_ports[port][j]) {

				if (child) {

					DRM_DEBUG_KMS("More than one child device for port %c in VBT.\n",

					DRM_DEBUG_KMS("More than one child device for port %c in VBT, using the first.\n",

						      port_name(port));

					return;

				}

				} else {

					child = it;

				}

			}

		}

	}

	if (!child)

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE