Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Just two fixes for amdgpu: - fix pageflip interrupt issue - fix display clock handling on certain fiji boards * 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux: drm/amdgpu: Keep the pflip interrupts always enabled v7 drm/amdgpu: adjust default dispclk (v2)

Dave Airlie committed 11 years ago

Commit 57606c72 parents b2293cb f6c7aba5 files · +90 −10Browse files

Unified · Split

5 files

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +6 −2
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +0 −2
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +28 −2
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +28 −2
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +28 −2

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c+6−2

 		/* disp clock */
 		adev->clock.default_dispclk =
 			le32_to_cpu(firmware_info->info_21.ulDefaultDispEngineClkFreq);
-		if (adev->clock.default_dispclk == 0)
+		/* set a reasonable default for DP */
-			adev->clock.default_dispclk = 54000; /* 540 Mhz */
+		if (adev->clock.default_dispclk < 53900) {
+			DRM_INFO("Changing default dispclk from %dMhz to 600Mhz\n",
+				 adev->clock.default_dispclk / 100);
+			adev->clock.default_dispclk = 60000;
+		}
 		adev->clock.dp_extclk =
 			le16_to_cpu(firmware_info->info_21.usUniphyDPModeExtClkFreq);
 		adev->clock.current_dispclk = adev->clock.default_dispclk;

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c+0−2

@@ -85,8 +85,6 @@ static void amdgpu_flip_work_func(struct work_struct *__work) · 84 unmodified lines
85	/* We borrow the event spin lock for protecting flip_status */	85	/* We borrow the event spin lock for protecting flip_status */
86	spin_lock_irqsave(&crtc->dev->event_lock, flags);	86	spin_lock_irqsave(&crtc->dev->event_lock, flags);
87		87
88	/* set the proper interrupt */
89	amdgpu_irq_get(adev, &adev->pageflip_irq, work->crtc_id);
90	/* do the flip (mmio) */	88	/* do the flip (mmio) */
91	adev->mode_info.funcs->page_flip(adev, work->crtc_id, work->base);	89	adev->mode_info.funcs->page_flip(adev, work->crtc_id, work->base);
92	/* set the flip status */	90	/* set the flip status */

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+28−2

 		return RREG32(mmCRTC_STATUS_FRAME_COUNT + crtc_offsets[crtc]);
 }
+static void dce_v10_0_pageflip_interrupt_init(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Enable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_get(adev, &adev->pageflip_irq, i);
+}
+static void dce_v10_0_pageflip_interrupt_fini(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Disable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_put(adev, &adev->pageflip_irq, i);
+}
 /**
  * dce_v10_0_page_flip - pageflip callback.
  *
 		dce_v10_0_vga_enable(crtc, true);
 		amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
 		dce_v10_0_vga_enable(crtc, false);
-		/* Make sure VBLANK interrupt is still enabled */
+		/* Make sure VBLANK and PFLIP interrupts are still enabled */
 		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
 		amdgpu_irq_update(adev, &adev->crtc_irq, type);
+		amdgpu_irq_update(adev, &adev->pageflip_irq, type);
 		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);
 		dce_v10_0_crtc_load_lut(crtc);
 		break;
 		dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v10_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 		dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v10_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	dce_v10_0_hpd_fini(adev);
+	dce_v10_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	/* initialize hpd */
 	dce_v10_0_hpd_init(adev);
+	dce_v10_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-	amdgpu_irq_put(adev, &adev->pageflip_irq, crtc_id);
 	queue_work(amdgpu_crtc->pflip_queue, &works->unpin_work);
 	return 0;

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+28−2

 		return RREG32(mmCRTC_STATUS_FRAME_COUNT + crtc_offsets[crtc]);
 }
+static void dce_v11_0_pageflip_interrupt_init(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Enable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_get(adev, &adev->pageflip_irq, i);
+}
+static void dce_v11_0_pageflip_interrupt_fini(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Disable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_put(adev, &adev->pageflip_irq, i);
+}
 /**
  * dce_v11_0_page_flip - pageflip callback.
  *
 		dce_v11_0_vga_enable(crtc, true);
 		amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
 		dce_v11_0_vga_enable(crtc, false);
-		/* Make sure VBLANK interrupt is still enabled */
+		/* Make sure VBLANK and PFLIP interrupts are still enabled */
 		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
 		amdgpu_irq_update(adev, &adev->crtc_irq, type);
+		amdgpu_irq_update(adev, &adev->pageflip_irq, type);
 		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);
 		dce_v11_0_crtc_load_lut(crtc);
 		break;
 		dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v11_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 		dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v11_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	dce_v11_0_hpd_fini(adev);
+	dce_v11_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	/* initialize hpd */
 	dce_v11_0_hpd_init(adev);
+	dce_v11_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-	amdgpu_irq_put(adev, &adev->pageflip_irq, crtc_id);
 	queue_work(amdgpu_crtc->pflip_queue, &works->unpin_work);
 	return 0;

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+28−2

 		return RREG32(mmCRTC_STATUS_FRAME_COUNT + crtc_offsets[crtc]);
 }
+static void dce_v8_0_pageflip_interrupt_init(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Enable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_get(adev, &adev->pageflip_irq, i);
+}
+static void dce_v8_0_pageflip_interrupt_fini(struct amdgpu_device *adev)
+{
+	unsigned i;
+	/* Disable pflip interrupts */
+	for (i = 0; i < adev->mode_info.num_crtc; i++)
+		amdgpu_irq_put(adev, &adev->pageflip_irq, i);
+}
 /**
  * dce_v8_0_page_flip - pageflip callback.
  *
 		dce_v8_0_vga_enable(crtc, true);
 		amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
 		dce_v8_0_vga_enable(crtc, false);
-		/* Make sure VBLANK interrupt is still enabled */
+		/* Make sure VBLANK and PFLIP interrupts are still enabled */
 		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
 		amdgpu_irq_update(adev, &adev->crtc_irq, type);
+		amdgpu_irq_update(adev, &adev->pageflip_irq, type);
 		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);
 		dce_v8_0_crtc_load_lut(crtc);
 		break;
 		dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v8_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 		dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
 	}
+	dce_v8_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	dce_v8_0_hpd_fini(adev);
+	dce_v8_0_pageflip_interrupt_fini(adev);
 	return 0;
 }
 	/* initialize hpd */
 	dce_v8_0_hpd_init(adev);
+	dce_v8_0_pageflip_interrupt_init(adev);
 	return 0;
 }
 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-	amdgpu_irq_put(adev, &adev->pageflip_irq, crtc_id);
 	queue_work(amdgpu_crtc->pflip_queue, &works->unpin_work);
 	return 0;