redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge tag 'drm-intel-fixes-2014-01-13' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Browse source 
Black screen fixes, one for hsw+bdw each and a regression fix for
locking+load detection.

* tag 'drm-intel-fixes-2014-01-13' of git://people.freedesktop.org/~danvet/drm-intel:
  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
This commit is contained in:
Dave Airlie 2014-01-14 12:44:48 +10:00
parent 7e22e91102 09f2344d08
commit c0eeb856e9
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_irq.c
View file

@ -2713,6 +2713,8 @@ static void gen8_irq_preinstall(struct drm_device *dev)
#undef GEN8_IRQ_INIT_NDX #undef GEN8_IRQ_INIT_NDX
POSTING_READ(GEN8_PCU_IIR); POSTING_READ(GEN8_PCU_IIR);
ibx_irq_preinstall(dev);
} }
static void ibx_hpd_irq_setup(struct drm_device *dev) static void ibx_hpd_irq_setup(struct drm_device *dev)

8
drivers/gpu/drm/i915/intel_ddi.c
View file

@ -1057,12 +1057,18 @@ void intel_ddi_setup_hw_pll_state(struct drm_device *dev)
enum pipe pipe; enum pipe pipe;
struct intel_crtc *intel_crtc; 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) { for_each_pipe(pipe) {
intel_crtc = intel_crtc =
to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); 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; continue;
}
intel_crtc->ddi_pll_sel = intel_ddi_get_crtc_pll(dev_priv, intel_crtc->ddi_pll_sel = intel_ddi_get_crtc_pll(dev_priv,
pipe); pipe);

4
drivers/gpu/drm/i915/intel_display.c
View file

@ -11053,10 +11053,10 @@ void intel_modeset_gem_init(struct drm_device *dev)
intel_setup_overlay(dev); intel_setup_overlay(dev);
drm_modeset_lock_all(dev); mutex_lock(&dev->mode_config.mutex);
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
intel_modeset_setup_hw_state(dev, false); 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) void intel_modeset_cleanup(struct drm_device *dev)