History

Merge tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Brown-paper-bag pull request here. The snb rc6 fix from the last pull broke forcewake BIOS dirt cleanup, which with fixed. But that fix broke the spinlock init sequence, which results in an ugly BUG when spinlock debugging is enabled :( So I get to throw another patch at cc: stable to fix up the mess ... * tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: initialize gt_lock early with other spin locks drm/i915: fix hdmi portclock limits

Dave Airlie committed 13 years ago

Commit bf903e42 parents 4795b95 14c5cec3 files · +17 −5Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/i915/i915_dma.c +1 −0
  2. drivers/gpu/drm/i915/intel_hdmi.c +16 −3
  3. drivers/gpu/drm/i915/intel_pm.c +0 −2
drivers/gpu/drm/i915/i915_dma.c+1−0
@@ -1498,6 +1498,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) · 1497 unmodified lines
1498 spin_lock_init(&dev_priv->irq_lock);1498 spin_lock_init(&dev_priv->irq_lock);
1499 spin_lock_init(&dev_priv->gpu_error.lock);1499 spin_lock_init(&dev_priv->gpu_error.lock);
1500 spin_lock_init(&dev_priv->rps.lock);1500 spin_lock_init(&dev_priv->rps.lock);
1501 spin_lock_init(&dev_priv->gt_lock);
1501 spin_lock_init(&dev_priv->backlight.lock);1502 spin_lock_init(&dev_priv->backlight.lock);
1502 mutex_init(&dev_priv->dpio_lock);1503 mutex_init(&dev_priv->dpio_lock);
1503 mutex_init(&dev_priv->rps.hw_lock);1504 mutex_init(&dev_priv->rps.hw_lock);
drivers/gpu/drm/i915/intel_hdmi.c+16−3
@@ -785,10 +785,22 @@ static void intel_disable_hdmi(struct intel_encoder *encoder) · 784 unmodified lines
785 }785 }
786}786}
787 787
788static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
789{
790 struct drm_device *dev = intel_hdmi_to_dev(hdmi);
791
792 if (IS_G4X(dev))
793 return 165000;
794 else if (IS_HASWELL(dev))
795 return 300000;
796 else
797 return 225000;
798}
799
788static int intel_hdmi_mode_valid(struct drm_connector *connector,800static int intel_hdmi_mode_valid(struct drm_connector *connector,
789 struct drm_display_mode *mode)801 struct drm_display_mode *mode)
790{802{
791 if (mode->clock > 165000)803 if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
792 return MODE_CLOCK_HIGH;804 return MODE_CLOCK_HIGH;
793 if (mode->clock < 20000)805 if (mode->clock < 20000)
794 return MODE_CLOCK_LOW;806 return MODE_CLOCK_LOW;
@@ -806,6 +818,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 11 unmodified lines
806 struct drm_device *dev = encoder->base.dev;818 struct drm_device *dev = encoder->base.dev;
807 struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;819 struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
808 int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;820 int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;
821 int portclock_limit = hdmi_portclock_limit(intel_hdmi);
809 int desired_bpp;822 int desired_bpp;
810 823
811 if (intel_hdmi->color_range_auto) {824 if (intel_hdmi->color_range_auto) {
@@ -829,7 +842,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 17 unmodified lines
829 * outputs. We also need to check that the higher clock still fits842 * outputs. We also need to check that the higher clock still fits
830 * within limits.843 * within limits.
831 */844 */
832 if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= 225000845 if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit
833 && HAS_PCH_SPLIT(dev)) {846 && HAS_PCH_SPLIT(dev)) {
834 DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");847 DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
835 desired_bpp = 12*3;848 desired_bpp = 12*3;
@@ -846,7 +859,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 10 unmodified lines
846 pipe_config->pipe_bpp = desired_bpp;859 pipe_config->pipe_bpp = desired_bpp;
847 }860 }
848 861
849 if (adjusted_mode->clock > 225000) {862 if (adjusted_mode->clock > portclock_limit) {
850 DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n");863 DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n");
851 return false;864 return false;
852 }865 }
drivers/gpu/drm/i915/intel_pm.c+0−2
@@ -5497,8 +5497,6 @@ void intel_gt_init(struct drm_device *dev) · 5496 unmodified lines
5497{5497{
5498 struct drm_i915_private *dev_priv = dev->dev_private;5498 struct drm_i915_private *dev_priv = dev->dev_private;
5499 5499
5500 spin_lock_init(&dev_priv->gt_lock);
5501
5502 if (IS_VALLEYVIEW(dev)) {5500 if (IS_VALLEYVIEW(dev)) {
5503 dev_priv->gt.force_wake_get = vlv_force_wake_get;5501 dev_priv->gt.force_wake_get = vlv_force_wake_get;
5504 dev_priv->gt.force_wake_put = vlv_force_wake_put;5502 dev_priv->gt.force_wake_put = vlv_force_wake_put;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t