Commit 53d8858b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2015-03-31' of git://anongit.freedesktop.org/drm-intel into drm-next 

Final drm-misc pull for 4.0, just various things all over, including a few
more important atomic fixes. btw I didn't pick up the vmwgfx patch from
Ville's series, but one patch has one hunk touching vmwgfx and
Thomas/Jakob didn't get around to ack it. I figured it's simple enough to
be ok though.

* tag 'topic/drm-misc-2015-03-31' of git://anongit.freedesktop.org/drm-intel:
  drm: line wrap DRM_IOCTL_DEF* macros
  drm/atomic: Don't try to free a NULL state
  drm/atomic: Clear crtcs, connectors and planes when clearing state
  drm: Rewrite drm_ioctl_flags() to resemble the new drm_ioctl() code
  drm: Use max() to make the ioctl alloc size code cleaner
  drm: Simplify core vs. drv ioctl handling
  drm: Drop ioctl->cmd_drv
  drm: Fix DRM_IOCTL_DEF_DRV()
  drm/atomic-helpers: Properly avoid full modeset dance
  drm: atomic: Allow setting CRTC active property
  drm: atomic: Expose CRTC active property
  drm: crtc_helper: Update hwmode before mode_set call
  drm: mode: Allow NULL modes for equality check
  drm: fb_helper: Simplify exit condition
  drm: mode: Fix typo in kerneldoc
  drm/dp: Print the number of bytes processed for aux nacks
parents 9e87e48f 066626d5

drivers/gpu/drm/drm_atomic.c

+22 −5
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ void drm_atomic_state_clear(struct drm_atomic_state *state) 


		connector->funcs->atomic_destroy_state(connector,

						       state->connector_states[i]);

		state->connectors[i] = NULL;

		state->connector_states[i] = NULL;

	}
@@ -145,6 +146,7 @@ void drm_atomic_state_clear(struct drm_atomic_state *state) 


		crtc->funcs->atomic_destroy_state(crtc,

						  state->crtc_states[i]);

		state->crtcs[i] = NULL;

		state->crtc_states[i] = NULL;

	}
@@ -156,6 +158,7 @@ void drm_atomic_state_clear(struct drm_atomic_state *state) 


		plane->funcs->atomic_destroy_state(plane,

						   state->plane_states[i]);

		state->planes[i] = NULL;

		state->plane_states[i] = NULL;

	}

}
@@ -170,6 +173,9 @@ EXPORT_SYMBOL(drm_atomic_state_clear); 
 */

void drm_atomic_state_free(struct drm_atomic_state *state)

{

	if (!state)

		return;



	drm_atomic_state_clear(state);



	DRM_DEBUG_ATOMIC("Freeing atomic state %p\n", state);
@@ -248,11 +254,14 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, 
	struct drm_mode_config *config = &dev->mode_config;



	/* FIXME: Mode prop is missing, which also controls ->enable. */

	if (property == config->prop_active) {

	if (property == config->prop_active)

		state->active = val;

	} else if (crtc->funcs->atomic_set_property)

	else if (crtc->funcs->atomic_set_property)

		return crtc->funcs->atomic_set_property(crtc, state, property, val);

	else

		return -EINVAL;



	return 0;

}

EXPORT_SYMBOL(drm_atomic_crtc_set_property);
@@ -266,9 +275,17 @@ int drm_atomic_crtc_get_property(struct drm_crtc *crtc, 
		const struct drm_crtc_state *state,

		struct drm_property *property, uint64_t *val)

{

	if (crtc->funcs->atomic_get_property)

	struct drm_device *dev = crtc->dev;

	struct drm_mode_config *config = &dev->mode_config;



	if (property == config->prop_active)

		*val = state->active;

	else if (crtc->funcs->atomic_get_property)

		return crtc->funcs->atomic_get_property(crtc, state, property, val);

	else

		return -EINVAL;



	return 0;

}



/**

drivers/gpu/drm/drm_atomic_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -587,7 +587,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) 


		old_crtc_state = old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)];



		if (!old_crtc_state->active)

		if (!old_crtc_state->active ||

		    !needs_modeset(old_conn_state->crtc->state))

			continue;



		encoder = old_conn_state->best_encoder;
@@ -847,7 +848,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		if (!connector || !connector->state->best_encoder)

			continue;



		if (!connector->state->crtc->state->active)

		if (!connector->state->crtc->state->active ||

		    !needs_modeset(connector->state->crtc->state))

			continue;



		encoder = connector->state->best_encoder;

drivers/gpu/drm/drm_crtc_helper.c

+5 −4
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
			      struct drm_framebuffer *old_fb)

{

	struct drm_device *dev = crtc->dev;

	struct drm_display_mode *adjusted_mode, saved_mode;

	struct drm_display_mode *adjusted_mode, saved_mode, saved_hwmode;

	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;

	struct drm_encoder_helper_funcs *encoder_funcs;

	int saved_x, saved_y;
@@ -292,6 +292,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	}



	saved_mode = crtc->mode;

	saved_hwmode = crtc->hwmode;

	saved_x = crtc->x;

	saved_y = crtc->y;
@@ -334,6 +335,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	}

	DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);



	crtc->hwmode = *adjusted_mode;



	/* Prepare the encoders and CRTCs before setting the mode. */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
@@ -396,9 +399,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
			encoder->bridge->funcs->enable(encoder->bridge);

	}



	/* Store real post-adjustment hardware mode. */

	crtc->hwmode = *adjusted_mode;



	/* Calculate and store various constants which

	 * are later needed by vblank and swap-completion

	 * timestamping. They are derived from true hwmode.
@@ -411,6 +411,7 @@ done: 
	if (!ret) {

		crtc->enabled = saved_enabled;

		crtc->mode = saved_mode;

		crtc->hwmode = saved_hwmode;

		crtc->x = saved_x;

		crtc->y = saved_y;

	}

drivers/gpu/drm/drm_dp_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
			break;



		case DP_AUX_NATIVE_REPLY_NACK:

			DRM_DEBUG_KMS("native nack\n");

			DRM_DEBUG_KMS("native nack (result=%d, size=%zu)\n", ret, msg->size);

			return -EREMOTEIO;



		case DP_AUX_NATIVE_REPLY_DEFER:
@@ -493,7 +493,7 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
			return ret;



		case DP_AUX_I2C_REPLY_NACK:

			DRM_DEBUG_KMS("I2C nack\n");

			DRM_DEBUG_KMS("I2C nack (result=%d, size=%zu\n", ret, msg->size);

			aux->i2c_nack_count++;

			return -EREMOTEIO;

drivers/gpu/drm/drm_fb_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -1283,12 +1283,12 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f 
						      int width, int height)

{

	struct drm_cmdline_mode *cmdline_mode;

	struct drm_display_mode *mode = NULL;

	struct drm_display_mode *mode;

	bool prefer_non_interlace;



	cmdline_mode = &fb_helper_conn->connector->cmdline_mode;

	if (cmdline_mode->specified == false)

		return mode;

		return NULL;



	/* attempt to find a matching mode in the list of modes

	 *  we have gotten so far, if not add a CVT mode that conforms

CRA Git | Maintained and supported by SUSTech CRA and CCSE