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

Commit 25b21037 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Initialise g4x watermarks for disabled pipes
  drm/i915: Sanitize the output registers after resume
  drm/i915/tv: Fix modeset flickering introduced in 7f58aabc
  drm/i915/tv: Only poll for TV connections
  drm/i915/tv: Remember the detected TV type
parents ec616048 5c72d064

drivers/gpu/drm/i915/intel_display.c

+40 −33
Original line number Diff line number Diff line
@@ -3771,8 +3771,11 @@ static bool g4x_compute_wm0(struct drm_device *dev, 
	int entries, tlb_miss;



	crtc = intel_get_crtc_for_plane(dev, plane);

	if (crtc->fb == NULL || !crtc->enabled)

	if (crtc->fb == NULL || !crtc->enabled) {

		*cursor_wm = cursor->guard_size;

		*plane_wm = display->guard_size;

		return false;

	}



	htotal = crtc->mode.htotal;

	hdisplay = crtc->mode.hdisplay;
@@ -6215,36 +6218,6 @@ cleanup_work: 
	return ret;

}



static void intel_crtc_reset(struct drm_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	/* Reset flags back to the 'unknown' status so that they

	 * will be correctly set on the initial modeset.

	 */

	intel_crtc->dpms_mode = -1;

}



static struct drm_crtc_helper_funcs intel_helper_funcs = {

	.dpms = intel_crtc_dpms,

	.mode_fixup = intel_crtc_mode_fixup,

	.mode_set = intel_crtc_mode_set,

	.mode_set_base = intel_pipe_set_base,

	.mode_set_base_atomic = intel_pipe_set_base_atomic,

	.load_lut = intel_crtc_load_lut,

	.disable = intel_crtc_disable,

};



static const struct drm_crtc_funcs intel_crtc_funcs = {

	.reset = intel_crtc_reset,

	.cursor_set = intel_crtc_cursor_set,

	.cursor_move = intel_crtc_cursor_move,

	.gamma_set = intel_crtc_gamma_set,

	.set_config = drm_crtc_helper_set_config,

	.destroy = intel_crtc_destroy,

	.page_flip = intel_crtc_page_flip,

};



static void intel_sanitize_modesetting(struct drm_device *dev,

				       int pipe, int plane)

{
@@ -6281,6 +6254,42 @@ static void intel_sanitize_modesetting(struct drm_device *dev, 
	intel_disable_pipe(dev_priv, pipe);

}



static void intel_crtc_reset(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	/* Reset flags back to the 'unknown' status so that they

	 * will be correctly set on the initial modeset.

	 */

	intel_crtc->dpms_mode = -1;



	/* We need to fix up any BIOS configuration that conflicts with

	 * our expectations.

	 */

	intel_sanitize_modesetting(dev, intel_crtc->pipe, intel_crtc->plane);

}



static struct drm_crtc_helper_funcs intel_helper_funcs = {

	.dpms = intel_crtc_dpms,

	.mode_fixup = intel_crtc_mode_fixup,

	.mode_set = intel_crtc_mode_set,

	.mode_set_base = intel_pipe_set_base,

	.mode_set_base_atomic = intel_pipe_set_base_atomic,

	.load_lut = intel_crtc_load_lut,

	.disable = intel_crtc_disable,

};



static const struct drm_crtc_funcs intel_crtc_funcs = {

	.reset = intel_crtc_reset,

	.cursor_set = intel_crtc_cursor_set,

	.cursor_move = intel_crtc_cursor_move,

	.gamma_set = intel_crtc_gamma_set,

	.set_config = drm_crtc_helper_set_config,

	.destroy = intel_crtc_destroy,

	.page_flip = intel_crtc_page_flip,

};



static void intel_crtc_init(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -6330,8 +6339,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) 


	setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,

		    (unsigned long)intel_crtc);



	intel_sanitize_modesetting(dev, intel_crtc->pipe, intel_crtc->plane);

}



int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,

drivers/gpu/drm/i915/intel_tv.c

+5 −4
Original line number Diff line number Diff line
@@ -1151,10 +1151,10 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
			    (video_levels->blank << TV_BLANK_LEVEL_SHIFT)));

	{

		int pipeconf_reg = PIPECONF(pipe);

		int dspcntr_reg = DSPCNTR(pipe);

		int dspcntr_reg = DSPCNTR(intel_crtc->plane);

		int pipeconf = I915_READ(pipeconf_reg);

		int dspcntr = I915_READ(dspcntr_reg);

		int dspbase_reg = DSPADDR(pipe);

		int dspbase_reg = DSPADDR(intel_crtc->plane);

		int xpos = 0x0, ypos = 0x0;

		unsigned int xsize, ysize;

		/* Pipe must be off here */
@@ -1378,7 +1378,9 @@ intel_tv_detect(struct drm_connector *connector, bool force) 
	if (type < 0)

		return connector_status_disconnected;



	intel_tv->type = type;

	intel_tv_find_better_format(connector);



	return connector_status_connected;

}
@@ -1670,8 +1672,7 @@ intel_tv_init(struct drm_device *dev) 
	 *

	 * More recent chipsets favour HDMI rather than integrated S-Video.

	 */

	connector->polled =

		DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;

	connector->polled = DRM_CONNECTOR_POLL_CONNECT;



	drm_connector_init(dev, connector, &intel_tv_connector_funcs,

			   DRM_MODE_CONNECTOR_SVIDEO);