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

Commit 235e6def authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-09-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

couple of display fixes.

* tag 'drm-intel-fixes-2014-09-18' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv
  drm/i915: Fix SRC_COPY width on 830/845g
parents b5591bd6 8c875fca

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);