dc257cf154
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPpvY9AAoJEHm+PkMAQRiGpEoIAJgbu+Y8gITnBK/wh9O6zy3S 5jie5KK4YWdbJsvO58WbNr3CyVIwGIqQ2dUZLiU59aBVLarlGw8xor0MmW+cZwhp 6fBHaf0qDYAV0MZjD+mnnExOiCRyISa2lPmsfu9dAWywh5KGe6/oAP6/qcXIyok3 KZyl3qQf4ENpaZPHwZPXCEkUvtuyHgNiszN+QXEadA3s19Ot4VGe9A3VGw+GNrSm JqFIq3acQAbKa5BYaqf7TQC02v2FI7//eqt6QHxTqbE6a7LGbTvLfX3HlJ2mnfqa 1R6QHhM4y4OZDHbaMT2raHZ8WuLXzhehJzhP8Co7AHFOKwVKOb5XbcUr2RrukMU= =HkMd -----END PGP SIGNATURE----- Merge tag 'v3.4-rc6' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_display.c Ok, this is a fun story of git totally messing things up. There /shouldn't/ be any conflict in here, because the fixes in -rc6 do only touch functions that have not been changed in -next. The offending commits in drm-next are 14415745b2..1fa611065 which simply move a few functions from intel_display.c to intel_pm.c. The problem seems to be that git diff gets completely confused: $ git diff 14415745b2..1fa611065 is a nice mess in intel_display.c, and the diff leaks into totally unrelated functions, whereas $git diff --minimal 14415745b2..1fa611065 is exactly what we want. Unfortunately there seems to be no way to teach similar smarts to the merge diff and conflict generation code, because with the minimal diff there really shouldn't be any conflicts. For added hilarity, every time something in that area changes the + and - lines in the diff move around like crazy, again resulting in new conflicts. So I fear this mess will stay with us for a little longer (and might result in another backmerge down the road). Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
271 lines
7.4 KiB
C
271 lines
7.4 KiB
C
/*
|
|
* Copyright 2008 Advanced Micro Devices, Inc.
|
|
* Copyright 2008 Red Hat Inc.
|
|
* Copyright 2009 Jerome Glisse.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Dave Airlie
|
|
* Alex Deucher
|
|
* Jerome Glisse
|
|
*/
|
|
#include "drmP.h"
|
|
#include "drm_crtc_helper.h"
|
|
#include "radeon_drm.h"
|
|
#include "radeon_reg.h"
|
|
#include "radeon.h"
|
|
#include "atom.h"
|
|
|
|
irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS)
|
|
{
|
|
struct drm_device *dev = (struct drm_device *) arg;
|
|
struct radeon_device *rdev = dev->dev_private;
|
|
|
|
return radeon_irq_process(rdev);
|
|
}
|
|
|
|
/*
|
|
* Handle hotplug events outside the interrupt handler proper.
|
|
*/
|
|
static void radeon_hotplug_work_func(struct work_struct *work)
|
|
{
|
|
struct radeon_device *rdev = container_of(work, struct radeon_device,
|
|
hotplug_work);
|
|
struct drm_device *dev = rdev->ddev;
|
|
struct drm_mode_config *mode_config = &dev->mode_config;
|
|
struct drm_connector *connector;
|
|
|
|
if (mode_config->num_connector) {
|
|
list_for_each_entry(connector, &mode_config->connector_list, head)
|
|
radeon_connector_hotplug(connector);
|
|
}
|
|
/* Just fire off a uevent and let userspace tell us what to do */
|
|
drm_helper_hpd_irq_event(dev);
|
|
}
|
|
|
|
void radeon_driver_irq_preinstall_kms(struct drm_device *dev)
|
|
{
|
|
struct radeon_device *rdev = dev->dev_private;
|
|
unsigned i;
|
|
|
|
/* Disable *all* interrupts */
|
|
for (i = 0; i < RADEON_NUM_RINGS; i++)
|
|
rdev->irq.sw_int[i] = false;
|
|
rdev->irq.gui_idle = false;
|
|
for (i = 0; i < RADEON_MAX_HPD_PINS; i++)
|
|
rdev->irq.hpd[i] = false;
|
|
for (i = 0; i < RADEON_MAX_CRTCS; i++) {
|
|
rdev->irq.crtc_vblank_int[i] = false;
|
|
rdev->irq.pflip[i] = false;
|
|
rdev->irq.afmt[i] = false;
|
|
}
|
|
radeon_irq_set(rdev);
|
|
/* Clear bits */
|
|
radeon_irq_process(rdev);
|
|
}
|
|
|
|
int radeon_driver_irq_postinstall_kms(struct drm_device *dev)
|
|
{
|
|
struct radeon_device *rdev = dev->dev_private;
|
|
unsigned i;
|
|
|
|
dev->max_vblank_count = 0x001fffff;
|
|
for (i = 0; i < RADEON_NUM_RINGS; i++)
|
|
rdev->irq.sw_int[i] = true;
|
|
radeon_irq_set(rdev);
|
|
return 0;
|
|
}
|
|
|
|
void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
|
|
{
|
|
struct radeon_device *rdev = dev->dev_private;
|
|
unsigned i;
|
|
|
|
if (rdev == NULL) {
|
|
return;
|
|
}
|
|
/* Disable *all* interrupts */
|
|
for (i = 0; i < RADEON_NUM_RINGS; i++)
|
|
rdev->irq.sw_int[i] = false;
|
|
rdev->irq.gui_idle = false;
|
|
for (i = 0; i < RADEON_MAX_HPD_PINS; i++)
|
|
rdev->irq.hpd[i] = false;
|
|
for (i = 0; i < RADEON_MAX_CRTCS; i++) {
|
|
rdev->irq.crtc_vblank_int[i] = false;
|
|
rdev->irq.pflip[i] = false;
|
|
rdev->irq.afmt[i] = false;
|
|
}
|
|
radeon_irq_set(rdev);
|
|
}
|
|
|
|
static bool radeon_msi_ok(struct radeon_device *rdev)
|
|
{
|
|
/* RV370/RV380 was first asic with MSI support */
|
|
if (rdev->family < CHIP_RV380)
|
|
return false;
|
|
|
|
/* MSIs don't work on AGP */
|
|
if (rdev->flags & RADEON_IS_AGP)
|
|
return false;
|
|
|
|
/* force MSI on */
|
|
if (radeon_msi == 1)
|
|
return true;
|
|
else if (radeon_msi == 0)
|
|
return false;
|
|
|
|
/* Quirks */
|
|
/* HP RS690 only seems to work with MSIs. */
|
|
if ((rdev->pdev->device == 0x791f) &&
|
|
(rdev->pdev->subsystem_vendor == 0x103c) &&
|
|
(rdev->pdev->subsystem_device == 0x30c2))
|
|
return true;
|
|
|
|
/* Dell RS690 only seems to work with MSIs. */
|
|
if ((rdev->pdev->device == 0x791f) &&
|
|
(rdev->pdev->subsystem_vendor == 0x1028) &&
|
|
(rdev->pdev->subsystem_device == 0x01fc))
|
|
return true;
|
|
|
|
/* Dell RS690 only seems to work with MSIs. */
|
|
if ((rdev->pdev->device == 0x791f) &&
|
|
(rdev->pdev->subsystem_vendor == 0x1028) &&
|
|
(rdev->pdev->subsystem_device == 0x01fd))
|
|
return true;
|
|
|
|
/* RV515 seems to have MSI issues where it loses
|
|
* MSI rearms occasionally. This leads to lockups and freezes.
|
|
* disable it by default.
|
|
*/
|
|
if (rdev->family == CHIP_RV515)
|
|
return false;
|
|
if (rdev->flags & RADEON_IS_IGP) {
|
|
/* APUs work fine with MSIs */
|
|
if (rdev->family >= CHIP_PALM)
|
|
return true;
|
|
/* lots of IGPs have problems with MSIs */
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
int radeon_irq_kms_init(struct radeon_device *rdev)
|
|
{
|
|
int i;
|
|
int r = 0;
|
|
|
|
INIT_WORK(&rdev->hotplug_work, radeon_hotplug_work_func);
|
|
INIT_WORK(&rdev->audio_work, r600_audio_update_hdmi);
|
|
|
|
spin_lock_init(&rdev->irq.sw_lock);
|
|
for (i = 0; i < rdev->num_crtc; i++)
|
|
spin_lock_init(&rdev->irq.pflip_lock[i]);
|
|
r = drm_vblank_init(rdev->ddev, rdev->num_crtc);
|
|
if (r) {
|
|
return r;
|
|
}
|
|
/* enable msi */
|
|
rdev->msi_enabled = 0;
|
|
|
|
if (radeon_msi_ok(rdev)) {
|
|
int ret = pci_enable_msi(rdev->pdev);
|
|
if (!ret) {
|
|
rdev->msi_enabled = 1;
|
|
dev_info(rdev->dev, "radeon: using MSI.\n");
|
|
}
|
|
}
|
|
rdev->irq.installed = true;
|
|
r = drm_irq_install(rdev->ddev);
|
|
if (r) {
|
|
rdev->irq.installed = false;
|
|
return r;
|
|
}
|
|
DRM_INFO("radeon: irq initialized.\n");
|
|
return 0;
|
|
}
|
|
|
|
void radeon_irq_kms_fini(struct radeon_device *rdev)
|
|
{
|
|
drm_vblank_cleanup(rdev->ddev);
|
|
if (rdev->irq.installed) {
|
|
drm_irq_uninstall(rdev->ddev);
|
|
rdev->irq.installed = false;
|
|
if (rdev->msi_enabled)
|
|
pci_disable_msi(rdev->pdev);
|
|
}
|
|
flush_work_sync(&rdev->hotplug_work);
|
|
}
|
|
|
|
void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev, int ring)
|
|
{
|
|
unsigned long irqflags;
|
|
|
|
spin_lock_irqsave(&rdev->irq.sw_lock, irqflags);
|
|
if (rdev->ddev->irq_enabled && (++rdev->irq.sw_refcount[ring] == 1)) {
|
|
rdev->irq.sw_int[ring] = true;
|
|
radeon_irq_set(rdev);
|
|
}
|
|
spin_unlock_irqrestore(&rdev->irq.sw_lock, irqflags);
|
|
}
|
|
|
|
void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev, int ring)
|
|
{
|
|
unsigned long irqflags;
|
|
|
|
spin_lock_irqsave(&rdev->irq.sw_lock, irqflags);
|
|
BUG_ON(rdev->ddev->irq_enabled && rdev->irq.sw_refcount[ring] <= 0);
|
|
if (rdev->ddev->irq_enabled && (--rdev->irq.sw_refcount[ring] == 0)) {
|
|
rdev->irq.sw_int[ring] = false;
|
|
radeon_irq_set(rdev);
|
|
}
|
|
spin_unlock_irqrestore(&rdev->irq.sw_lock, irqflags);
|
|
}
|
|
|
|
void radeon_irq_kms_pflip_irq_get(struct radeon_device *rdev, int crtc)
|
|
{
|
|
unsigned long irqflags;
|
|
|
|
if (crtc < 0 || crtc >= rdev->num_crtc)
|
|
return;
|
|
|
|
spin_lock_irqsave(&rdev->irq.pflip_lock[crtc], irqflags);
|
|
if (rdev->ddev->irq_enabled && (++rdev->irq.pflip_refcount[crtc] == 1)) {
|
|
rdev->irq.pflip[crtc] = true;
|
|
radeon_irq_set(rdev);
|
|
}
|
|
spin_unlock_irqrestore(&rdev->irq.pflip_lock[crtc], irqflags);
|
|
}
|
|
|
|
void radeon_irq_kms_pflip_irq_put(struct radeon_device *rdev, int crtc)
|
|
{
|
|
unsigned long irqflags;
|
|
|
|
if (crtc < 0 || crtc >= rdev->num_crtc)
|
|
return;
|
|
|
|
spin_lock_irqsave(&rdev->irq.pflip_lock[crtc], irqflags);
|
|
BUG_ON(rdev->ddev->irq_enabled && rdev->irq.pflip_refcount[crtc] <= 0);
|
|
if (rdev->ddev->irq_enabled && (--rdev->irq.pflip_refcount[crtc] == 0)) {
|
|
rdev->irq.pflip[crtc] = false;
|
|
radeon_irq_set(rdev);
|
|
}
|
|
spin_unlock_irqrestore(&rdev->irq.pflip_lock[crtc], irqflags);
|
|
}
|
|
|