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

Commit 145830df 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:
 "One nouveau regression fix on older cards, i915 black screen fixes,
  and a revert for a strange G33 intel problem"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: fix null ptr dereferences on some boards
  Revert "drm: copy mode type in drm_mode_connector_list_update()"
  drm/i915/bdw: make sure south port interrupts are enabled properly v2
  drm/i915: Don't grab crtc mutexes in intel_modeset_gem_init()
  drm/i915: fix DDI PLLs HW state readout code
parents a6da83f9 703a8c2d

drivers/gpu/drm/drm_modes.c

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector) 
				/* if equal delete the probed mode */

				mode->status = pmode->status;

				/* Merge type bits together */

				mode->type = pmode->type;

				mode->type |= pmode->type;

				list_del(&pmode->head);

				drm_mode_destroy(connector->dev, pmode);

				break;

drivers/gpu/drm/i915/i915_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -2713,6 +2713,8 @@ static void gen8_irq_preinstall(struct drm_device *dev) 
#undef GEN8_IRQ_INIT_NDX



	POSTING_READ(GEN8_PCU_IIR);



	ibx_irq_preinstall(dev);

}



static void ibx_hpd_irq_setup(struct drm_device *dev)

drivers/gpu/drm/i915/intel_ddi.c

+7 −1
Original line number Diff line number Diff line
@@ -1057,12 +1057,18 @@ void intel_ddi_setup_hw_pll_state(struct drm_device *dev) 
	enum pipe pipe;

	struct intel_crtc *intel_crtc;



	dev_priv->ddi_plls.spll_refcount = 0;

	dev_priv->ddi_plls.wrpll1_refcount = 0;

	dev_priv->ddi_plls.wrpll2_refcount = 0;



	for_each_pipe(pipe) {

		intel_crtc =

			to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);



		if (!intel_crtc->active)

		if (!intel_crtc->active) {

			intel_crtc->ddi_pll_sel = PORT_CLK_SEL_NONE;

			continue;

		}



		intel_crtc->ddi_pll_sel = intel_ddi_get_crtc_pll(dev_priv,

								 pipe);

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -11053,10 +11053,10 @@ void intel_modeset_gem_init(struct drm_device *dev) 


	intel_setup_overlay(dev);



	drm_modeset_lock_all(dev);

	mutex_lock(&dev->mode_config.mutex);

	drm_mode_config_reset(dev);

	intel_modeset_setup_hw_state(dev, false);

	drm_modeset_unlock_all(dev);

	mutex_unlock(&dev->mode_config.mutex);

}



void intel_modeset_cleanup(struct drm_device *dev)

drivers/gpu/drm/nouveau/core/include/subdev/i2c.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct nouveau_i2c { 
	int (*identify)(struct nouveau_i2c *, int index,

			const char *what, struct nouveau_i2c_board_info *,

			bool (*match)(struct nouveau_i2c_port *,

				      struct i2c_board_info *));

				      struct i2c_board_info *, void *), void *);

	struct list_head ports;

};