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

Commit 9c275407 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes 

Daniel Vetter writes"
Nothing big at all for -fixes, just small stuff:
- Two patches to fix bugs on i830M
- ums regression fixer due to kicking firmeware fbs (Chris)
- tune down a too loud warning (Jani)
- be more careful with sdvo infoframes, which fixes a long-standing
  sdvo-hdmi regression"

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Only kick out vesafb if we takeover the fbcon with KMS
  drm/i915: be less verbose about inability to provide vendor backlight
  drm/i915: clear the entire sdvo infoframe buffer
  drm/i915: VGA needs to be on pipe A on i830M
  drm/i915: fix overlay on i830M
parents 4936b172 1623392a

drivers/gpu/drm/i915/i915_dma.c

+2 −1
Original line number Diff line number Diff line
@@ -1505,6 +1505,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto put_gmch;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		i915_kick_out_firmware_fb(dev_priv);



	pci_set_master(dev->pdev);

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ void intel_crt_init(struct drm_device *dev) 


	crt->base.type = INTEL_OUTPUT_ANALOG;

	crt->base.cloneable = true;

	if (IS_HASWELL(dev))

	if (IS_HASWELL(dev) || IS_I830(dev))

		crt->base.crtc_mask = (1 << 0);

	else

		crt->base.crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

drivers/gpu/drm/i915/intel_overlay.c

+11 −3
Original line number Diff line number Diff line
@@ -341,9 +341,17 @@ static int intel_overlay_off(struct intel_overlay *overlay) 
	intel_ring_emit(ring, flip_addr);

	intel_ring_emit(ring, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);

	/* turn overlay off */

	if (IS_I830(dev)) {

		/* Workaround: Don't disable the overlay fully, since otherwise

		 * it dies on the next OVERLAY_ON cmd. */

		intel_ring_emit(ring, MI_NOOP);

		intel_ring_emit(ring, MI_NOOP);

		intel_ring_emit(ring, MI_NOOP);

	} else {

		intel_ring_emit(ring, MI_OVERLAY_FLIP | MI_OVERLAY_OFF);

		intel_ring_emit(ring, flip_addr);

		intel_ring_emit(ring, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);

	}

	intel_ring_advance(ring);



	return intel_overlay_do_wait_request(overlay, intel_overlay_off_tail);

drivers/gpu/drm/i915/intel_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int intel_panel_setup_backlight(struct drm_device *dev) 
	props.type = BACKLIGHT_RAW;

	props.max_brightness = _intel_panel_get_max_backlight(dev);

	if (props.max_brightness == 0) {

		DRM_ERROR("Failed to get maximum backlight value\n");

		DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n");

		return -ENODEV;

	}

	dev_priv->backlight =

drivers/gpu/drm/i915/intel_sdvo.c

+42 −20
Original line number Diff line number Diff line
@@ -894,6 +894,45 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo) 
}

#endif



static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,

				       unsigned if_index, uint8_t tx_rate,

				       uint8_t *data, unsigned length)

{

	uint8_t set_buf_index[2] = { if_index, 0 };

	uint8_t hbuf_size, tmp[8];

	int i;



	if (!intel_sdvo_set_value(intel_sdvo,

				  SDVO_CMD_SET_HBUF_INDEX,

				  set_buf_index, 2))

		return false;



	if (!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HBUF_INFO,

				  &hbuf_size, 1))

		return false;



	/* Buffer size is 0 based, hooray! */

	hbuf_size++;



	DRM_DEBUG_KMS("writing sdvo hbuf: %i, hbuf_size %i, hbuf_size: %i\n",

		      if_index, length, hbuf_size);



	for (i = 0; i < hbuf_size; i += 8) {

		memset(tmp, 0, 8);

		if (i < length)

			memcpy(tmp, data + i, min_t(unsigned, 8, length - i));



		if (!intel_sdvo_set_value(intel_sdvo,

					  SDVO_CMD_SET_HBUF_DATA,

					  tmp, 8))

			return false;

	}



	return intel_sdvo_set_value(intel_sdvo,

				    SDVO_CMD_SET_HBUF_TXRATE,

				    &tx_rate, 1);

}



static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo)

{

	struct dip_infoframe avi_if = {
@@ -901,11 +940,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo) 
		.ver = DIP_VERSION_AVI,

		.len = DIP_LEN_AVI,

	};

	uint8_t tx_rate = SDVO_HBUF_TX_VSYNC;

	uint8_t set_buf_index[2] = { 1, 0 };

	uint8_t sdvo_data[4 + sizeof(avi_if.body.avi)];

	uint64_t *data = (uint64_t *)sdvo_data;

	unsigned i;



	intel_dip_infoframe_csum(&avi_if);
@@ -915,22 +950,9 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo) 
	sdvo_data[3] = avi_if.checksum;

	memcpy(&sdvo_data[4], &avi_if.body, sizeof(avi_if.body.avi));



	if (!intel_sdvo_set_value(intel_sdvo,

				  SDVO_CMD_SET_HBUF_INDEX,

				  set_buf_index, 2))

		return false;



	for (i = 0; i < sizeof(sdvo_data); i += 8) {

		if (!intel_sdvo_set_value(intel_sdvo,

					  SDVO_CMD_SET_HBUF_DATA,

					  data, 8))

			return false;

		data++;

	}



	return intel_sdvo_set_value(intel_sdvo,

				    SDVO_CMD_SET_HBUF_TXRATE,

				    &tx_rate, 1);

	return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF,

					  SDVO_HBUF_TX_VSYNC,

					  sdvo_data, sizeof(sdvo_data));

}



static bool intel_sdvo_set_tv_format(struct intel_sdvo *intel_sdvo)