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

Commit 1734a6e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of radeon fixes for oops on module unload, and problems with
  resetting the dma engine, one nouveau fix for black boxes in rendering
  on my mbp retina, one sti fix, and a couple of intel fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: ltc/gf100-: fix cbc issues on certain boards
  drm/bochs: add missing drm_connector_register call
  drm/cirrus: add missing drm_connector_register call
  drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
  drm/nouveau/runpm: fix module unload
  drm/radeon/px: fix module unload
  vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
  drm/radeon: don't reset dma on r6xx-evergreen init
  drm/radeon: don't reset sdma on CIK init
  drm/radeon: don't reset dma on NI/SI init
  drm/radeon/dpm: fix resume on mullins
  drm/radeon: Disable HDP flush before every CS again for < r600
  drm/radeon: delete unused PTE_* defines
  drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv
  drm: sti: do not iterate over the info frame array
  drm/i915: Fix SRC_COPY width on 830/845g
parents 46be7b73 fe3d9c4b

drivers/gpu/drm/bochs/bochs_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ static void bochs_connector_init(struct drm_device *dev) 
			   DRM_MODE_CONNECTOR_VIRTUAL);

	drm_connector_helper_add(connector,

				 &bochs_connector_connector_helper_funcs);

	drm_connector_register(connector);

}

drivers/gpu/drm/cirrus/cirrus_mode.c

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static struct drm_connector *cirrus_vga_init(struct drm_device *dev) 


	drm_connector_helper_add(connector, &cirrus_vga_connector_helper_funcs);



	drm_connector_register(connector);

	return connector;

}

drivers/gpu/drm/i915/intel_dp.c

+4 −0
Original line number Diff line number Diff line
@@ -1631,6 +1631,10 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 


	pipe_config->adjusted_mode.flags |= flags;



	if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev) &&

	    tmp & DP_COLOR_RANGE_16_235)

		pipe_config->limited_color_range = true;



	pipe_config->has_dp_encoder = true;



	intel_dp_get_m_n(crtc, pipe_config);

drivers/gpu/drm/i915/intel_hdmi.c

+6 −1
Original line number Diff line number Diff line
@@ -712,7 +712,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, 
				  struct intel_crtc_config *pipe_config)

{

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 tmp, flags = 0;

	int dotclock;
@@ -734,6 +735,10 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, 
	if (tmp & HDMI_MODE_SELECT_HDMI)

		pipe_config->has_audio = true;



	if (!HAS_PCH_SPLIT(dev) &&

	    tmp & HDMI_COLOR_RANGE_16_235)

		pipe_config->limited_color_range = true;



	pipe_config->adjusted_mode.flags |= flags;



	if ((tmp & SDVO_COLOR_FORMAT_MASK) == HDMI_COLOR_FORMAT_12bpc)

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ i830_dispatch_execbuffer(struct intel_engine_cs *ring, 
		 */

		intel_ring_emit(ring, SRC_COPY_BLT_CMD | BLT_WRITE_RGBA);

		intel_ring_emit(ring, BLT_DEPTH_32 | BLT_ROP_SRC_COPY | 4096);

		intel_ring_emit(ring, DIV_ROUND_UP(len, 4096) << 16 | 1024);

		intel_ring_emit(ring, DIV_ROUND_UP(len, 4096) << 16 | 4096);

		intel_ring_emit(ring, cs_offset);

		intel_ring_emit(ring, 4096);

		intel_ring_emit(ring, offset);