Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

Pull main drm updates from Dave Airlie:
 "This is the main merge window request for the drm.

  It's big, but jam packed will lots of features and of course 0
  regressions.  (okay maybe there'll be one).

  Highlights:

   - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
     (qemu only).  These drivers use the generic modesetting drivers.

   - initial prime/dma-buf support for i915, nouveau, radeon, udl and
     exynos

   - switcheroo audio support: so GPUs with HDMI can turn off the sound
     driver without crashing stuff.

   - There are some patches drifting outside drivers/gpu into x86 and
     EFI for better handling of multiple video adapters in Apple Macs,
     they've got correct acks except one trivial fixup.

   - Core:
	edid parser has better DMT and reduced blanking support,
	crtc properties,
	plane properties,

   - Drivers:
	exynos: add 2D core accel support, prime support, hdmi features
	intel: more Haswell support, initial Valleyview support, more
	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
	    cleanups and fixes
	radeon: more HDMI audio support, improved GPU lockup recovery
	    support, remove nested mutexes, less memory copying on PCIE, fix
	    bus master enable race (kexec), improved fence handling
	gma500: cleanups, 1080p support, acpi fixes
	nouveau: better nva3 memory reclocking, kepler accel (needs
	    external firmware rip), async buffer moves on nv84+ hw.

  I've some more dma-buf patches that rely on the dma-buf merge for vmap
  stuff, and I've a few fixes building up, but I'd decided I'd better
  get rid of the main pull sooner rather than later, so the audio guys
  are also unblocked."

Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
  drm/nouveau/nvd9: Fix GPIO initialisation sequence.
  drm/nouveau: Unregister switcheroo client on exit
  drm/nouveau: Check dsm on switcheroo unregister
  drm/nouveau: fix a minor annoyance in an output string
  drm/nouveau: turn a BUG into a WARN
  drm/nv50: decode PGRAPH DATA_ERROR = 0x24
  drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
  drm/nvd9/copy: initialise copy engine, seems to work like nvc0
  drm/nvc0/ttm: use copy engines for async buffer moves
  drm/nva3/ttm: use copy engine for async buffer moves
  drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
  drm/nv84/ttm: use crypto engine for async buffer copies
  drm/nouveau/ttm: untangle code to support accelerated buffer moves
  drm/nouveau/fbcon: use fence for sync, rather than notifier
  drm/nv98/crypt: non-stub implementation of the engine hooks
  drm/nouveau/fifo: turn all fifo modules into engine modules
  drm/nv50/graph: remove ability to do interrupt-driven context switching
  drm/nv50: remove manual context unload on context destruction
  drm/nv50: remove execution engine context saves on suspend
  drm/nv50/fifo: use hardware channel kickoff functionality
  ...

1 files changed, 83 insertions, 132 deletions

diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index ba66f3093d46..7c4fa77f018f 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -29,7 +29,28 @@
 #include "radeon_asic.h"
 #include "atom.h"
 
-#define AUDIO_TIMER_INTERVALL 100 /* 1/10 sekund should be enough */
+/*
+ * check if enc_priv stores radeon_encoder_atom_dig
+ */
+static bool radeon_dig_encoder(struct drm_encoder *encoder)
+{
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        switch (radeon_encoder->encoder_id) {
+        case ENCODER_OBJECT_ID_INTERNAL_LVDS:
+        case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+        case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+        case ENCODER_OBJECT_ID_INTERNAL_DVO1:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
+        case ENCODER_OBJECT_ID_INTERNAL_DDI:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+                return true;
+        }
+        return false;
+}
 
 /*
  * check if the chipset is supported
@@ -42,118 +63,85 @@ static int r600_audio_chipset_supported(struct radeon_device *rdev)
                 || rdev->family == CHIP_RS740;
 }
 
-/*
- * current number of channels
- */
-int r600_audio_channels(struct radeon_device *rdev)
+struct r600_audio r600_audio_status(struct radeon_device *rdev)
 {
-        return (RREG32(R600_AUDIO_RATE_BPS_CHANNEL) & 0x7) + 1;
-}
+        struct r600_audio status;
+        uint32_t value;
 
-/*
- * current bits per sample
- */
-int r600_audio_bits_per_sample(struct radeon_device *rdev)
-{
-        uint32_t value = (RREG32(R600_AUDIO_RATE_BPS_CHANNEL) & 0xF0) >> 4;
-        switch (value) {
-        case 0x0: return  8;
-        case 0x1: return 16;
-        case 0x2: return 20;
-        case 0x3: return 24;
-        case 0x4: return 32;
-        }
+        value = RREG32(R600_AUDIO_RATE_BPS_CHANNEL);
 
-        dev_err(rdev->dev, "Unknown bits per sample 0x%x using 16 instead\n",
-                (int)value);
+        /* number of channels */
+        status.channels = (value & 0x7) + 1;
 
-        return 16;
-}
-
-/*
- * current sampling rate in HZ
- */
-int r600_audio_rate(struct radeon_device *rdev)
-{
-        uint32_t value = RREG32(R600_AUDIO_RATE_BPS_CHANNEL);
-        uint32_t result;
+        /* bits per sample */
+        switch ((value & 0xF0) >> 4) {
+        case 0x0:
+                status.bits_per_sample = 8;
+                break;
+        case 0x1:
+                status.bits_per_sample = 16;
+                break;
+        case 0x2:
+                status.bits_per_sample = 20;
+                break;
+        case 0x3:
+                status.bits_per_sample = 24;
+                break;
+        case 0x4:
+                status.bits_per_sample = 32;
+                break;
+        default:
+                dev_err(rdev->dev, "Unknown bits per sample 0x%x, using 16\n",
+                        (int)value);
+                status.bits_per_sample = 16;
+        }
 
+        /* current sampling rate in HZ */
         if (value & 0x4000)
-                result = 44100;
+                status.rate = 44100;
         else
-                result = 48000;
+                status.rate = 48000;
+        status.rate *= ((value >> 11) & 0x7) + 1;
+        status.rate /= ((value >> 8) & 0x7) + 1;
 
-        result *= ((value >> 11) & 0x7) + 1;
-        result /= ((value >> 8) & 0x7) + 1;
+        value = RREG32(R600_AUDIO_STATUS_BITS);
 
-        return result;
-}
+        /* iec 60958 status bits */
+        status.status_bits = value & 0xff;
 
-/*
- * iec 60958 status bits
- */
-uint8_t r600_audio_status_bits(struct radeon_device *rdev)
-{
-        return RREG32(R600_AUDIO_STATUS_BITS) & 0xff;
-}
+        /* iec 60958 category code */
+        status.category_code = (value >> 8) & 0xff;
 
-/*
- * iec 60958 category code
- */
-uint8_t r600_audio_category_code(struct radeon_device *rdev)
-{
-        return (RREG32(R600_AUDIO_STATUS_BITS) >> 8) & 0xff;
-}
-
-/*
- * schedule next audio update event
- */
-void r600_audio_schedule_polling(struct radeon_device *rdev)
-{
-        mod_timer(&rdev->audio_timer,
-                jiffies + msecs_to_jiffies(AUDIO_TIMER_INTERVALL));
+        return status;
 }
 
 /*
  * update all hdmi interfaces with current audio parameters
  */
-static void r600_audio_update_hdmi(unsigned long param)
+void r600_audio_update_hdmi(struct work_struct *work)
 {
-        struct radeon_device *rdev = (struct radeon_device *)param;
+        struct radeon_device *rdev = container_of(work, struct radeon_device,
+                                                  audio_work);
         struct drm_device *dev = rdev->ddev;
-
-        int channels = r600_audio_channels(rdev);
-        int rate = r600_audio_rate(rdev);
-        int bps = r600_audio_bits_per_sample(rdev);
-        uint8_t status_bits = r600_audio_status_bits(rdev);
-        uint8_t category_code = r600_audio_category_code(rdev);
-
+        struct r600_audio audio_status = r600_audio_status(rdev);
         struct drm_encoder *encoder;
-        int changes = 0, still_going = 0;
-
-        changes |= channels != rdev->audio_channels;
-        changes |= rate != rdev->audio_rate;
-        changes |= bps != rdev->audio_bits_per_sample;
-        changes |= status_bits != rdev->audio_status_bits;
-        changes |= category_code != rdev->audio_category_code;
-
-        if (changes) {
-                rdev->audio_channels = channels;
-                rdev->audio_rate = rate;
-                rdev->audio_bits_per_sample = bps;
-                rdev->audio_status_bits = status_bits;
-                rdev->audio_category_code = category_code;
+        bool changed = false;
+
+        if (rdev->audio_status.channels != audio_status.channels ||
+            rdev->audio_status.rate != audio_status.rate ||
+            rdev->audio_status.bits_per_sample != audio_status.bits_per_sample ||
+            rdev->audio_status.status_bits != audio_status.status_bits ||
+            rdev->audio_status.category_code != audio_status.category_code) {
+                rdev->audio_status = audio_status;
+                changed = true;
         }
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-                still_going |= radeon_encoder->audio_polling_active;
-                if (changes || r600_hdmi_buffer_status_changed(encoder))
+                if (!radeon_dig_encoder(encoder))
+                        continue;
+                if (changed || r600_hdmi_buffer_status_changed(encoder))
                         r600_hdmi_update_audio_settings(encoder);
         }
-
-        if (still_going)
-                r600_audio_schedule_polling(rdev);
 }
 
 /*
@@ -177,7 +165,7 @@ static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)
 }
 
 /*
- * initialize the audio vars and register the update timer
+ * initialize the audio vars
  */
 int r600_audio_init(struct radeon_device *rdev)
 {
@@ -186,51 +174,16 @@ int r600_audio_init(struct radeon_device *rdev)
 
         r600_audio_engine_enable(rdev, true);
 
-        rdev->audio_channels = -1;
-        rdev->audio_rate = -1;
-        rdev->audio_bits_per_sample = -1;
-        rdev->audio_status_bits = 0;
-        rdev->audio_category_code = 0;
-
-        setup_timer(
-                &rdev->audio_timer,
-                r600_audio_update_hdmi,
-                (unsigned long)rdev);
+        rdev->audio_status.channels = -1;
+        rdev->audio_status.rate = -1;
+        rdev->audio_status.bits_per_sample = -1;
+        rdev->audio_status.status_bits = 0;
+        rdev->audio_status.category_code = 0;
 
         return 0;
 }
 
 /*
- * enable the polling timer, to check for status changes
- */
-void r600_audio_enable_polling(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct radeon_device *rdev = dev->dev_private;
-        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-
-        DRM_DEBUG("r600_audio_enable_polling: %d\n",
-                radeon_encoder->audio_polling_active);
-        if (radeon_encoder->audio_polling_active)
-                return;
-
-        radeon_encoder->audio_polling_active = 1;
-        if (rdev->audio_enabled)
-                mod_timer(&rdev->audio_timer, jiffies + 1);
-}
-
-/*
- * disable the polling timer, so we get no more status updates
- */
-void r600_audio_disable_polling(struct drm_encoder *encoder)
-{
-        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-        DRM_DEBUG("r600_audio_disable_polling: %d\n",
-                radeon_encoder->audio_polling_active);
-        radeon_encoder->audio_polling_active = 0;
-}
-
-/*
  * atach the audio codec to the clock source of the encoder
  */
 void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
@@ -297,7 +250,5 @@ void r600_audio_fini(struct radeon_device *rdev)
         if (!rdev->audio_enabled)
                 return;
 
-        del_timer(&rdev->audio_timer);
-
         r600_audio_engine_enable(rdev, false);
 }