Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (1caa5900) · Commits · 戴 / test

drivers/gpu/drm/drm_crtc.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2326,7 +2326,6 @@ int drm_mode_addfb(struct drm_device *dev,
		fb = dev->mode_config.funcs->fb_create(dev, file_priv, &r);
		if (IS_ERR(fb)) {
		DRM_DEBUG_KMS("could not create framebuffer\n");
		drm_modeset_unlock_all(dev);
		return PTR_ERR(fb);
		}

		@@ -2506,7 +2505,6 @@ int drm_mode_addfb2(struct drm_device *dev,
		fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
		if (IS_ERR(fb)) {
		DRM_DEBUG_KMS("could not create framebuffer\n");
		drm_modeset_unlock_all(dev);
		return PTR_ERR(fb);
		}

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ eb_create(struct drm_i915_gem_execbuffer2 *args)
		if (eb == NULL) {
		int size = args->buffer_count;
		int count = PAGE_SIZE / sizeof(struct hlist_head) / 2;
		BUILD_BUG_ON(!is_power_of_2(PAGE_SIZE / sizeof(struct hlist_head)));
		BUILD_BUG_ON_NOT_POWER_OF_2(PAGE_SIZE / sizeof(struct hlist_head));
		while (count > 2*size)
		count >>= 1;
		eb = kzalloc(count*sizeof(struct hlist_head) +

drivers/gpu/drm/i915/intel_crt.c

+17 −23

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@

		struct intel_crt {
		struct intel_encoder base;
		/* DPMS state is stored in the connector, which we need in the
		* encoder's enable/disable callbacks */
		struct intel_connector *connector;
		bool force_hotplug_required;
		u32 adpa_reg;
		};
		@@ -81,29 +84,6 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
		return true;
		}

		static void intel_disable_crt(struct intel_encoder *encoder)
		{
		struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
		struct intel_crt *crt = intel_encoder_to_crt(encoder);
		u32 temp;

		temp = I915_READ(crt->adpa_reg);
		temp \|= ADPA_HSYNC_CNTL_DISABLE \| ADPA_VSYNC_CNTL_DISABLE;
		temp &= ~ADPA_DAC_ENABLE;
		I915_WRITE(crt->adpa_reg, temp);
		}

		static void intel_enable_crt(struct intel_encoder *encoder)
		{
		struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
		struct intel_crt *crt = intel_encoder_to_crt(encoder);
		u32 temp;

		temp = I915_READ(crt->adpa_reg);
		temp \|= ADPA_DAC_ENABLE;
		I915_WRITE(crt->adpa_reg, temp);
		}

		/* Note: The caller is required to filter out dpms modes not supported by the
		* platform. */
		static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
		@@ -135,6 +115,19 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
		I915_WRITE(crt->adpa_reg, temp);
		}

		static void intel_disable_crt(struct intel_encoder *encoder)
		{
		intel_crt_set_dpms(encoder, DRM_MODE_DPMS_OFF);
		}

		static void intel_enable_crt(struct intel_encoder *encoder)
		{
		struct intel_crt *crt = intel_encoder_to_crt(encoder);

		intel_crt_set_dpms(encoder, crt->connector->base.dpms);
		}


		static void intel_crt_dpms(struct drm_connector *connector, int mode)
		{
		struct drm_device *dev = connector->dev;
		@@ -746,6 +739,7 @@ void intel_crt_init(struct drm_device *dev)
		}

		connector = &intel_connector->base;
		crt->connector = intel_connector;
		drm_connector_init(dev, &intel_connector->base,
		&intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);

drivers/gpu/drm/i915/intel_dp.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2559,12 +2559,15 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
		{
		struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
		struct intel_dp *intel_dp = &intel_dig_port->dp;
		struct drm_device *dev = intel_dp_to_dev(intel_dp);

		i2c_del_adapter(&intel_dp->adapter);
		drm_encoder_cleanup(encoder);
		if (is_edp(intel_dp)) {
		cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
		mutex_lock(&dev->mode_config.mutex);
		ironlake_panel_vdd_off_sync(intel_dp);
		mutex_unlock(&dev->mode_config.mutex);
		}
		kfree(intel_dig_port);
		}

Admin message