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

Commit 7279d7cb 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:
 "All pretty normal: one TTM oops fix, one radeon, a few intel and a
  vmwgfx fix."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: remove unneeded preempt_disable/enable
  ttm: Clear the ttm page allocated from high memory zone correctly
  vmwgfx: return an -EFAULT if copy_to_user() fails
  drm/radeon: fix logic error in atombios_encoders.c
  drm/i915: do not ignore eDP bpc settings from vbt
  drm/i915/sdvo: clean up connectors on intel_sdvo_init() failures
  drm/i915/crt: fix DPMS standby and suspend mode handling
parents e057aad1 6f755116

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode) 
	int old_dpms;



	/* PCH platforms and VLV only support on/off. */

	if (INTEL_INFO(dev)->gen < 5 && mode != DRM_MODE_DPMS_ON)

	if (INTEL_INFO(dev)->gen >= 5 && mode != DRM_MODE_DPMS_ON)

		mode = DRM_MODE_DPMS_OFF;



	if (mode == connector->dpms)

drivers/gpu/drm/i915/intel_display.c

+11 −0
Original line number Diff line number Diff line
@@ -3841,6 +3841,17 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, 
			}

		}



		if (intel_encoder->type == INTEL_OUTPUT_EDP) {

			/* Use VBT settings if we have an eDP panel */

			unsigned int edp_bpc = dev_priv->edp.bpp / 3;



			if (edp_bpc < display_bpc) {

				DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc);

				display_bpc = edp_bpc;

			}

			continue;

		}



		/*

		 * HDMI is either 12 or 8, so if the display lets 10bpc sneak

		 * through, clamp it down.  (Note: >12bpc will be caught below.)

drivers/gpu/drm/i915/intel_sdvo.c

+19 −3
Original line number Diff line number Diff line
@@ -2382,6 +2382,18 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags) 
	return true;

}



static void intel_sdvo_output_cleanup(struct intel_sdvo *intel_sdvo)

{

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

	struct drm_connector *connector, *tmp;



	list_for_each_entry_safe(connector, tmp,

				 &dev->mode_config.connector_list, head) {

		if (intel_attached_encoder(connector) == &intel_sdvo->base)

			intel_sdvo_destroy(connector);

	}

}



static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,

					  struct intel_sdvo_connector *intel_sdvo_connector,

					  int type)
@@ -2705,7 +2717,8 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
				    intel_sdvo->caps.output_flags) != true) {

		DRM_DEBUG_KMS("SDVO output failed to setup on %s\n",

			      SDVO_NAME(intel_sdvo));

		goto err;

		/* Output_setup can leave behind connectors! */

		goto err_output;

	}



	/* Only enable the hotplug irq if we need it, to work around noisy
@@ -2718,12 +2731,12 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 


	/* Set the input timing to the screen. Assume always input 0. */

	if (!intel_sdvo_set_target_input(intel_sdvo))

		goto err;

		goto err_output;



	if (!intel_sdvo_get_input_pixel_clock_range(intel_sdvo,

						    &intel_sdvo->pixel_clock_min,

						    &intel_sdvo->pixel_clock_max))

		goto err;

		goto err_output;



	DRM_DEBUG_KMS("%s device VID/DID: %02X:%02X.%02X, "

			"clock range %dMHz - %dMHz, "
@@ -2743,6 +2756,9 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
			(SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');

	return true;



err_output:

	intel_sdvo_output_cleanup(intel_sdvo);



err:

	drm_encoder_cleanup(&intel_encoder->base);

	i2c_del_adapter(&intel_sdvo->ddc);

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

			/* some early dce3.2 boards have a bug in their transmitter control table */

			if ((rdev->family != CHIP_RV710) || (rdev->family != CHIP_RV730))

			if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730))

				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);

		}

		if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {

drivers/gpu/drm/ttm/ttm_page_alloc.c

+4 −1
Original line number Diff line number Diff line
@@ -749,6 +749,9 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, 
	/* clear the pages coming from the pool if requested */

	if (flags & TTM_PAGE_FLAG_ZERO_ALLOC) {

		list_for_each_entry(p, &plist, lru) {

			if (PageHighMem(p))

				clear_highpage(p);

			else

				clear_page(page_address(p));

		}

	}