547 files changed, 18372 insertions, 4640 deletions

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 97991ac6f5fc..7e52295f1ecc 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -208,7 +208,7 @@ static int power_saving_thread(void *data)
                  * the mechanism only works when all CPUs have RT task running,
                  * as if one CPU hasn't RT task, RT task from other CPUs will
                  * borrow CPU time from this CPU and cause RT task use > 95%
-                 * CPU time. To make 'avoid staration' work, takes a nap here.
+                 * CPU time. To make 'avoid starvation' work, takes a nap here.
                  */
                 if (do_sleep)
                         schedule_timeout_killable(HZ * idle_pct / 100);
@@ -222,14 +222,18 @@ static struct task_struct *ps_tsks[NR_CPUS];
 static unsigned int ps_tsk_num;
 static int create_power_saving_task(void)
 {
+        int rc = -ENOMEM;
+
         ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
                 (void *)(unsigned long)ps_tsk_num,
                 "power_saving/%d", ps_tsk_num);
-        if (ps_tsks[ps_tsk_num]) {
+        rc = IS_ERR(ps_tsks[ps_tsk_num]) ? PTR_ERR(ps_tsks[ps_tsk_num]) : 0;
+        if (!rc)
                 ps_tsk_num++;
-                return 0;
-        }
-        return -EINVAL;
+        else
+                ps_tsks[ps_tsk_num] = NULL;
+
+        return rc;
 }
 
 static void destroy_power_saving_task(void)
@@ -237,6 +241,7 @@ static void destroy_power_saving_task(void)
         if (ps_tsk_num > 0) {
                 ps_tsk_num--;
                 kthread_stop(ps_tsks[ps_tsk_num]);
+                ps_tsks[ps_tsk_num] = NULL;
         }
 }
 
@@ -253,7 +258,7 @@ static void set_power_saving_task_num(unsigned int num)
         }
 }
 
-static int acpi_pad_idle_cpus(unsigned int num_cpus)
+static void acpi_pad_idle_cpus(unsigned int num_cpus)
 {
         get_online_cpus();
 
@@ -261,7 +266,6 @@ static int acpi_pad_idle_cpus(unsigned int num_cpus)
         set_power_saving_task_num(num_cpus);
 
         put_online_cpus();
-        return 0;
 }
 
 static uint32_t acpi_pad_idle_cpus_num(void)
@@ -369,19 +373,21 @@ static void acpi_pad_remove_sysfs(struct acpi_device *device)
 static int acpi_pad_pur(acpi_handle handle, int *num_cpus)
 {
         struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_status status;
         union acpi_object *package;
         int rev, num, ret = -EINVAL;
 
-        status = acpi_evaluate_object(handle, "_PUR", NULL, &buffer);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer)))
+                return -EINVAL;
+
+        if (!buffer.length || !buffer.pointer)
                 return -EINVAL;
+
         package = buffer.pointer;
         if (package->type != ACPI_TYPE_PACKAGE || package->package.count != 2)
                 goto out;
         rev = package->package.elements[0].integer.value;
         num = package->package.elements[1].integer.value;
-        if (rev != 1)
+        if (rev != 1 || num < 0)
                 goto out;
         *num_cpus = num;
         ret = 0;
@@ -410,7 +416,7 @@ static void acpi_pad_ost(acpi_handle handle, int stat,
 
 static void acpi_pad_handle_notify(acpi_handle handle)
 {
-        int num_cpus, ret;
+        int num_cpus;
         uint32_t idle_cpus;
 
         mutex_lock(&isolated_cpus_lock);
@@ -418,12 +424,9 @@ static void acpi_pad_handle_notify(acpi_handle handle)
                 mutex_unlock(&isolated_cpus_lock);
                 return;
         }
-        ret = acpi_pad_idle_cpus(num_cpus);
+        acpi_pad_idle_cpus(num_cpus);
         idle_cpus = acpi_pad_idle_cpus_num();
-        if (!ret)
-                acpi_pad_ost(handle, 0, idle_cpus);
-        else
-                acpi_pad_ost(handle, 1, 0);
+        acpi_pad_ost(handle, 0, idle_cpus);
         mutex_unlock(&isolated_cpus_lock);
 }
 
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index cf761b904e4a..a52126e46307 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -490,9 +490,14 @@ static void acpi_bus_osc_support(void)
 
         capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
         capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
-#ifdef CONFIG_ACPI_PROCESSOR_AGGREGATOR
+#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\
+                        defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
         capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT;
 #endif
+
+#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)
+        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
+#endif
         if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
                 return;
         if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index fd1801bdee66..d6471bb6852f 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -201,14 +201,13 @@ unlock:
         spin_unlock_irqrestore(&ec->curr_lock, flags);
 }
 
-static void acpi_ec_gpe_query(void *ec_cxt);
+static int acpi_ec_sync_query(struct acpi_ec *ec);
 
-static int ec_check_sci(struct acpi_ec *ec, u8 state)
+static int ec_check_sci_sync(struct acpi_ec *ec, u8 state)
 {
         if (state & ACPI_EC_FLAG_SCI) {
                 if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags))
-                        return acpi_os_execute(OSL_EC_BURST_HANDLER,
-                                acpi_ec_gpe_query, ec);
+                        return acpi_ec_sync_query(ec);
         }
         return 0;
 }
@@ -249,11 +248,6 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
 {
         unsigned long tmp;
         int ret = 0;
-        pr_debug(PREFIX "transaction start\n");
-        /* disable GPE during transaction if storm is detected */
-        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-                acpi_disable_gpe(NULL, ec->gpe);
-        }
         if (EC_FLAGS_MSI)
                 udelay(ACPI_EC_MSI_UDELAY);
         /* start transaction */
@@ -265,20 +259,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
                 clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
         spin_unlock_irqrestore(&ec->curr_lock, tmp);
         ret = ec_poll(ec);
-        pr_debug(PREFIX "transaction end\n");
         spin_lock_irqsave(&ec->curr_lock, tmp);
         ec->curr = NULL;
         spin_unlock_irqrestore(&ec->curr_lock, tmp);
-        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-                /* check if we received SCI during transaction */
-                ec_check_sci(ec, acpi_ec_read_status(ec));
-                /* it is safe to enable GPE outside of transaction */
-                acpi_enable_gpe(NULL, ec->gpe);
-        } else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
-                pr_info(PREFIX "GPE storm detected, "
-                        "transactions will use polling mode\n");
-                set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
-        }
         return ret;
 }
 
@@ -321,7 +304,26 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
                 status = -ETIME;
                 goto end;
         }
+        pr_debug(PREFIX "transaction start\n");
+        /* disable GPE during transaction if storm is detected */
+        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
+                acpi_disable_gpe(NULL, ec->gpe);
+        }
+
         status = acpi_ec_transaction_unlocked(ec, t);
+
+        /* check if we received SCI during transaction */
+        ec_check_sci_sync(ec, acpi_ec_read_status(ec));
+        if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
+                msleep(1);
+                /* it is safe to enable GPE outside of transaction */
+                acpi_enable_gpe(NULL, ec->gpe);
+        } else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
+                pr_info(PREFIX "GPE storm detected, "
+                        "transactions will use polling mode\n");
+                set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
+        }
+        pr_debug(PREFIX "transaction end\n");
 end:
         if (ec->global_lock)
                 acpi_release_global_lock(glk);
@@ -443,7 +445,7 @@ int ec_transaction(u8 command,
 
 EXPORT_SYMBOL(ec_transaction);
 
-static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
+static int acpi_ec_query_unlocked(struct acpi_ec *ec, u8 * data)
 {
         int result;
         u8 d;
@@ -452,20 +454,16 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
                                 .wlen = 0, .rlen = 1};
         if (!ec || !data)
                 return -EINVAL;
-
         /*
          * Query the EC to find out which _Qxx method we need to evaluate.
          * Note that successful completion of the query causes the ACPI_EC_SCI
          * bit to be cleared (and thus clearing the interrupt source).
          */
-
-        result = acpi_ec_transaction(ec, &t);
+        result = acpi_ec_transaction_unlocked(ec, &t);
         if (result)
                 return result;
-
         if (!d)
                 return -ENODATA;
-
         *data = d;
         return 0;
 }
@@ -509,43 +507,79 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
 
 EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler);
 
-static void acpi_ec_gpe_query(void *ec_cxt)
+static void acpi_ec_run(void *cxt)
 {
-        struct acpi_ec *ec = ec_cxt;
-        u8 value = 0;
-        struct acpi_ec_query_handler *handler, copy;
-
-        if (!ec || acpi_ec_query(ec, &value))
+        struct acpi_ec_query_handler *handler = cxt;
+        if (!handler)
                 return;
-        mutex_lock(&ec->lock);
+        pr_debug(PREFIX "start query execution\n");
+        if (handler->func)
+                handler->func(handler->data);
+        else if (handler->handle)
+                acpi_evaluate_object(handler->handle, NULL, NULL, NULL);
+        pr_debug(PREFIX "stop query execution\n");
+        kfree(handler);
+}
+
+static int acpi_ec_sync_query(struct acpi_ec *ec)
+{
+        u8 value = 0;
+        int status;
+        struct acpi_ec_query_handler *handler, *copy;
+        if ((status = acpi_ec_query_unlocked(ec, &value)))
+                return status;
         list_for_each_entry(handler, &ec->list, node) {
                 if (value == handler->query_bit) {
                         /* have custom handler for this bit */
-                        memcpy(&copy, handler, sizeof(copy));
-                        mutex_unlock(&ec->lock);
-                        if (copy.func) {
-                                copy.func(copy.data);
-                        } else if (copy.handle) {
-                                acpi_evaluate_object(copy.handle, NULL, NULL, NULL);
-                        }
-                        return;
+                        copy = kmalloc(sizeof(*handler), GFP_KERNEL);
+                        if (!copy)
+                                return -ENOMEM;
+                        memcpy(copy, handler, sizeof(*copy));
+                        pr_debug(PREFIX "push query execution (0x%2x) on queue\n", value);
+                        return acpi_os_execute((copy->func) ?
+                                OSL_NOTIFY_HANDLER : OSL_GPE_HANDLER,
+                                acpi_ec_run, copy);
                 }
         }
+        return 0;
+}
+
+static void acpi_ec_gpe_query(void *ec_cxt)
+{
+        struct acpi_ec *ec = ec_cxt;
+        if (!ec)
+                return;
+        mutex_lock(&ec->lock);
+        acpi_ec_sync_query(ec);
         mutex_unlock(&ec->lock);
 }
 
+static void acpi_ec_gpe_query(void *ec_cxt);
+
+static int ec_check_sci(struct acpi_ec *ec, u8 state)
+{
+        if (state & ACPI_EC_FLAG_SCI) {
+                if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags)) {
+                        pr_debug(PREFIX "push gpe query to the queue\n");
+                        return acpi_os_execute(OSL_NOTIFY_HANDLER,
+                                acpi_ec_gpe_query, ec);
+                }
+        }
+        return 0;
+}
+
 static u32 acpi_ec_gpe_handler(void *data)
 {
         struct acpi_ec *ec = data;
-        u8 status;
 
         pr_debug(PREFIX "~~~> interrupt\n");
-        status = acpi_ec_read_status(ec);
 
-        advance_transaction(ec, status);
-        if (ec_transaction_done(ec) && (status & ACPI_EC_FLAG_IBF) == 0)
+        advance_transaction(ec, acpi_ec_read_status(ec));
+        if (ec_transaction_done(ec) &&
+            (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) == 0) {
                 wake_up(&ec->wait);
-        ec_check_sci(ec, status);
+                ec_check_sci(ec, acpi_ec_read_status(ec));
+        }
         return ACPI_INTERRUPT_HANDLED;
 }
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 394ae89409c2..04b0f007c9b7 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("pci_link");
 static int acpi_pci_link_add(struct acpi_device *device);
 static int acpi_pci_link_remove(struct acpi_device *device, int type);
 
-static struct acpi_device_id link_device_ids[] = {
+static const struct acpi_device_id link_device_ids[] = {
         {"PNP0C0F", 0},
         {"", 0},
 };
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 101cce3681d1..64f55b6db73c 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -46,7 +46,7 @@ static int acpi_pci_root_add(struct acpi_device *device);
 static int acpi_pci_root_remove(struct acpi_device *device, int type);
 static int acpi_pci_root_start(struct acpi_device *device);
 
-static struct acpi_device_id root_device_ids[] = {
+static const struct acpi_device_id root_device_ids[] = {
         {"PNP0A03", 0},
         {"", 0},
 };
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 22b297916519..0f30c3c1eea4 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -65,7 +65,7 @@ static int acpi_power_remove(struct acpi_device *device, int type);
 static int acpi_power_resume(struct acpi_device *device);
 static int acpi_power_open_fs(struct inode *inode, struct file *file);
 
-static struct acpi_device_id power_device_ids[] = {
+static const struct acpi_device_id power_device_ids[] = {
         {ACPI_POWER_HID, 0},
         {"", 0},
 };
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index 2ef7030a0c28..dc4ffadf8122 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -64,7 +64,7 @@ static int can_cap_in_hardware(void)
         return force_cap_on || cap_in_hardware;
 }
 
-static struct acpi_device_id power_meter_ids[] = {
+static const struct acpi_device_id power_meter_ids[] = {
         {"ACPI000D", 0},
         {"", 0},
 };
@@ -534,6 +534,7 @@ static void remove_domain_devices(struct acpi_power_meter_resource *resource)
 
         kfree(resource->domain_devices);
         kobject_put(resource->holders_dir);
+        resource->num_domain_devices = 0;
 }
 
 static int read_domain_devices(struct acpi_power_meter_resource *resource)
@@ -740,7 +741,6 @@ skip_unsafe_cap:
 
         return res;
 error:
-        remove_domain_devices(resource);
         remove_attrs(resource);
         return res;
 }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d1676b1754d9..7c0441f63b39 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -305,6 +305,28 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         pr->power.states[ACPI_STATE_C2].latency = acpi_gbl_FADT.C2latency;
         pr->power.states[ACPI_STATE_C3].latency = acpi_gbl_FADT.C3latency;
 
+        /*
+         * FADT specified C2 latency must be less than or equal to
+         * 100 microseconds.
+         */
+        if (acpi_gbl_FADT.C2latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                        "C2 latency too large [%d]\n", acpi_gbl_FADT.C2latency));
+                /* invalidate C2 */
+                pr->power.states[ACPI_STATE_C2].address = 0;
+        }
+
+        /*
+         * FADT supplied C3 latency must be less than or equal to
+         * 1000 microseconds.
+         */
+        if (acpi_gbl_FADT.C3latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                        "C3 latency too large [%d]\n", acpi_gbl_FADT.C3latency));
+                /* invalidate C3 */
+                pr->power.states[ACPI_STATE_C3].address = 0;
+        }
+
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "lvl2[0x%08x] lvl3[0x%08x]\n",
                           pr->power.states[ACPI_STATE_C2].address,
@@ -494,33 +516,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
         return status;
 }
 
-static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
-{
-
-        if (!cx->address)
-                return;
-
-        /*
-         * C2 latency must be less than or equal to 100
-         * microseconds.
-         */
-        else if (cx->latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "latency too large [%d]\n", cx->latency));
-                return;
-        }
-
-        /*
-         * Otherwise we've met all of our C2 requirements.
-         * Normalize the C2 latency to expidite policy
-         */
-        cx->valid = 1;
-
-        cx->latency_ticks = cx->latency;
-
-        return;
-}
-
 static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                                            struct acpi_processor_cx *cx)
 {
@@ -532,16 +527,6 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                 return;
 
         /*
-         * C3 latency must be less than or equal to 1000
-         * microseconds.
-         */
-        else if (cx->latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "latency too large [%d]\n", cx->latency));
-                return;
-        }
-
-        /*
          * PIIX4 Erratum #18: We don't support C3 when Type-F (fast)
          * DMA transfers are used by any ISA device to avoid livelock.
          * Note that we could disable Type-F DMA (as recommended by
@@ -629,7 +614,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                         break;
 
                 case ACPI_STATE_C2:
-                        acpi_processor_power_verify_c2(cx);
+                        if (!cx->address)
+                                break;
+                        cx->valid = 1; 
+                        cx->latency_ticks = cx->latency; /* Normalize latency */
                         break;
 
                 case ACPI_STATE_C3:
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index 30e4dc0cdf30..7247819dbd80 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -144,6 +144,29 @@ void acpi_processor_set_pdc(acpi_handle handle)
 }
 EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);
 
+static int early_pdc_optin;
+static int set_early_pdc_optin(const struct dmi_system_id *id)
+{
+        early_pdc_optin = 1;
+        return 0;
+}
+
+static struct dmi_system_id __cpuinitdata early_pdc_optin_table[] = {
+        {
+        set_early_pdc_optin, "HP Envy", {
+        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Envy") }, NULL},
+        {
+        set_early_pdc_optin, "HP Pavilion dv6", {
+        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6") }, NULL},
+        {
+        set_early_pdc_optin, "HP Pavilion dv7", {
+        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7") }, NULL},
+        {},
+};
+
 static acpi_status
 early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
@@ -151,7 +174,7 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK;
 }
 
-void acpi_early_processor_set_pdc(void)
+void __init acpi_early_processor_set_pdc(void)
 {
         /*
          * Check whether the system is DMI table. If yes, OSPM
@@ -159,6 +182,13 @@ void acpi_early_processor_set_pdc(void)
          */
         dmi_check_system(processor_idle_dmi_table);
 
+        /*
+         * Allow systems to opt-in to early _PDC evaluation.
+         */
+        dmi_check_system(early_pdc_optin_table);
+        if (!early_pdc_optin)
+                return;
+
         acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX,
                             early_init_pdc, NULL, NULL, NULL);
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 140c5c5b423c..6deafb4aa0da 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -443,8 +443,7 @@ struct thermal_cooling_device_ops processor_cooling_ops = {
 #ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
-
+        struct acpi_processor *pr = seq->private;
 
         if (!pr)
                 goto end;
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 52b9db8afc20..b16ddbf23a9c 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
+#if defined(CONFIG_ACPI_SYSFS_POWER) || defined(CONFIG_ACPI_PROCFS_POWER)
         struct acpi_battery *battery = &sbs->battery[id];
+#endif
+
 #ifdef CONFIG_ACPI_SYSFS_POWER
         if (battery->bat.dev) {
                 if (battery->have_sysfs_alarm)
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index d9339806df45..fd09229282ea 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -242,7 +242,7 @@ static int smbus_alarm(void *context)
                 case ACPI_SBS_CHARGER:
                 case ACPI_SBS_MANAGER:
                 case ACPI_SBS_BATTERY:
-                        acpi_os_execute(OSL_GPE_HANDLER,
+                        acpi_os_execute(OSL_NOTIFY_HANDLER,
                                         acpi_smbus_callback, hc);
                 default:;
         }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 72e76b4b6538..b765790b32be 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -78,6 +78,13 @@ MODULE_LICENSE("GPL");
 static int brightness_switch_enabled = 1;
 module_param(brightness_switch_enabled, bool, 0644);
 
+/*
+ * By default, we don't allow duplicate ACPI video bus devices
+ * under the same VGA controller
+ */
+static int allow_duplicates;
+module_param(allow_duplicates, bool, 0644);
+
 static int register_count = 0;
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device, int type);
@@ -2239,11 +2246,47 @@ static int acpi_video_resume(struct acpi_device *device)
         return AE_OK;
 }
 
+static acpi_status
+acpi_video_bus_match(acpi_handle handle, u32 level, void *context,
+                        void **return_value)
+{
+        struct acpi_device *device = context;
+        struct acpi_device *sibling;
+        int result;
+
+        if (handle == device->handle)
+                return AE_CTRL_TERMINATE;
+
+        result = acpi_bus_get_device(handle, &sibling);
+        if (result)
+                return AE_OK;
+
+        if (!strcmp(acpi_device_name(sibling), ACPI_VIDEO_BUS_NAME))
+                        return AE_ALREADY_EXISTS;
+
+        return AE_OK;
+}
+
 static int acpi_video_bus_add(struct acpi_device *device)
 {
         struct acpi_video_bus *video;
         struct input_dev *input;
         int error;
+        acpi_status status;
+
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
+                                device->parent->handle, 1,
+                                acpi_video_bus_match, NULL,
+                                device, NULL);
+        if (status == AE_ALREADY_EXISTS) {
+                printk(KERN_WARNING FW_BUG
+                        "Duplicate ACPI video bus devices for the"
+                        " same VGA controller, please try module "
+                        "parameter \"video.allow_duplicates=1\""
+                        "if the current driver doesn't work.\n");
+                if (!allow_duplicates)
+                        return -ENODEV;
+        }
 
         video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
         if (!video)
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 19136a7e1064..6f3f2257d0f0 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -329,7 +329,7 @@ static struct ata_port_operations ich_pata_ops = {
 };
 
 static struct ata_port_operations piix_sata_ops = {
-        .inherits               = &ata_bmdma_port_ops,
+        .inherits               = &ata_bmdma32_port_ops,
 };
 
 static struct ata_port_operations piix_sidpr_sata_ops = {
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 22ff51bdbc8a..6728328f3bea 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3790,21 +3790,45 @@ int sata_link_debounce(struct ata_link *link, const unsigned long *params,
 int sata_link_resume(struct ata_link *link, const unsigned long *params,
                      unsigned long deadline)
 {
+        int tries = ATA_LINK_RESUME_TRIES;
         u32 scontrol, serror;
         int rc;
 
         if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
                 return rc;
 
-        scontrol = (scontrol & 0x0f0) | 0x300;
+        /*
+         * Writes to SControl sometimes get ignored under certain
+         * controllers (ata_piix SIDPR).  Make sure DET actually is
+         * cleared.
+         */
+        do {
+                scontrol = (scontrol & 0x0f0) | 0x300;
+                if ((rc = sata_scr_write(link, SCR_CONTROL, scontrol)))
+                        return rc;
+                /*
+                 * Some PHYs react badly if SStatus is pounded
+                 * immediately after resuming.  Delay 200ms before
+                 * debouncing.
+                 */
+                msleep(200);
 
-        if ((rc = sata_scr_write(link, SCR_CONTROL, scontrol)))
-                return rc;
+                /* is SControl restored correctly? */
+                if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
+                        return rc;
+        } while ((scontrol & 0xf0f) != 0x300 && --tries);
 
-        /* Some PHYs react badly if SStatus is pounded immediately
-         * after resuming.  Delay 200ms before debouncing.
-         */
-        msleep(200);
+        if ((scontrol & 0xf0f) != 0x300) {
+                ata_link_printk(link, KERN_ERR,
+                                "failed to resume link (SControl %X)\n",
+                                scontrol);
+                return 0;
+        }
+
+        if (tries < ATA_LINK_RESUME_TRIES)
+                ata_link_printk(link, KERN_WARNING,
+                                "link resume succeeded after %d retries\n",
+                                ATA_LINK_RESUME_TRIES - tries);
 
         if ((rc = sata_link_debounce(link, params, deadline)))
                 return rc;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 0ea97c942ced..9f6cfac0f2cc 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2028,8 +2028,9 @@ static void ata_eh_link_autopsy(struct ata_link *link)
                         qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER);
 
                 /* determine whether the command is worth retrying */
-                if (!(qc->err_mask & AC_ERR_INVALID) &&
-                    ((qc->flags & ATA_QCFLAG_IO) || qc->err_mask != AC_ERR_DEV))
+                if (qc->flags & ATA_QCFLAG_IO ||
+                    (!(qc->err_mask & AC_ERR_INVALID) &&
+                     qc->err_mask != AC_ERR_DEV))
                         qc->flags |= ATA_QCFLAG_RETRY;
 
                 /* accumulate error info */
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 07d8d00b4d34..63306285c843 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -862,7 +862,7 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
         if (port_status & PDC_DRIVE_ERR)
                 ac_err_mask |= AC_ERR_DEV;
         if (port_status & (PDC_OVERRUN_ERR | PDC_UNDERRUN_ERR))
-                ac_err_mask |= AC_ERR_HSM;
+                ac_err_mask |= AC_ERR_OTHER;
         if (port_status & (PDC2_ATA_HBA_ERR | PDC2_ATA_DMA_CNT_ERR))
                 ac_err_mask |= AC_ERR_ATA_BUS;
         if (port_status & (PDC_PH_ERR | PDC_SH_ERR | PDC_DH_ERR | PDC2_HTO_ERR
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 090dd4851301..42ae452b36b0 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -354,6 +354,7 @@ int __init devtmpfs_init(void)
 {
         int err;
         struct vfsmount *mnt;
+        char options[] = "mode=0755";
 
         err = register_filesystem(&dev_fs_type);
         if (err) {
@@ -362,7 +363,7 @@ int __init devtmpfs_init(void)
                 return err;
         }
 
-        mnt = kern_mount_data(&dev_fs_type, "mode=0755");
+        mnt = kern_mount_data(&dev_fs_type, options);
         if (IS_ERR(mnt)) {
                 err = PTR_ERR(mnt);
                 printk(KERN_ERR "devtmpfs: unable to create devtmpfs %i\n", err);
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index d7d77d4a402c..bd025059711f 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -311,7 +311,7 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);
 static ssize_t
 print_block_size(struct class *class, char *buf)
 {
-        return sprintf(buf, "%lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
+        return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
 }
 
 static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 48adf80926a0..a5142bddef41 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -446,8 +446,8 @@ EXPORT_SYMBOL_GPL(dpm_resume_noirq);
 
 /**
  * legacy_resume - Execute a legacy (bus or class) resume callback for device.
- * dev: Device to resume.
- * cb: Resume callback to execute.
+ * @dev: Device to resume.
+ * @cb: Resume callback to execute.
  */
 static int legacy_resume(struct device *dev, int (*cb)(struct device *dev))
 {
@@ -711,8 +711,9 @@ EXPORT_SYMBOL_GPL(dpm_suspend_noirq);
 
 /**
  * legacy_suspend - Execute a legacy (bus or class) suspend callback for device.
- * dev: Device to suspend.
- * cb: Suspend callback to execute.
+ * @dev: Device to suspend.
+ * @state: PM transition of the system being carried out.
+ * @cb: Suspend callback to execute.
  */
 static int legacy_suspend(struct device *dev, pm_message_t state,
                           int (*cb)(struct device *dev, pm_message_t state))
diff --git a/drivers/block/drbd/Kconfig b/drivers/block/drbd/Kconfig
index f4acd04ebeef..df0983787390 100644
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
@@ -3,7 +3,7 @@
 #
 
 comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected"
-        depends on !PROC_FS || !INET || !CONNECTOR
+        depends on PROC_FS='n' || INET='n' || CONNECTOR='n'
 
 config BLK_DEV_DRBD
         tristate "DRBD Distributed Replicated Block Device support"
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index c97558763430..2bf3a6ef3684 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1275,7 +1275,7 @@ struct bm_extent {
 #if DRBD_MAX_SECTORS_BM < DRBD_MAX_SECTORS_32
 #define DRBD_MAX_SECTORS      DRBD_MAX_SECTORS_BM
 #define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_BM
-#elif !defined(CONFIG_LBD) && BITS_PER_LONG == 32
+#elif !defined(CONFIG_LBDAF) && BITS_PER_LONG == 32
 #define DRBD_MAX_SECTORS      DRBD_MAX_SECTORS_32
 #define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_32
 #else
@@ -1371,10 +1371,9 @@ extern int is_valid_ar_handle(struct drbd_request *, sector_t);
 extern void drbd_suspend_io(struct drbd_conf *mdev);
 extern void drbd_resume_io(struct drbd_conf *mdev);
 extern char *ppsize(char *buf, unsigned long long size);
-extern sector_t drbd_new_dev_size(struct drbd_conf *,
-                struct drbd_backing_dev *);
+extern sector_t drbd_new_dev_size(struct drbd_conf *, struct drbd_backing_dev *, int);
 enum determine_dev_size { dev_size_error = -1, unchanged = 0, shrunk = 1, grew = 2 };
-extern enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *) __must_hold(local);
+extern enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *, int force) __must_hold(local);
 extern void resync_after_online_grow(struct drbd_conf *);
 extern void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int) __must_hold(local);
 extern int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role,
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 9348f33f6242..e898ad9eb1c3 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1298,6 +1298,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
                                 dev_err(DEV, "Sending state in drbd_io_error() failed\n");
                 }
 
+                wait_event(mdev->misc_wait, !atomic_read(&mdev->local_cnt));
                 lc_destroy(mdev->resync);
                 mdev->resync = NULL;
                 lc_destroy(mdev->act_log);
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 4e0726aa53b0..1292e0620663 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -510,7 +510,7 @@ void drbd_resume_io(struct drbd_conf *mdev)
  * Returns 0 on success, negative return values indicate errors.
  * You should call drbd_md_sync() after calling this function.
  */
-enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev) __must_hold(local)
+enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev, int force) __must_hold(local)
 {
         sector_t prev_first_sect, prev_size; /* previous meta location */
         sector_t la_size;
@@ -541,7 +541,7 @@ enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev) __must_ho
         /* TODO: should only be some assert here, not (re)init... */
         drbd_md_set_sector_offsets(mdev, mdev->ldev);
 
-        size = drbd_new_dev_size(mdev, mdev->ldev);
+        size = drbd_new_dev_size(mdev, mdev->ldev, force);
 
         if (drbd_get_capacity(mdev->this_bdev) != size ||
             drbd_bm_capacity(mdev) != size) {
@@ -596,7 +596,7 @@ out:
 }
 
 sector_t
-drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
+drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev, int assume_peer_has_space)
 {
         sector_t p_size = mdev->p_size;   /* partner's disk size. */
         sector_t la_size = bdev->md.la_size_sect; /* last agreed size. */
@@ -606,6 +606,11 @@ drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
 
         m_size = drbd_get_max_capacity(bdev);
 
+        if (mdev->state.conn < C_CONNECTED && assume_peer_has_space) {
+                dev_warn(DEV, "Resize while not connected was forced by the user!\n");
+                p_size = m_size;
+        }
+
         if (p_size && m_size) {
                 size = min_t(sector_t, p_size, m_size);
         } else {
@@ -965,7 +970,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
 
         /* Prevent shrinking of consistent devices ! */
         if (drbd_md_test_flag(nbc, MDF_CONSISTENT) &&
-           drbd_new_dev_size(mdev, nbc) < nbc->md.la_size_sect) {
+            drbd_new_dev_size(mdev, nbc, 0) < nbc->md.la_size_sect) {
                 dev_warn(DEV, "refusing to truncate a consistent device\n");
                 retcode = ERR_DISK_TO_SMALL;
                 goto force_diskless_dec;
@@ -1052,7 +1057,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
             !drbd_md_test_flag(mdev->ldev, MDF_CONNECTED_IND))
                 set_bit(USE_DEGR_WFC_T, &mdev->flags);
 
-        dd = drbd_determin_dev_size(mdev);
+        dd = drbd_determin_dev_size(mdev, 0);
         if (dd == dev_size_error) {
                 retcode = ERR_NOMEM_BITMAP;
                 goto force_diskless_dec;
@@ -1271,7 +1276,7 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
                         goto fail;
                 }
 
-                if (crypto_tfm_alg_type(crypto_hash_tfm(tfm)) != CRYPTO_ALG_TYPE_SHASH) {
+                if (!drbd_crypto_is_hash(crypto_hash_tfm(tfm))) {
                         retcode = ERR_AUTH_ALG_ND;
                         goto fail;
                 }
@@ -1504,7 +1509,7 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
         }
 
         mdev->ldev->dc.disk_size = (sector_t)rs.resize_size;
-        dd = drbd_determin_dev_size(mdev);
+        dd = drbd_determin_dev_size(mdev, rs.resize_force);
         drbd_md_sync(mdev);
         put_ldev(mdev);
         if (dd == dev_size_error) {
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 259c1351b152..f22a5283128a 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -878,9 +878,13 @@ retry:
 
         if (mdev->cram_hmac_tfm) {
                 /* drbd_request_state(mdev, NS(conn, WFAuth)); */
-                if (!drbd_do_auth(mdev)) {
+                switch (drbd_do_auth(mdev)) {
+                case -1:
                         dev_err(DEV, "Authentication of peer failed\n");
                         return -1;
+                case 0:
+                        dev_err(DEV, "Authentication of peer failed, trying again.\n");
+                        return 0;
                 }
         }
 
@@ -1201,10 +1205,11 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h)
 
         case WO_bdev_flush:
         case WO_drain_io:
-                D_ASSERT(rv == FE_STILL_LIVE);
-                set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags);
-                drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
-                rv = drbd_flush_after_epoch(mdev, mdev->current_epoch);
+                if (rv == FE_STILL_LIVE) {
+                        set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags);
+                        drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
+                        rv = drbd_flush_after_epoch(mdev, mdev->current_epoch);
+                }
                 if (rv == FE_RECYCLED)
                         return TRUE;
 
@@ -2865,7 +2870,7 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h)
 
                 /* Never shrink a device with usable data during connect.
                    But allow online shrinking if we are connected. */
-                if (drbd_new_dev_size(mdev, mdev->ldev) <
+                if (drbd_new_dev_size(mdev, mdev->ldev, 0) <
                    drbd_get_capacity(mdev->this_bdev) &&
                    mdev->state.disk >= D_OUTDATED &&
                    mdev->state.conn < C_CONNECTED) {
@@ -2880,7 +2885,7 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h)
 #undef min_not_zero
 
         if (get_ldev(mdev)) {
-                dd = drbd_determin_dev_size(mdev);
+          dd = drbd_determin_dev_size(mdev, 0);
                 put_ldev(mdev);
                 if (dd == dev_size_error)
                         return FALSE;
@@ -3830,10 +3835,17 @@ static int drbd_do_auth(struct drbd_conf *mdev)
 {
         dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
         dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
-        return 0;
+        return -1;
 }
 #else
 #define CHALLENGE_LEN 64
+
+/* Return value:
+        1 - auth succeeded,
+        0 - failed, try again (network error),
+        -1 - auth failed, don't try again.
+*/
+
 static int drbd_do_auth(struct drbd_conf *mdev)
 {
         char my_challenge[CHALLENGE_LEN];  /* 64 Bytes... */
@@ -3854,7 +3866,7 @@ static int drbd_do_auth(struct drbd_conf *mdev)
                                 (u8 *)mdev->net_conf->shared_secret, key_len);
         if (rv) {
                 dev_err(DEV, "crypto_hash_setkey() failed with %d\n", rv);
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3877,14 +3889,14 @@ static int drbd_do_auth(struct drbd_conf *mdev)
 
         if (p.length > CHALLENGE_LEN*2) {
                 dev_err(DEV, "expected AuthChallenge payload too big.\n");
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
         peers_ch = kmalloc(p.length, GFP_NOIO);
         if (peers_ch == NULL) {
                 dev_err(DEV, "kmalloc of peers_ch failed\n");
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3900,7 +3912,7 @@ static int drbd_do_auth(struct drbd_conf *mdev)
         response = kmalloc(resp_size, GFP_NOIO);
         if (response == NULL) {
                 dev_err(DEV, "kmalloc of response failed\n");
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3910,7 +3922,7 @@ static int drbd_do_auth(struct drbd_conf *mdev)
         rv = crypto_hash_digest(&desc, &sg, sg.length, response);
         if (rv) {
                 dev_err(DEV, "crypto_hash_digest() failed with %d\n", rv);
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3944,9 +3956,9 @@ static int drbd_do_auth(struct drbd_conf *mdev)
         }
 
         right_response = kmalloc(resp_size, GFP_NOIO);
-        if (response == NULL) {
+        if (right_response == NULL) {
                 dev_err(DEV, "kmalloc of right_response failed\n");
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3955,7 +3967,7 @@ static int drbd_do_auth(struct drbd_conf *mdev)
         rv = crypto_hash_digest(&desc, &sg, sg.length, right_response);
         if (rv) {
                 dev_err(DEV, "crypto_hash_digest() failed with %d\n", rv);
-                rv = 0;
+                rv = -1;
                 goto fail;
         }
 
@@ -3964,6 +3976,8 @@ static int drbd_do_auth(struct drbd_conf *mdev)
         if (rv)
                 dev_info(DEV, "Peer authenticated using %d bytes of '%s' HMAC\n",
                      resp_size, mdev->net_conf->cram_hmac_alg);
+        else
+                rv = -1;
 
  fail:
         kfree(peers_ch);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 31be3ac2e21b..e023682be2c4 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -669,7 +669,7 @@ config VIRTIO_CONSOLE
 
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
-        depends on PPC_PSERIES
+        depends on PPC_PSERIES && HVC_CONSOLE
         help
           Partitionable IBM Power5 ppc64 machines allow hosting of
           firmware virtual consoles from one Linux partition by
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 5aa7a586a7ff..34cf04e21795 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -725,14 +725,10 @@ static struct pci_driver agp_amd64_pci_driver = {
 int __init agp_amd64_init(void)
 {
         int err = 0;
-        static int done = 0;
 
         if (agp_off)
                 return -EINVAL;
 
-        if (done++)
-                return agp_bridges_found ? 0 : -ENODEV;
-
         err = pci_register_driver(&agp_amd64_pci_driver);
         if (err < 0)
                 return err;
@@ -769,14 +765,24 @@ int __init agp_amd64_init(void)
         return err;
 }
 
+static int __init agp_amd64_mod_init(void)
+{
+        if (gart_iommu_aperture)
+                return agp_bridges_found ? 0 : -ENODEV;
+
+        return agp_amd64_init();
+}
+
 static void __exit agp_amd64_cleanup(void)
 {
+        if (gart_iommu_aperture)
+                return;
         if (aperture_resource)
                 release_resource(aperture_resource);
         pci_unregister_driver(&agp_amd64_pci_driver);
 }
 
-module_init(agp_amd64_init);
+module_init(agp_amd64_mod_init);
 module_exit(agp_amd64_cleanup);
 
 MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen");
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index a56ca080e108..c3ab46da51a3 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -285,18 +285,22 @@ int agp_add_bridge(struct agp_bridge_data *bridge)
 {
         int error;
 
-        if (agp_off)
-                return -ENODEV;
+        if (agp_off) {
+                error = -ENODEV;
+                goto err_put_bridge;
+        }
 
         if (!bridge->dev) {
                 printk (KERN_DEBUG PFX "Erk, registering with no pci_dev!\n");
-                return -EINVAL;
+                error = -EINVAL;
+                goto err_put_bridge;
         }
 
         /* Grab reference on the chipset driver. */
         if (!try_module_get(bridge->driver->owner)) {
                 dev_info(&bridge->dev->dev, "can't lock chipset driver\n");
-                return -EINVAL;
+                error = -EINVAL;
+                goto err_put_bridge;
         }
 
         error = agp_backend_initialize(bridge);
@@ -326,6 +330,7 @@ frontend_err:
         agp_backend_cleanup(bridge);
 err_out:
         module_put(bridge->driver->owner);
+err_put_bridge:
         agp_put_bridge(bridge);
         return error;
 }
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 9047b2714653..58752b70efea 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -488,9 +488,8 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
         handle = obj;
         do {
                 status = acpi_get_object_info(handle, &info);
-                if (ACPI_SUCCESS(status)) {
+                if (ACPI_SUCCESS(status) && (info->valid & ACPI_VALID_HID)) {
                         /* TBD check _CID also */
-                        info->hardware_id.string[sizeof(info->hardware_id.length)-1] = '\0';
                         match = (strcmp(info->hardware_id.string, "HWP0001") == 0);
                         kfree(info);
                         if (match) {
@@ -509,6 +508,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
                 handle = parent;
         } while (ACPI_SUCCESS(status));
 
+        if (ACPI_FAILURE(status))
+                return AE_OK;   /* found no enclosing IOC */
+
         if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa))
                 return AE_OK;
 
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 30c36ac2cd00..3999a5f25f38 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -2460,10 +2460,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                                 &bridge->mode);
         }
 
-        if (bridge->driver->mask_memory == intel_i965_mask_memory)
+        if (bridge->driver->mask_memory == intel_i965_mask_memory) {
                 if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(36)))
                         dev_err(&intel_private.pcidev->dev,
                                 "set gfx device dma mask 36bit failed!\n");
+                else
+                        pci_set_consistent_dma_mask(intel_private.pcidev,
+                                                    DMA_BIT_MASK(36));
+        }
 
         pci_set_drvdata(pdev, bridge);
         return agp_add_bridge(bridge);
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index bdaef8e94021..64fe0a793efd 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -114,7 +114,7 @@ static struct virtio_device_id id_table[] = {
         { 0 },
 };
 
-static struct virtio_driver virtio_rng = {
+static struct virtio_driver virtio_rng_driver = {
         .driver.name =  KBUILD_MODNAME,
         .driver.owner = THIS_MODULE,
         .id_table =     id_table,
@@ -124,12 +124,12 @@ static struct virtio_driver virtio_rng = {
 
 static int __init init(void)
 {
-        return register_virtio_driver(&virtio_rng);
+        return register_virtio_driver(&virtio_rng_driver);
 }
 
 static void __exit fini(void)
 {
-        unregister_virtio_driver(&virtio_rng);
+        unregister_virtio_driver(&virtio_rng_driver);
 }
 module_init(init);
 module_exit(fini);
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 7d73cd430340..2ad7d37afbd0 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1651,10 +1651,10 @@ static void ntty_close(struct tty_struct *tty, struct file *file)
 
         dc->open_ttys--;
         port->count--;
-        tty_port_tty_set(port, NULL);
 
         if (port->count == 0) {
                 DBG1("close: %d", nport->token_dl);
+                tty_port_tty_set(port, NULL);
                 spin_lock_irqsave(&dc->spin_mutex, flags);
                 dc->last_ier &= ~(nport->token_dl);
                 writew(dc->last_ier, dc->reg_ier);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index f15df40bc318..c6f3b48be9dd 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1951,8 +1951,8 @@ static int tty_fasync(int fd, struct file *filp, int on)
                         pid = task_pid(current);
                         type = PIDTYPE_PID;
                 }
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 retval = __f_setown(filp, pid, type, 0);
+                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 if (retval)
                         goto out;
         } else {
diff --git a/drivers/char/uv_mmtimer.c b/drivers/char/uv_mmtimer.c
index 867b67be9f0a..c7072ba14f48 100644
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
@@ -89,13 +89,17 @@ static long uv_mmtimer_ioctl(struct file *file, unsigned int cmd,
         switch (cmd) {
         case MMTIMER_GETOFFSET: /* offset of the counter */
                 /*
-                 * UV RTC register is on its own page
+                 * Starting with HUB rev 2.0, the UV RTC register is
+                 * replicated across all cachelines of it's own page.
+                 * This allows faster simultaneous reads from a given socket.
+                 *
+                 * The offset returned is in 64 bit units.
                  */
-                if (PAGE_SIZE <= (1 << 16))
-                        ret = ((UV_LOCAL_MMR_BASE | UVH_RTC) & (PAGE_SIZE-1))
-                                / 8;
+                if (uv_get_min_hub_revision_id() == 1)
+                        ret = 0;
                 else
-                        ret = -ENOSYS;
+                        ret = ((uv_blade_processor_id() * L1_CACHE_BYTES) %
+                                        PAGE_SIZE) / 8;
                 break;
 
         case MMTIMER_GETRES: /* resolution of the clock in 10^-15 s */
@@ -115,8 +119,8 @@ static long uv_mmtimer_ioctl(struct file *file, unsigned int cmd,
                 ret = hweight64(UVH_RTC_REAL_TIME_CLOCK_MASK);
                 break;
 
-        case MMTIMER_MMAPAVAIL: /* can we mmap the clock into userspace? */
-                ret = (PAGE_SIZE <= (1 << 16)) ? 1 : 0;
+        case MMTIMER_MMAPAVAIL:
+                ret = 1;
                 break;
 
         case MMTIMER_GETCOUNTER:
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 68104434ebb5..73655aeb3a60 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -18,6 +18,7 @@
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
 #include <linux/sched.h>
+#include <linux/math64.h>
 
 #define BUCKETS 12
 #define RESOLUTION 1024
@@ -169,6 +170,12 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
 static void menu_update(struct cpuidle_device *dev);
 
+/* This implements DIV_ROUND_CLOSEST but avoids 64 bit division */
+static u64 div_round64(u64 dividend, u32 divisor)
+{
+        return div_u64(dividend + (divisor / 2), divisor);
+}
+
 /**
  * menu_select - selects the next idle state to enter
  * @dev: the CPU
@@ -209,9 +216,8 @@ static int menu_select(struct cpuidle_device *dev)
                 data->correction_factor[data->bucket] = RESOLUTION * DECAY;
 
         /* Make sure to round up for half microseconds */
-        data->predicted_us = DIV_ROUND_CLOSEST(
-                data->expected_us * data->correction_factor[data->bucket],
-                RESOLUTION * DECAY);
+        data->predicted_us = div_round64(data->expected_us * data->correction_factor[data->bucket],
+                                         RESOLUTION * DECAY);
 
         /*
          * We want to default to C1 (hlt), not to busy polling
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index c5facd951dda..000dc67b85b7 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -197,7 +197,7 @@ static int amd64_get_scrub_rate(struct mem_ctl_info *mci, u32 *bw)
         edac_printk(KERN_DEBUG, EDAC_MC,
                     "pci-read, sdram scrub control value: %d \n", scrubval);
 
-        for (i = 0; ARRAY_SIZE(scrubrates); i++) {
+        for (i = 0; i < ARRAY_SIZE(scrubrates); i++) {
                 if (scrubrates[i].scrubval == scrubval) {
                         *bw = scrubrates[i].bandwidth;
                         status = 0;
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 77a9579d7167..adc10a2ac5f6 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -577,7 +577,13 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
                 debugf0("\tUncorrected bits= 0x%x\n", ue_errors);
 
                 branch = EXTRACT_FBDCHAN_INDX(info->ferr_nf_fbd);
-                channel = branch;
+
+                /*
+                 * According with i5000 datasheet, bit 28 has no significance
+                 * for errors M4Err-M12Err and M17Err-M21Err, on FERR_NF_FBD
+                 */
+                channel = branch & 2;
+
                 bank = NREC_BANK(info->nrecmema);
                 rank = NREC_RANK(info->nrecmema);
                 rdwr = NREC_RDWR(info->nrecmema);
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index 7083bcc1b9c7..5045156c5313 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -57,6 +57,8 @@ static LIST_HEAD(descriptor_list);
 static int descriptor_count;
 
 static __be32 tmp_config_rom[256];
+/* ROM header, bus info block, root dir header, capabilities = 7 quadlets */
+static size_t config_rom_length = 1 + 4 + 1 + 1;
 
 #define BIB_CRC(v)              ((v) <<  0)
 #define BIB_CRC_LENGTH(v)       ((v) << 16)
@@ -73,7 +75,7 @@ static __be32 tmp_config_rom[256];
 #define BIB_CMC                 ((1) << 30)
 #define BIB_IMC                 ((1) << 31)
 
-static size_t generate_config_rom(struct fw_card *card, __be32 *config_rom)
+static void generate_config_rom(struct fw_card *card, __be32 *config_rom)
 {
         struct fw_descriptor *desc;
         int i, j, k, length;
@@ -130,23 +132,30 @@ static size_t generate_config_rom(struct fw_card *card, __be32 *config_rom)
         for (i = 0; i < j; i += length + 1)
                 length = fw_compute_block_crc(config_rom + i);
 
-        return j;
+        WARN_ON(j != config_rom_length);
 }
 
 static void update_config_roms(void)
 {
         struct fw_card *card;
-        size_t length;
 
         list_for_each_entry (card, &card_list, link) {
-                length = generate_config_rom(card, tmp_config_rom);
-                card->driver->set_config_rom(card, tmp_config_rom, length);
+                generate_config_rom(card, tmp_config_rom);
+                card->driver->set_config_rom(card, tmp_config_rom,
+                                             config_rom_length);
         }
 }
 
+static size_t required_space(struct fw_descriptor *desc)
+{
+        /* descriptor + entry into root dir + optional immediate entry */
+        return desc->length + 1 + (desc->immediate > 0 ? 1 : 0);
+}
+
 int fw_core_add_descriptor(struct fw_descriptor *desc)
 {
         size_t i;
+        int ret;
 
         /*
          * Check descriptor is valid; the length of all blocks in the
@@ -162,15 +171,21 @@ int fw_core_add_descriptor(struct fw_descriptor *desc)
 
         mutex_lock(&card_mutex);
 
-        list_add_tail(&desc->link, &descriptor_list);
-        descriptor_count++;
-        if (desc->immediate > 0)
+        if (config_rom_length + required_space(desc) > 256) {
+                ret = -EBUSY;
+        } else {
+                list_add_tail(&desc->link, &descriptor_list);
+                config_rom_length += required_space(desc);
                 descriptor_count++;
-        update_config_roms();
+                if (desc->immediate > 0)
+                        descriptor_count++;
+                update_config_roms();
+                ret = 0;
+        }
 
         mutex_unlock(&card_mutex);
 
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL(fw_core_add_descriptor);
 
@@ -179,6 +194,7 @@ void fw_core_remove_descriptor(struct fw_descriptor *desc)
         mutex_lock(&card_mutex);
 
         list_del(&desc->link);
+        config_rom_length -= required_space(desc);
         descriptor_count--;
         if (desc->immediate > 0)
                 descriptor_count--;
@@ -428,7 +444,6 @@ EXPORT_SYMBOL(fw_card_initialize);
 int fw_card_add(struct fw_card *card,
                 u32 max_receive, u32 link_speed, u64 guid)
 {
-        size_t length;
         int ret;
 
         card->max_receive = max_receive;
@@ -437,8 +452,8 @@ int fw_card_add(struct fw_card *card,
 
         mutex_lock(&card_mutex);
 
-        length = generate_config_rom(card, tmp_config_rom);
-        ret = card->driver->enable(card, tmp_config_rom, length);
+        generate_config_rom(card, tmp_config_rom);
+        ret = card->driver->enable(card, tmp_config_rom, config_rom_length);
         if (ret == 0)
                 list_add_tail(&card->link, &card_list);
 
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index e6d63849e78e..4eeaed57e219 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -35,6 +35,7 @@
 #include <linux/preempt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
@@ -595,13 +596,20 @@ static int ioctl_send_request(struct client *client, void *buffer)
                             client->device->max_speed);
 }
 
+static inline bool is_fcp_request(struct fw_request *request)
+{
+        return request == NULL;
+}
+
 static void release_request(struct client *client,
                             struct client_resource *resource)
 {
         struct inbound_transaction_resource *r = container_of(resource,
                         struct inbound_transaction_resource, resource);
 
-        if (r->request)
+        if (is_fcp_request(r->request))
+                kfree(r->data);
+        else
                 fw_send_response(client->device->card, r->request,
                                  RCODE_CONFLICT_ERROR);
         kfree(r);
@@ -616,6 +624,7 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
         struct address_handler_resource *handler = callback_data;
         struct inbound_transaction_resource *r;
         struct inbound_transaction_event *e;
+        void *fcp_frame = NULL;
         int ret;
 
         r = kmalloc(sizeof(*r), GFP_ATOMIC);
@@ -627,6 +636,18 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
         r->data    = payload;
         r->length  = length;
 
+        if (is_fcp_request(request)) {
+                /*
+                 * FIXME: Let core-transaction.c manage a
+                 * single reference-counted copy?
+                 */
+                fcp_frame = kmemdup(payload, length, GFP_ATOMIC);
+                if (fcp_frame == NULL)
+                        goto failed;
+
+                r->data = fcp_frame;
+        }
+
         r->resource.release = release_request;
         ret = add_client_resource(handler->client, &r->resource, GFP_ATOMIC);
         if (ret < 0)
@@ -640,13 +661,15 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
         e->request.closure = handler->closure;
 
         queue_event(handler->client, &e->event,
-                    &e->request, sizeof(e->request), payload, length);
+                    &e->request, sizeof(e->request), r->data, length);
         return;
 
  failed:
         kfree(r);
         kfree(e);
-        if (request)
+        kfree(fcp_frame);
+
+        if (!is_fcp_request(request))
                 fw_send_response(card, request, RCODE_CONFLICT_ERROR);
 }
 
@@ -717,18 +740,17 @@ static int ioctl_send_response(struct client *client, void *buffer)
 
         r = container_of(resource, struct inbound_transaction_resource,
                          resource);
-        if (r->request) {
-                if (request->length < r->length)
-                        r->length = request->length;
-                if (copy_from_user(r->data, u64_to_uptr(request->data),
-                                   r->length)) {
-                        ret = -EFAULT;
-                        kfree(r->request);
-                        goto out;
-                }
-                fw_send_response(client->device->card, r->request,
-                                 request->rcode);
+        if (is_fcp_request(r->request))
+                goto out;
+
+        if (request->length < r->length)
+                r->length = request->length;
+        if (copy_from_user(r->data, u64_to_uptr(request->data), r->length)) {
+                ret = -EFAULT;
+                kfree(r->request);
+                goto out;
         }
+        fw_send_response(client->device->card, r->request, request->rcode);
  out:
         kfree(r);
 
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index a61571c63c59..2345d4103fe6 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2420,6 +2420,7 @@ static void ohci_pmac_off(struct pci_dev *dev)
 
 #define PCI_VENDOR_ID_AGERE             PCI_VENDOR_ID_ATT
 #define PCI_DEVICE_ID_AGERE_FW643       0x5901
+#define PCI_DEVICE_ID_TI_TSB43AB23      0x8024
 
 static int __devinit pci_probe(struct pci_dev *dev,
                                const struct pci_device_id *ent)
@@ -2488,7 +2489,8 @@ static int __devinit pci_probe(struct pci_dev *dev,
 #if !defined(CONFIG_X86_32)
         /* dual-buffer mode is broken with descriptor addresses above 2G */
         if (dev->vendor == PCI_VENDOR_ID_TI &&
-            dev->device == PCI_DEVICE_ID_TI_TSB43AB22)
+            (dev->device == PCI_DEVICE_ID_TI_TSB43AB22 ||
+             dev->device == PCI_DEVICE_ID_TI_TSB43AB23))
                 ohci->use_dualbuffer = false;
 #endif
 
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a019b49ecc9b..1f1d88ae68d6 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -172,6 +172,15 @@ config GPIO_ADP5520
           To compile this driver as a module, choose M here: the module will
           be called adp5520-gpio.
 
+config GPIO_ADP5588
+        tristate "ADP5588 I2C GPIO expander"
+        depends on I2C
+        help
+          This option enables support for 18 GPIOs found
+          on Analog Devices ADP5588 GPIO Expanders.
+          To compile this driver as a module, choose M here: the module will be
+          called adp5588-gpio.
+
 comment "PCI GPIO expanders:"
 
 config GPIO_CS5535
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 52fe4cf734c7..48687238edb1 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -5,6 +5,7 @@ ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG
 obj-$(CONFIG_GPIOLIB)           += gpiolib.o
 
 obj-$(CONFIG_GPIO_ADP5520)      += adp5520-gpio.o
+obj-$(CONFIG_GPIO_ADP5588)      += adp5588-gpio.o
 obj-$(CONFIG_GPIO_LANGWELL)     += langwell_gpio.o
 obj-$(CONFIG_GPIO_MAX7301)      += max7301.o
 obj-$(CONFIG_GPIO_MAX732X)      += max732x.o
diff --git a/drivers/gpio/adp5588-gpio.c b/drivers/gpio/adp5588-gpio.c
new file mode 100644
index 000000000000..afc097a16b33
--- /dev/null
+++ b/drivers/gpio/adp5588-gpio.c
@@ -0,0 +1,266 @@
+/*
+ * GPIO Chip driver for Analog Devices
+ * ADP5588 I/O Expander and QWERTY Keypad Controller
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+
+#include <linux/i2c/adp5588.h>
+
+#define DRV_NAME                "adp5588-gpio"
+#define MAXGPIO                 18
+#define ADP_BANK(offs)          ((offs) >> 3)
+#define ADP_BIT(offs)           (1u << ((offs) & 0x7))
+
+struct adp5588_gpio {
+        struct i2c_client *client;
+        struct gpio_chip gpio_chip;
+        struct mutex lock;      /* protect cached dir, dat_out */
+        unsigned gpio_start;
+        uint8_t dat_out[3];
+        uint8_t dir[3];
+};
+
+static int adp5588_gpio_read(struct i2c_client *client, u8 reg)
+{
+        int ret = i2c_smbus_read_byte_data(client, reg);
+
+        if (ret < 0)
+                dev_err(&client->dev, "Read Error\n");
+
+        return ret;
+}
+
+static int adp5588_gpio_write(struct i2c_client *client, u8 reg, u8 val)
+{
+        int ret = i2c_smbus_write_byte_data(client, reg, val);
+
+        if (ret < 0)
+                dev_err(&client->dev, "Write Error\n");
+
+        return ret;
+}
+
+static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off)
+{
+        struct adp5588_gpio *dev =
+            container_of(chip, struct adp5588_gpio, gpio_chip);
+
+        return !!(adp5588_gpio_read(dev->client, GPIO_DAT_STAT1 + ADP_BANK(off))
+                  & ADP_BIT(off));
+}
+
+static void adp5588_gpio_set_value(struct gpio_chip *chip,
+                                   unsigned off, int val)
+{
+        unsigned bank, bit;
+        struct adp5588_gpio *dev =
+            container_of(chip, struct adp5588_gpio, gpio_chip);
+
+        bank = ADP_BANK(off);
+        bit = ADP_BIT(off);
+
+        mutex_lock(&dev->lock);
+        if (val)
+                dev->dat_out[bank] |= bit;
+        else
+                dev->dat_out[bank] &= ~bit;
+
+        adp5588_gpio_write(dev->client, GPIO_DAT_OUT1 + bank,
+                           dev->dat_out[bank]);
+        mutex_unlock(&dev->lock);
+}
+
+static int adp5588_gpio_direction_input(struct gpio_chip *chip, unsigned off)
+{
+        int ret;
+        unsigned bank;
+        struct adp5588_gpio *dev =
+            container_of(chip, struct adp5588_gpio, gpio_chip);
+
+        bank = ADP_BANK(off);
+
+        mutex_lock(&dev->lock);
+        dev->dir[bank] &= ~ADP_BIT(off);
+        ret = adp5588_gpio_write(dev->client, GPIO_DIR1 + bank, dev->dir[bank]);
+        mutex_unlock(&dev->lock);
+
+        return ret;
+}
+
+static int adp5588_gpio_direction_output(struct gpio_chip *chip,
+                                         unsigned off, int val)
+{
+        int ret;
+        unsigned bank, bit;
+        struct adp5588_gpio *dev =
+            container_of(chip, struct adp5588_gpio, gpio_chip);
+
+        bank = ADP_BANK(off);
+        bit = ADP_BIT(off);
+
+        mutex_lock(&dev->lock);
+        dev->dir[bank] |= bit;
+
+        if (val)
+                dev->dat_out[bank] |= bit;
+        else
+                dev->dat_out[bank] &= ~bit;
+
+        ret = adp5588_gpio_write(dev->client, GPIO_DAT_OUT1 + bank,
+                                 dev->dat_out[bank]);
+        ret |= adp5588_gpio_write(dev->client, GPIO_DIR1 + bank,
+                                 dev->dir[bank]);
+        mutex_unlock(&dev->lock);
+
+        return ret;
+}
+
+static int __devinit adp5588_gpio_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
+        struct adp5588_gpio *dev;
+        struct gpio_chip *gc;
+        int ret, i, revid;
+
+        if (pdata == NULL) {
+                dev_err(&client->dev, "missing platform data\n");
+                return -ENODEV;
+        }
+
+        if (!i2c_check_functionality(client->adapter,
+                                        I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&client->dev, "SMBUS Byte Data not Supported\n");
+                return -EIO;
+        }
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (dev == NULL) {
+                dev_err(&client->dev, "failed to alloc memory\n");
+                return -ENOMEM;
+        }
+
+        dev->client = client;
+
+        gc = &dev->gpio_chip;
+        gc->direction_input = adp5588_gpio_direction_input;
+        gc->direction_output = adp5588_gpio_direction_output;
+        gc->get = adp5588_gpio_get_value;
+        gc->set = adp5588_gpio_set_value;
+        gc->can_sleep = 1;
+
+        gc->base = pdata->gpio_start;
+        gc->ngpio = MAXGPIO;
+        gc->label = client->name;
+        gc->owner = THIS_MODULE;
+
+        mutex_init(&dev->lock);
+
+
+        ret = adp5588_gpio_read(dev->client, DEV_ID);
+        if (ret < 0)
+                goto err;
+
+        revid = ret & ADP5588_DEVICE_ID_MASK;
+
+        for (i = 0, ret = 0; i <= ADP_BANK(MAXGPIO); i++) {
+                dev->dat_out[i] = adp5588_gpio_read(client, GPIO_DAT_OUT1 + i);
+                dev->dir[i] = adp5588_gpio_read(client, GPIO_DIR1 + i);
+                ret |= adp5588_gpio_write(client, KP_GPIO1 + i, 0);
+                ret |= adp5588_gpio_write(client, GPIO_PULL1 + i,
+                                (pdata->pullup_dis_mask >> (8 * i)) & 0xFF);
+
+                if (ret)
+                        goto err;
+        }
+
+        ret = gpiochip_add(&dev->gpio_chip);
+        if (ret)
+                goto err;
+
+        dev_info(&client->dev, "gpios %d..%d on a %s Rev. %d\n",
+                        gc->base, gc->base + gc->ngpio - 1,
+                        client->name, revid);
+
+        if (pdata->setup) {
+                ret = pdata->setup(client, gc->base, gc->ngpio, pdata->context);
+                if (ret < 0)
+                        dev_warn(&client->dev, "setup failed, %d\n", ret);
+        }
+
+        i2c_set_clientdata(client, dev);
+        return 0;
+
+err:
+        kfree(dev);
+        return ret;
+}
+
+static int __devexit adp5588_gpio_remove(struct i2c_client *client)
+{
+        struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
+        struct adp5588_gpio *dev = i2c_get_clientdata(client);
+        int ret;
+
+        if (pdata->teardown) {
+                ret = pdata->teardown(client,
+                                      dev->gpio_chip.base, dev->gpio_chip.ngpio,
+                                      pdata->context);
+                if (ret < 0) {
+                        dev_err(&client->dev, "teardown failed %d\n", ret);
+                        return ret;
+                }
+        }
+
+        ret = gpiochip_remove(&dev->gpio_chip);
+        if (ret) {
+                dev_err(&client->dev, "gpiochip_remove failed %d\n", ret);
+                return ret;
+        }
+
+        kfree(dev);
+        return 0;
+}
+
+static const struct i2c_device_id adp5588_gpio_id[] = {
+        {DRV_NAME, 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, adp5588_gpio_id);
+
+static struct i2c_driver adp5588_gpio_driver = {
+        .driver = {
+                   .name = DRV_NAME,
+                   },
+        .probe = adp5588_gpio_probe,
+        .remove = __devexit_p(adp5588_gpio_remove),
+        .id_table = adp5588_gpio_id,
+};
+
+static int __init adp5588_gpio_init(void)
+{
+        return i2c_add_driver(&adp5588_gpio_driver);
+}
+
+module_init(adp5588_gpio_init);
+
+static void __exit adp5588_gpio_exit(void)
+{
+        i2c_del_driver(&adp5588_gpio_driver);
+}
+
+module_exit(adp5588_gpio_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("GPIO ADP5588 Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a25ad284a272..350842ad3632 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -858,8 +858,6 @@ int gpio_sysfs_set_active_low(unsigned gpio, int value)
         desc = &gpio_desc[gpio];
 
         if (test_bit(FLAG_EXPORT, &desc->flags)) {
-                struct device *dev;
-
                 dev = class_find_device(&gpio_class, NULL, desc, match_export);
                 if (dev == NULL) {
                         status = -ENODEV;
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 96eddd17e050..305c59003963 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -66,6 +66,8 @@ config DRM_RADEON
 
           If M is selected, the module will be called radeon.
 
+source "drivers/gpu/drm/radeon/Kconfig"
+
 config DRM_I810
         tristate "Intel I810"
         depends on DRM && AGP && AGP_INTEL
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 628eae3e9b83..a1fce68e3bbe 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -39,8 +39,7 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
                                        struct drm_ati_pcigart_info *gart_info)
 {
         gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
-                                                PAGE_SIZE,
-                                                gart_info->table_mask);
+                                                PAGE_SIZE);
         if (gart_info->table_handle == NULL)
                 return -ENOMEM;
 
@@ -112,6 +111,13 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
         if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
                 DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
 
+                if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) {
+                        DRM_ERROR("fail to set dma mask to 0x%Lx\n",
+                                  gart_info->table_mask);
+                        ret = 1;
+                        goto done;
+                }
+
                 ret = drm_ati_alloc_pcigart_table(dev, gart_info);
                 if (ret) {
                         DRM_ERROR("cannot allocate PCI GART page!\n");
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 3d09e304f6f4..8417cc4c43f1 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -326,7 +326,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                  * As we're limiting the address to 2^32-1 (or less),
                  * casting it down to 32 bits is no problem, but we
                  * need to point to a 64bit variable first. */
-                dmah = drm_pci_alloc(dev, map->size, map->size, 0xffffffffUL);
+                dmah = drm_pci_alloc(dev, map->size, map->size);
                 if (!dmah) {
                         kfree(map);
                         return -ENOMEM;
@@ -885,7 +885,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
 
         while (entry->buf_count < count) {
 
-                dmah = drm_pci_alloc(dev, PAGE_SIZE << page_order, 0x1000, 0xfffffffful);
+                dmah = drm_pci_alloc(dev, PAGE_SIZE << page_order, 0x1000);
 
                 if (!dmah) {
                         /* Set count correctly so we free the proper amount. */
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 5124401f266a..d91fb8c0b7b3 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -158,6 +158,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
         { DRM_MODE_CONNECTOR_HDMIA, "HDMI Type A", 0 },
         { DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 },
         { DRM_MODE_CONNECTOR_TV, "TV", 0 },
+        { DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort", 0 },
 };
 
 static struct drm_prop_enum_list drm_encoder_enum_list[] =
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 4231d6db72ec..7d0f00a935fa 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -216,7 +216,7 @@ bool drm_helper_crtc_in_use(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_helper_crtc_in_use);
 
 /**
- * drm_disable_unused_functions - disable unused objects
+ * drm_helper_disable_unused_functions - disable unused objects
  * @dev: DRM device
  *
  * LOCKING:
@@ -702,7 +702,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                 if (encoder->crtc != crtc)
                         continue;
 
-                DRM_INFO("%s: set mode %s %x\n", drm_get_encoder_name(encoder),
+                DRM_DEBUG("%s: set mode %s %x\n", drm_get_encoder_name(encoder),
                          mode->name, mode->base.id);
                 encoder_funcs = encoder->helper_private;
                 encoder_funcs->mode_set(encoder, mode, adjusted_mode);
@@ -1032,7 +1032,8 @@ bool drm_helper_initial_config(struct drm_device *dev)
         /*
          * we shouldn't end up with no modes here.
          */
-        WARN(!count, "No connectors reported connected with modes\n");
+        if (count == 0)
+                printk(KERN_INFO "No connectors reported connected with modes\n");
 
         drm_setup_crtcs(dev);
 
@@ -1162,6 +1163,9 @@ EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct);
 int drm_helper_resume_force_mode(struct drm_device *dev)
 {
         struct drm_crtc *crtc;
+        struct drm_encoder *encoder;
+        struct drm_encoder_helper_funcs *encoder_funcs;
+        struct drm_crtc_helper_funcs *crtc_funcs;
         int ret;
 
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1174,6 +1178,25 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
 
                 if (ret == false)
                         DRM_ERROR("failed to set mode on crtc %p\n", crtc);
+
+                /* Turn off outputs that were already powered off */
+                if (drm_helper_choose_crtc_dpms(crtc)) {
+                        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+
+                                if(encoder->crtc != crtc)
+                                        continue;
+
+                                encoder_funcs = encoder->helper_private;
+                                if (encoder_funcs->dpms)
+                                        (*encoder_funcs->dpms) (encoder,
+                                                                drm_helper_choose_encoder_dpms(encoder));
+
+                                crtc_funcs = crtc->helper_private;
+                                if (crtc_funcs->dpms)
+                                        (*crtc_funcs->dpms) (crtc,
+                                                             drm_helper_choose_crtc_dpms(crtc));
+                        }
+                }
         }
         /* disable the unused connectors while restoring the modesetting */
         drm_helper_disable_unused_functions(dev);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5c9f79877cbf..f665b05592f3 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -633,8 +633,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
                 return NULL;
         }
         if (!(pt->misc & DRM_EDID_PT_SEPARATE_SYNC)) {
-                printk(KERN_WARNING "integrated sync not supported\n");
-                return NULL;
+                printk(KERN_WARNING "composite sync not supported\n");
         }
 
         /* it is incorrect if hsync/vsync width is zero */
@@ -911,23 +910,27 @@ static int drm_cvt_modes(struct drm_connector *connector,
         struct drm_device *dev = connector->dev;
         struct cvt_timing *cvt;
         const int rates[] = { 60, 85, 75, 60, 50 };
+        const u8 empty[3] = { 0, 0, 0 };
 
         for (i = 0; i < 4; i++) {
                 int uninitialized_var(width), height;
                 cvt = &(timing->data.other_data.data.cvt[i]);
 
-                height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 8) + 1) * 2;
-                switch (cvt->code[1] & 0xc0) {
+                if (!memcmp(cvt->code, empty, 3))
+                        continue;
+
+                height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 4) + 1) * 2;
+                switch (cvt->code[1] & 0x0c) {
                 case 0x00:
                         width = height * 4 / 3;
                         break;
-                case 0x40:
+                case 0x04:
                         width = height * 16 / 9;
                         break;
-                case 0x80:
+                case 0x08:
                         width = height * 16 / 10;
                         break;
-                case 0xc0:
+                case 0x0c:
                         width = height * 15 / 9;
                         break;
                 }
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 1b49fa055f4f..0f9e90552dc4 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -156,7 +156,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con
                         force = DRM_FORCE_ON;
                         break;
                 case 'D':
-                        if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) ||
+                        if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) &&
                             (connector->connector_type != DRM_MODE_CONNECTOR_HDMIB))
                                 force = DRM_FORCE_ON;
                         else
@@ -389,7 +389,7 @@ int drm_fb_helper_blank(int blank, struct fb_info *info)
                 break;
         /* Display: Off; HSync: On, VSync: On */
         case FB_BLANK_NORMAL:
-                drm_fb_helper_off(info, DRM_MODE_DPMS_ON);
+                drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
                 break;
         /* Display: Off; HSync: Off, VSync: On */
         case FB_BLANK_HSYNC_SUSPEND:
@@ -606,11 +606,10 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
 
         /* Need to resize the fb object !!! */
-        if (var->xres > fb->width || var->yres > fb->height) {
-                DRM_ERROR("Requested width/height is greater than current fb "
-                           "object %dx%d > %dx%d\n", var->xres, var->yres,
-                           fb->width, fb->height);
-                DRM_ERROR("Need resizing code.\n");
+        if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) {
+                DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb "
+                          "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,
+                          fb->width, fb->height, fb->bits_per_pixel);
                 return -EINVAL;
         }
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index e9dbb481c469..8bf3770f294e 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -142,19 +142,6 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
         if (IS_ERR(obj->filp))
                 goto free;
 
-        /* Basically we want to disable the OOM killer and handle ENOMEM
-         * ourselves by sacrificing pages from cached buffers.
-         * XXX shmem_file_[gs]et_gfp_mask()
-         */
-        mapping_set_gfp_mask(obj->filp->f_path.dentry->d_inode->i_mapping,
-                             GFP_HIGHUSER |
-                             __GFP_COLD |
-                             __GFP_FS |
-                             __GFP_RECLAIMABLE |
-                             __GFP_NORETRY |
-                             __GFP_NOWARN |
-                             __GFP_NOMEMALLOC);
-
         kref_init(&obj->refcount);
         kref_init(&obj->handlecount);
         obj->size = size;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 7998ee66b317..b98384dbd9a7 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -115,6 +115,7 @@ void drm_vblank_cleanup(struct drm_device *dev)
 
         dev->num_crtcs = 0;
 }
+EXPORT_SYMBOL(drm_vblank_cleanup);
 
 int drm_vblank_init(struct drm_device *dev, int num_crtcs)
 {
@@ -163,7 +164,6 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
         }
 
         dev->vblank_disable_allowed = 0;
-
         return 0;
 
 err:
@@ -493,6 +493,9 @@ EXPORT_SYMBOL(drm_vblank_off);
  */
 void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)
 {
+        /* vblank is not initialized (IRQ not installed ?) */
+        if (!dev->num_crtcs)
+                return;
         /*
          * To avoid all the problems that might happen if interrupts
          * were enabled/disabled around or between these calls, we just
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 6d81a02463a3..76d63394c776 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1,9 +1,4 @@
 /*
- * The list_sort function is (presumably) licensed under the GPL (see the
- * top level "COPYING" file for details).
- *
- * The remainder of this file is:
- *
  * Copyright © 1997-2003 by The XFree86 Project, Inc.
  * Copyright © 2007 Dave Airlie
  * Copyright © 2007-2008 Intel Corporation
@@ -36,6 +31,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/list_sort.h>
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
@@ -855,6 +851,7 @@ EXPORT_SYMBOL(drm_mode_prune_invalid);
 
 /**
  * drm_mode_compare - compare modes for favorability
+ * @priv: unused
  * @lh_a: list_head for first mode
  * @lh_b: list_head for second mode
  *
@@ -868,7 +865,7 @@ EXPORT_SYMBOL(drm_mode_prune_invalid);
  * Negative if @lh_a is better than @lh_b, zero if they're equivalent, or
  * positive if @lh_b is better than @lh_a.
  */
-static int drm_mode_compare(struct list_head *lh_a, struct list_head *lh_b)
+static int drm_mode_compare(void *priv, struct list_head *lh_a, struct list_head *lh_b)
 {
         struct drm_display_mode *a = list_entry(lh_a, struct drm_display_mode, head);
         struct drm_display_mode *b = list_entry(lh_b, struct drm_display_mode, head);
@@ -885,85 +882,6 @@ static int drm_mode_compare(struct list_head *lh_a, struct list_head *lh_b)
         return diff;
 }
 
-/* FIXME: what we don't have a list sort function? */
-/* list sort from Mark J Roberts (mjr@znex.org) */
-void list_sort(struct list_head *head,
-               int (*cmp)(struct list_head *a, struct list_head *b))
-{
-        struct list_head *p, *q, *e, *list, *tail, *oldhead;
-        int insize, nmerges, psize, qsize, i;
-
-        list = head->next;
-        list_del(head);
-        insize = 1;
-        for (;;) {
-                p = oldhead = list;
-                list = tail = NULL;
-                nmerges = 0;
-
-                while (p) {
-                        nmerges++;
-                        q = p;
-                        psize = 0;
-                        for (i = 0; i < insize; i++) {
-                                psize++;
-                                q = q->next == oldhead ? NULL : q->next;
-                                if (!q)
-                                        break;
-                        }
-
-                        qsize = insize;
-                        while (psize > 0 || (qsize > 0 && q)) {
-                                if (!psize) {
-                                        e = q;
-                                        q = q->next;
-                                        qsize--;
-                                        if (q == oldhead)
-                                                q = NULL;
-                                } else if (!qsize || !q) {
-                                        e = p;
-                                        p = p->next;
-                                        psize--;
-                                        if (p == oldhead)
-                                                p = NULL;
-                                } else if (cmp(p, q) <= 0) {
-                                        e = p;
-                                        p = p->next;
-                                        psize--;
-                                        if (p == oldhead)
-                                                p = NULL;
-                                } else {
-                                        e = q;
-                                        q = q->next;
-                                        qsize--;
-                                        if (q == oldhead)
-                                                q = NULL;
-                                }
-                                if (tail)
-                                        tail->next = e;
-                                else
-                                        list = e;
-                                e->prev = tail;
-                                tail = e;
-                        }
-                        p = q;
-                }
-
-                tail->next = list;
-                list->prev = tail;
-
-                if (nmerges <= 1)
-                        break;
-
-                insize *= 2;
-        }
-
-        head->next = list;
-        head->prev = list->prev;
-        list->prev->next = head;
-        list->prev = head;
-}
-
 /**
  * drm_mode_sort - sort mode list
  * @mode_list: list to sort
@@ -975,7 +893,7 @@ void list_sort(struct list_head *head,
  */
 void drm_mode_sort(struct list_head *mode_list)
 {
-        list_sort(mode_list, drm_mode_compare);
+        list_sort(NULL, mode_list, drm_mode_compare);
 }
 EXPORT_SYMBOL(drm_mode_sort);
 
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 577094fb1995..e68ebf92fa2a 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -47,8 +47,7 @@
 /**
  * \brief Allocate a PCI consistent memory block, for DMA.
  */
-drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align,
-                                dma_addr_t maxaddr)
+drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
 {
         drm_dma_handle_t *dmah;
 #if 1
@@ -63,11 +62,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
         if (align > size)
                 return NULL;
 
-        if (pci_set_dma_mask(dev->pdev, maxaddr) != 0) {
-                DRM_ERROR("Setting pci dma mask failed\n");
-                return NULL;
-        }
-
         dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
         if (!dmah)
                 return NULL;
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 18476bf0b580..a894ade03093 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -272,7 +272,7 @@ static void i915_dump_pages(struct seq_file *m, struct page **pages, int page_co
                 mem = kmap_atomic(pages[page], KM_USER0);
                 for (i = 0; i < PAGE_SIZE; i += 4)
                         seq_printf(m, "%08x :  %08x\n", i, mem[i / 4]);
-                kunmap_atomic(pages[page], KM_USER0);
+                kunmap_atomic(mem, KM_USER0);
         }
 }
 
@@ -290,7 +290,7 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data)
         list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {
                 obj = obj_priv->obj;
                 if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {
-                    ret = i915_gem_object_get_pages(obj);
+                    ret = i915_gem_object_get_pages(obj, 0);
                     if (ret) {
                             DRM_ERROR("Failed to get pages: %d\n", ret);
                             spin_unlock(&dev_priv->mm.active_list_lock);
@@ -386,34 +386,6 @@ out:
         return 0;
 }
 
-static int i915_registers_info(struct seq_file *m, void *data) {
-        struct drm_info_node *node = (struct drm_info_node *) m->private;
-        struct drm_device *dev = node->minor->dev;
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        uint32_t reg;
-
-#define DUMP_RANGE(start, end) \
-        for (reg=start; reg < end; reg += 4) \
-        seq_printf(m, "%08x\t%08x\n", reg, I915_READ(reg));
-
-        DUMP_RANGE(0x00000, 0x00fff);   /* VGA registers */
-        DUMP_RANGE(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
-        DUMP_RANGE(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
-        DUMP_RANGE(0x03200, 0x03fff);   /* frame buffer compression registers */
-        DUMP_RANGE(0x05000, 0x05fff);   /* I/O control registers */
-        DUMP_RANGE(0x06000, 0x06fff);   /* clock control registers */
-        DUMP_RANGE(0x07000, 0x07fff);   /* 3D internal debug registers */
-        DUMP_RANGE(0x07400, 0x088ff);   /* GPE debug registers */
-        DUMP_RANGE(0x0a000, 0x0afff);   /* display palette registers */
-        DUMP_RANGE(0x10000, 0x13fff);   /* MMIO MCHBAR */
-        DUMP_RANGE(0x30000, 0x3ffff);   /* overlay registers */
-        DUMP_RANGE(0x60000, 0x6ffff);   /* display engine pipeline registers */
-        DUMP_RANGE(0x70000, 0x72fff);   /* display and cursor registers */
-        DUMP_RANGE(0x73000, 0x73fff);   /* performance counters */
-
-        return 0;
-}
-
 static int
 i915_wedged_open(struct inode *inode,
                  struct file *filp)
@@ -519,7 +491,6 @@ static int i915_wedged_create(struct dentry *root, struct drm_minor *minor)
 }
 
 static struct drm_info_list i915_debugfs_list[] = {
-        {"i915_regs", i915_registers_info, 0},
         {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},
         {"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},
         {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 701bfeac7f57..e660ac07f3b2 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -123,7 +123,7 @@ static int i915_init_phys_hws(struct drm_device *dev)
         drm_i915_private_t *dev_priv = dev->dev_private;
         /* Program Hardware Status Page */
         dev_priv->status_page_dmah =
-                drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
+                drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE);
 
         if (!dev_priv->status_page_dmah) {
                 DRM_ERROR("Can not allocate hardware status page\n");
@@ -134,6 +134,10 @@ static int i915_init_phys_hws(struct drm_device *dev)
 
         memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 
+        if (IS_I965G(dev))
+                dev_priv->dma_status_page |= (dev_priv->dma_status_page >> 28) &
+                                             0xf0;
+
         I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
         DRM_DEBUG_DRIVER("Enabled hardware status page\n");
         return 0;
@@ -813,9 +817,13 @@ static int i915_getparam(struct drm_device *dev, void *data,
         case I915_PARAM_HAS_PAGEFLIPPING:
                 value = 1;
                 break;
+        case I915_PARAM_HAS_EXECBUF2:
+                /* depends on GEM */
+                value = dev_priv->has_gem;
+                break;
         default:
                 DRM_DEBUG_DRIVER("Unknown parameter %d\n",
-                                        param->param);
+                                 param->param);
                 return -EINVAL;
         }
 
@@ -1117,7 +1125,8 @@ static void i915_setup_compression(struct drm_device *dev, int size)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_mm_node *compressed_fb, *compressed_llb;
-        unsigned long cfb_base, ll_base;
+        unsigned long cfb_base;
+        unsigned long ll_base = 0;
 
         /* Leave 1M for line length buffer & misc. */
         compressed_fb = drm_mm_search_free(&dev_priv->vram, size, 4096, 0);
@@ -1200,14 +1209,6 @@ static int i915_load_modeset_init(struct drm_device *dev,
         dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &
                 0xff000000;
 
-        if (IS_MOBILE(dev) || IS_I9XX(dev))
-                dev_priv->cursor_needs_physical = true;
-        else
-                dev_priv->cursor_needs_physical = false;
-
-        if (IS_I965G(dev) || IS_G33(dev))
-                dev_priv->cursor_needs_physical = false;
-
         /* Basic memrange allocator for stolen space (aka vram) */
         drm_mm_init(&dev_priv->vram, 0, prealloc_size);
         DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024));
@@ -1257,6 +1258,8 @@ static int i915_load_modeset_init(struct drm_device *dev,
         if (ret)
                 goto destroy_ringbuffer;
 
+        intel_modeset_init(dev);
+
         ret = drm_irq_install(dev);
         if (ret)
                 goto destroy_ringbuffer;
@@ -1271,8 +1274,6 @@ static int i915_load_modeset_init(struct drm_device *dev,
 
         I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
 
-        intel_modeset_init(dev);
-
         drm_helper_initial_config(dev);
 
         return 0;
@@ -1360,7 +1361,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         resource_size_t base, size;
-        int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1;
+        int ret = 0, mmio_bar;
         uint32_t agp_size, prealloc_size, prealloc_start;
 
         /* i915 has 4 more counters */
@@ -1376,8 +1377,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 
         dev->dev_private = (void *)dev_priv;
         dev_priv->dev = dev;
+        dev_priv->info = (struct intel_device_info *) flags;
 
         /* Add register map (needed for suspend/resume) */
+        mmio_bar = IS_I9XX(dev) ? 0 : 1;
         base = drm_get_resource_start(dev, mmio_bar);
         size = drm_get_resource_len(dev, mmio_bar);
 
@@ -1652,6 +1655,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
         DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_I915_GEM_INIT, i915_gem_init_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_GEM_EXECBUFFER2, i915_gem_execbuffer2, DRM_AUTH),
         DRM_IOCTL_DEF(DRM_I915_GEM_PIN, i915_gem_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_I915_GEM_UNPIN, i915_gem_unpin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH),
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 24286ca168fc..46d88965852a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -33,7 +33,6 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-#include "drm_pciids.h"
 #include <linux/console.h>
 #include "drm_crtc_helper.h"
 
@@ -46,10 +45,129 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 unsigned int i915_powersave = 1;
 module_param_named(powersave, i915_powersave, int, 0400);
 
+unsigned int i915_lvds_downclock = 0;
+module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
+
 static struct drm_driver driver;
 
-static struct pci_device_id pciidlist[] = {
-        i915_PCI_IDS
+#define INTEL_VGA_DEVICE(id, info) {            \
+        .class = PCI_CLASS_DISPLAY_VGA << 8,    \
+        .class_mask = 0xffff00,                 \
+        .vendor = 0x8086,                       \
+        .device = id,                           \
+        .subvendor = PCI_ANY_ID,                \
+        .subdevice = PCI_ANY_ID,                \
+        .driver_data = (unsigned long) info }
+
+const static struct intel_device_info intel_i830_info = {
+        .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1,
+};
+
+const static struct intel_device_info intel_845g_info = {
+        .is_i8xx = 1,
+};
+
+const static struct intel_device_info intel_i85x_info = {
+        .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1,
+};
+
+const static struct intel_device_info intel_i865g_info = {
+        .is_i8xx = 1,
+};
+
+const static struct intel_device_info intel_i915g_info = {
+        .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,
+};
+const static struct intel_device_info intel_i915gm_info = {
+        .is_i9xx = 1,  .is_mobile = 1, .has_fbc = 1,
+        .cursor_needs_physical = 1,
+};
+const static struct intel_device_info intel_i945g_info = {
+        .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,
+};
+const static struct intel_device_info intel_i945gm_info = {
+        .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, .has_fbc = 1,
+        .has_hotplug = 1, .cursor_needs_physical = 1,
+};
+
+const static struct intel_device_info intel_i965g_info = {
+        .is_i965g = 1, .is_i9xx = 1, .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_i965gm_info = {
+        .is_i965g = 1, .is_mobile = 1, .is_i965gm = 1, .is_i9xx = 1,
+        .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_g33_info = {
+        .is_g33 = 1, .is_i9xx = 1, .need_gfx_hws = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_g45_info = {
+        .is_i965g = 1, .is_g4x = 1, .is_i9xx = 1, .need_gfx_hws = 1,
+        .has_pipe_cxsr = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_gm45_info = {
+        .is_i965g = 1, .is_mobile = 1, .is_g4x = 1, .is_i9xx = 1,
+        .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,
+        .has_pipe_cxsr = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_pineview_info = {
+        .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .is_i9xx = 1,
+        .has_pipe_cxsr = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_ironlake_d_info = {
+        .is_ironlake = 1, .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1,
+        .has_pipe_cxsr = 1,
+        .has_hotplug = 1,
+};
+
+const static struct intel_device_info intel_ironlake_m_info = {
+        .is_ironlake = 1, .is_mobile = 1, .is_i965g = 1, .is_i9xx = 1,
+        .need_gfx_hws = 1, .has_rc6 = 1,
+        .has_hotplug = 1,
+};
+
+const static struct pci_device_id pciidlist[] = {
+        INTEL_VGA_DEVICE(0x3577, &intel_i830_info),
+        INTEL_VGA_DEVICE(0x2562, &intel_845g_info),
+        INTEL_VGA_DEVICE(0x3582, &intel_i85x_info),
+        INTEL_VGA_DEVICE(0x35e8, &intel_i85x_info),
+        INTEL_VGA_DEVICE(0x2572, &intel_i865g_info),
+        INTEL_VGA_DEVICE(0x2582, &intel_i915g_info),
+        INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),
+        INTEL_VGA_DEVICE(0x2592, &intel_i915gm_info),
+        INTEL_VGA_DEVICE(0x2772, &intel_i945g_info),
+        INTEL_VGA_DEVICE(0x27a2, &intel_i945gm_info),
+        INTEL_VGA_DEVICE(0x27ae, &intel_i945gm_info),
+        INTEL_VGA_DEVICE(0x2972, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x2982, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x2992, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x29a2, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x29b2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x29c2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x29d2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x2a02, &intel_i965gm_info),
+        INTEL_VGA_DEVICE(0x2a12, &intel_i965gm_info),
+        INTEL_VGA_DEVICE(0x2a42, &intel_gm45_info),
+        INTEL_VGA_DEVICE(0x2e02, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e12, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e22, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e32, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e42, &intel_g45_info),
+        INTEL_VGA_DEVICE(0xa001, &intel_pineview_info),
+        INTEL_VGA_DEVICE(0xa011, &intel_pineview_info),
+        INTEL_VGA_DEVICE(0x0042, &intel_ironlake_d_info),
+        INTEL_VGA_DEVICE(0x0046, &intel_ironlake_m_info),
+        {0, 0, 0}
 };
 
 #if defined(CONFIG_DRM_I915_KMS)
@@ -284,6 +402,52 @@ i915_pci_resume(struct pci_dev *pdev)
         return i915_resume(dev);
 }
 
+static int
+i915_pm_suspend(struct device *dev)
+{
+        return i915_pci_suspend(to_pci_dev(dev), PMSG_SUSPEND);
+}
+
+static int
+i915_pm_resume(struct device *dev)
+{
+        return i915_pci_resume(to_pci_dev(dev));
+}
+
+static int
+i915_pm_freeze(struct device *dev)
+{
+        return i915_pci_suspend(to_pci_dev(dev), PMSG_FREEZE);
+}
+
+static int
+i915_pm_thaw(struct device *dev)
+{
+        /* thaw during hibernate, do nothing! */
+        return 0;
+}
+
+static int
+i915_pm_poweroff(struct device *dev)
+{
+        return i915_pci_suspend(to_pci_dev(dev), PMSG_HIBERNATE);
+}
+
+static int
+i915_pm_restore(struct device *dev)
+{
+        return i915_pci_resume(to_pci_dev(dev));
+}
+
+const struct dev_pm_ops i915_pm_ops = {
+     .suspend = i915_pm_suspend,
+     .resume = i915_pm_resume,
+     .freeze = i915_pm_freeze,
+     .thaw = i915_pm_thaw,
+     .poweroff = i915_pm_poweroff,
+     .restore = i915_pm_restore,
+};
+
 static struct vm_operations_struct i915_gem_vm_ops = {
         .fault = i915_gem_fault,
         .open = drm_gem_vm_open,
@@ -303,8 +467,11 @@ static struct drm_driver driver = {
         .lastclose = i915_driver_lastclose,
         .preclose = i915_driver_preclose,
         .postclose = i915_driver_postclose,
+
+        /* Used in place of i915_pm_ops for non-DRIVER_MODESET */
         .suspend = i915_suspend,
         .resume = i915_resume,
+
         .device_is_agp = i915_driver_device_is_agp,
         .enable_vblank = i915_enable_vblank,
         .disable_vblank = i915_disable_vblank,
@@ -344,10 +511,7 @@ static struct drm_driver driver = {
                  .id_table = pciidlist,
                  .probe = i915_pci_probe,
                  .remove = i915_pci_remove,
-#ifdef CONFIG_PM
-                 .resume = i915_pci_resume,
-                 .suspend = i915_pci_suspend,
-#endif
+                 .driver.pm = &i915_pm_ops,
         },
 
         .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fbecac72f5bb..aaf934d96f21 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -172,9 +172,31 @@ struct drm_i915_display_funcs {
 
 struct intel_overlay;
 
+struct intel_device_info {
+        u8 is_mobile : 1;
+        u8 is_i8xx : 1;
+        u8 is_i915g : 1;
+        u8 is_i9xx : 1;
+        u8 is_i945gm : 1;
+        u8 is_i965g : 1;
+        u8 is_i965gm : 1;
+        u8 is_g33 : 1;
+        u8 need_gfx_hws : 1;
+        u8 is_g4x : 1;
+        u8 is_pineview : 1;
+        u8 is_ironlake : 1;
+        u8 has_fbc : 1;
+        u8 has_rc6 : 1;
+        u8 has_pipe_cxsr : 1;
+        u8 has_hotplug : 1;
+        u8 cursor_needs_physical : 1;
+};
+
 typedef struct drm_i915_private {
         struct drm_device *dev;
 
+        const struct intel_device_info *info;
+
         int has_gem;
 
         void __iomem *regs;
@@ -232,8 +254,6 @@ typedef struct drm_i915_private {
         int hangcheck_count;
         uint32_t last_acthd;
 
-        bool cursor_needs_physical;
-
         struct drm_mm vram;
 
         unsigned long cfb_size;
@@ -263,6 +283,7 @@ typedef struct drm_i915_private {
         unsigned int lvds_use_ssc:1;
         unsigned int edp_support:1;
         int lvds_ssc_freq;
+        int edp_bpp;
 
         struct notifier_block lid_notifier;
 
@@ -287,8 +308,6 @@ typedef struct drm_i915_private {
         u32 saveDSPACNTR;
         u32 saveDSPBCNTR;
         u32 saveDSPARB;
-        u32 saveRENDERSTANDBY;
-        u32 savePWRCTXA;
         u32 saveHWS;
         u32 savePIPEACONF;
         u32 savePIPEBCONF;
@@ -561,6 +580,7 @@ typedef struct drm_i915_private {
         u16 orig_clock;
         int child_dev_num;
         struct child_device_config *child_dev;
+        struct drm_connector *int_lvds_connector;
 } drm_i915_private_t;
 
 /** driver private structure attached to each drm_gem_object */
@@ -703,6 +723,7 @@ extern struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc;
 extern unsigned int i915_powersave;
+extern unsigned int i915_lvds_downclock;
 
 extern void i915_save_display(struct drm_device *dev);
 extern void i915_restore_display(struct drm_device *dev);
@@ -794,6 +815,8 @@ int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *file_priv);
 int i915_gem_execbuffer(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
+int i915_gem_execbuffer2(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv);
 int i915_gem_pin_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 int i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
@@ -843,12 +866,13 @@ int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptib
 int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
                                       int write);
+int i915_gem_object_set_to_display_plane(struct drm_gem_object *obj);
 int i915_gem_attach_phys_object(struct drm_device *dev,
                                 struct drm_gem_object *obj, int id);
 void i915_gem_detach_phys_object(struct drm_device *dev,
                                  struct drm_gem_object *obj);
 void i915_gem_free_all_phys_object(struct drm_device *dev);
-int i915_gem_object_get_pages(struct drm_gem_object *obj);
+int i915_gem_object_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
 void i915_gem_object_put_pages(struct drm_gem_object *obj);
 void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);
 void i915_gem_object_flush_write_domain(struct drm_gem_object *obj);
@@ -860,6 +884,9 @@ void i915_gem_shrinker_exit(void);
 void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);
 void i915_gem_object_do_bit_17_swizzle(struct drm_gem_object *obj);
 void i915_gem_object_save_bit_17_swizzle(struct drm_gem_object *obj);
+bool i915_tiling_ok(struct drm_device *dev, int stride, int size,
+                    int tiling_mode);
+bool i915_obj_fenceable(struct drm_device *dev, struct drm_gem_object *obj);
 
 /* i915_gem_debug.c */
 void i915_gem_dump_object(struct drm_gem_object *obj, int len,
@@ -982,67 +1009,33 @@ extern void g4x_disable_fbc(struct drm_device *dev);
 extern int i915_wrap_ring(struct drm_device * dev);
 extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 
-#define IS_I830(dev) ((dev)->pci_device == 0x3577)
-#define IS_845G(dev) ((dev)->pci_device == 0x2562)
-#define IS_I85X(dev) ((dev)->pci_device == 0x3582)
-#define IS_I865G(dev) ((dev)->pci_device == 0x2572)
-#define IS_I8XX(dev) (IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) || IS_I865G(dev))
-
-#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
-#define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
-#define IS_I945G(dev) ((dev)->pci_device == 0x2772)
-#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\
-                        (dev)->pci_device == 0x27AE)
-#define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \
-                       (dev)->pci_device == 0x2982 || \
-                       (dev)->pci_device == 0x2992 || \
-                       (dev)->pci_device == 0x29A2 || \
-                       (dev)->pci_device == 0x2A02 || \
-                       (dev)->pci_device == 0x2A12 || \
-                       (dev)->pci_device == 0x2A42 || \
-                       (dev)->pci_device == 0x2E02 || \
-                       (dev)->pci_device == 0x2E12 || \
-                       (dev)->pci_device == 0x2E22 || \
-                       (dev)->pci_device == 0x2E32 || \
-                       (dev)->pci_device == 0x2E42 || \
-                       (dev)->pci_device == 0x0042 || \
-                       (dev)->pci_device == 0x0046)
-
-#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02 || \
-                        (dev)->pci_device == 0x2A12)
-
-#define IS_GM45(dev) ((dev)->pci_device == 0x2A42)
-
-#define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
-                     (dev)->pci_device == 0x2E12 || \
-                     (dev)->pci_device == 0x2E22 || \
-                     (dev)->pci_device == 0x2E32 || \
-                     (dev)->pci_device == 0x2E42 || \
-                     IS_GM45(dev))
-
-#define IS_PINEVIEW_G(dev) ((dev)->pci_device == 0xa001)
-#define IS_PINEVIEW_M(dev) ((dev)->pci_device == 0xa011)
-#define IS_PINEVIEW(dev) (IS_PINEVIEW_G(dev) || IS_PINEVIEW_M(dev))
-
-#define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||  \
-                        (dev)->pci_device == 0x29B2 ||  \
-                        (dev)->pci_device == 0x29D2 ||  \
-                        (IS_PINEVIEW(dev)))
-
+#define INTEL_INFO(dev) (((struct drm_i915_private *) (dev)->dev_private)->info)
+
+#define IS_I830(dev)            ((dev)->pci_device == 0x3577)
+#define IS_845G(dev)            ((dev)->pci_device == 0x2562)
+#define IS_I85X(dev)            ((dev)->pci_device == 0x3582)
+#define IS_I865G(dev)           ((dev)->pci_device == 0x2572)
+#define IS_I8XX(dev)            (INTEL_INFO(dev)->is_i8xx)
+#define IS_I915G(dev)           (INTEL_INFO(dev)->is_i915g)
+#define IS_I915GM(dev)          ((dev)->pci_device == 0x2592)
+#define IS_I945G(dev)           ((dev)->pci_device == 0x2772)
+#define IS_I945GM(dev)          (INTEL_INFO(dev)->is_i945gm)
+#define IS_I965G(dev)           (INTEL_INFO(dev)->is_i965g)
+#define IS_I965GM(dev)          (INTEL_INFO(dev)->is_i965gm)
+#define IS_GM45(dev)            ((dev)->pci_device == 0x2A42)
+#define IS_G4X(dev)             (INTEL_INFO(dev)->is_g4x)
+#define IS_PINEVIEW_G(dev)      ((dev)->pci_device == 0xa001)
+#define IS_PINEVIEW_M(dev)      ((dev)->pci_device == 0xa011)
+#define IS_PINEVIEW(dev)        (INTEL_INFO(dev)->is_pineview)
+#define IS_G33(dev)             (INTEL_INFO(dev)->is_g33)
 #define IS_IRONLAKE_D(dev)      ((dev)->pci_device == 0x0042)
 #define IS_IRONLAKE_M(dev)      ((dev)->pci_device == 0x0046)
-#define IS_IRONLAKE(dev)        (IS_IRONLAKE_D(dev) || IS_IRONLAKE_M(dev))
-
-#define IS_I9XX(dev) (IS_I915G(dev) || IS_I915GM(dev) || IS_I945G(dev) || \
-                      IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev) || \
-                      IS_IRONLAKE(dev))
+#define IS_IRONLAKE(dev)        (INTEL_INFO(dev)->is_ironlake)
+#define IS_I9XX(dev)            (INTEL_INFO(dev)->is_i9xx)
+#define IS_MOBILE(dev)          (INTEL_INFO(dev)->is_mobile)
 
-#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
-                        IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev) || \
-                        IS_PINEVIEW(dev) || IS_IRONLAKE_M(dev))
+#define I915_NEED_GFX_HWS(dev)  (INTEL_INFO(dev)->need_gfx_hws)
 
-#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev) || \
-                                IS_IRONLAKE(dev))
 /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte
  * rows, which changed the alignment requirements and fence programming.
  */
@@ -1054,17 +1047,14 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define SUPPORTS_EDP(dev)               (IS_IRONLAKE_M(dev))
 #define SUPPORTS_TV(dev)                (IS_I9XX(dev) && IS_MOBILE(dev) && \
                                         !IS_IRONLAKE(dev) && !IS_PINEVIEW(dev))
-#define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev) || IS_I965G(dev))
+#define I915_HAS_HOTPLUG(dev)            (INTEL_INFO(dev)->has_hotplug)
 /* dsparb controlled by hw only */
 #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IRONLAKE(dev))
 
 #define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IRONLAKE(dev))
-#define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IRONLAKE(dev))
-#define I915_HAS_FBC(dev) (IS_MOBILE(dev) && \
-                           (IS_I9XX(dev) || IS_GM45(dev)) && \
-                           !IS_PINEVIEW(dev) && \
-                           !IS_IRONLAKE(dev))
-#define I915_HAS_RC6(dev) (IS_I965GM(dev) || IS_GM45(dev) || IS_IRONLAKE_M(dev))
+#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr)
+#define I915_HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc)
+#define I915_HAS_RC6(dev) (INTEL_INFO(dev)->has_rc6)
 
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8c463cf2050a..dda787aafcc6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -277,7 +277,7 @@ i915_gem_shmem_pread_fast(struct drm_device *dev, struct drm_gem_object *obj,
 
         mutex_lock(&dev->struct_mutex);
 
-        ret = i915_gem_object_get_pages(obj);
+        ret = i915_gem_object_get_pages(obj, 0);
         if (ret != 0)
                 goto fail_unlock;
 
@@ -321,40 +321,24 @@ fail_unlock:
         return ret;
 }
 
-static inline gfp_t
-i915_gem_object_get_page_gfp_mask (struct drm_gem_object *obj)
-{
-        return mapping_gfp_mask(obj->filp->f_path.dentry->d_inode->i_mapping);
-}
-
-static inline void
-i915_gem_object_set_page_gfp_mask (struct drm_gem_object *obj, gfp_t gfp)
-{
-        mapping_set_gfp_mask(obj->filp->f_path.dentry->d_inode->i_mapping, gfp);
-}
-
 static int
 i915_gem_object_get_pages_or_evict(struct drm_gem_object *obj)
 {
         int ret;
 
-        ret = i915_gem_object_get_pages(obj);
+        ret = i915_gem_object_get_pages(obj, __GFP_NORETRY | __GFP_NOWARN);
 
         /* If we've insufficient memory to map in the pages, attempt
          * to make some space by throwing out some old buffers.
          */
         if (ret == -ENOMEM) {
                 struct drm_device *dev = obj->dev;
-                gfp_t gfp;
 
                 ret = i915_gem_evict_something(dev, obj->size);
                 if (ret)
                         return ret;
 
-                gfp = i915_gem_object_get_page_gfp_mask(obj);
-                i915_gem_object_set_page_gfp_mask(obj, gfp & ~__GFP_NORETRY);
-                ret = i915_gem_object_get_pages(obj);
-                i915_gem_object_set_page_gfp_mask (obj, gfp);
+                ret = i915_gem_object_get_pages(obj, 0);
         }
 
         return ret;
@@ -790,7 +774,7 @@ i915_gem_shmem_pwrite_fast(struct drm_device *dev, struct drm_gem_object *obj,
 
         mutex_lock(&dev->struct_mutex);
 
-        ret = i915_gem_object_get_pages(obj);
+        ret = i915_gem_object_get_pages(obj, 0);
         if (ret != 0)
                 goto fail_unlock;
 
@@ -2021,9 +2005,6 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
         /* blow away mappings if mapped through GTT */
         i915_gem_release_mmap(obj);
 
-        if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
-                i915_gem_clear_fence_reg(obj);
-
         /* Move the object to the CPU domain to ensure that
          * any possible CPU writes while it's not in the GTT
          * are flushed when we go to remap it. This will
@@ -2039,6 +2020,10 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
 
         BUG_ON(obj_priv->active);
 
+        /* release the fence reg _after_ flushing */
+        if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
+                i915_gem_clear_fence_reg(obj);
+
         if (obj_priv->agp_mem != NULL) {
                 drm_unbind_agp(obj_priv->agp_mem);
                 drm_free_agp(obj_priv->agp_mem, obj->size / PAGE_SIZE);
@@ -2229,7 +2214,8 @@ i915_gem_evict_something(struct drm_device *dev, int min_size)
 }
 
 int
-i915_gem_object_get_pages(struct drm_gem_object *obj)
+i915_gem_object_get_pages(struct drm_gem_object *obj,
+                          gfp_t gfpmask)
 {
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         int page_count, i;
@@ -2255,7 +2241,10 @@ i915_gem_object_get_pages(struct drm_gem_object *obj)
         inode = obj->filp->f_path.dentry->d_inode;
         mapping = inode->i_mapping;
         for (i = 0; i < page_count; i++) {
-                page = read_mapping_page(mapping, i, NULL);
+                page = read_cache_page_gfp(mapping, i,
+                                           mapping_gfp_mask (mapping) |
+                                           __GFP_COLD |
+                                           gfpmask);
                 if (IS_ERR(page)) {
                         ret = PTR_ERR(page);
                         i915_gem_object_put_pages(obj);
@@ -2578,12 +2567,9 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         struct drm_mm_node *free_space;
-        bool retry_alloc = false;
+        gfp_t gfpmask =  __GFP_NORETRY | __GFP_NOWARN;
         int ret;
 
-        if (dev_priv->mm.suspended)
-                return -EBUSY;
-
         if (obj_priv->madv != I915_MADV_WILLNEED) {
                 DRM_ERROR("Attempting to bind a purgeable object\n");
                 return -EINVAL;
@@ -2625,15 +2611,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
         DRM_INFO("Binding object of size %zd at 0x%08x\n",
                  obj->size, obj_priv->gtt_offset);
 #endif
-        if (retry_alloc) {
-                i915_gem_object_set_page_gfp_mask (obj,
-                                                   i915_gem_object_get_page_gfp_mask (obj) & ~__GFP_NORETRY);
-        }
-        ret = i915_gem_object_get_pages(obj);
-        if (retry_alloc) {
-                i915_gem_object_set_page_gfp_mask (obj,
-                                                   i915_gem_object_get_page_gfp_mask (obj) | __GFP_NORETRY);
-        }
+        ret = i915_gem_object_get_pages(obj, gfpmask);
         if (ret) {
                 drm_mm_put_block(obj_priv->gtt_space);
                 obj_priv->gtt_space = NULL;
@@ -2643,9 +2621,9 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
                         ret = i915_gem_evict_something(dev, obj->size);
                         if (ret) {
                                 /* now try to shrink everyone else */
-                                if (! retry_alloc) {
-                                    retry_alloc = true;
-                                    goto search_free;
+                                if (gfpmask) {
+                                        gfpmask = 0;
+                                        goto search_free;
                                 }
 
                                 return ret;
@@ -2839,6 +2817,57 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
         return 0;
 }
 
+/*
+ * Prepare buffer for display plane. Use uninterruptible for possible flush
+ * wait, as in modesetting process we're not supposed to be interrupted.
+ */
+int
+i915_gem_object_set_to_display_plane(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct drm_i915_gem_object *obj_priv = obj->driver_private;
+        uint32_t old_write_domain, old_read_domains;
+        int ret;
+
+        /* Not valid to be called on unbound objects. */
+        if (obj_priv->gtt_space == NULL)
+                return -EINVAL;
+
+        i915_gem_object_flush_gpu_write_domain(obj);
+
+        /* Wait on any GPU rendering and flushing to occur. */
+        if (obj_priv->active) {
+#if WATCH_BUF
+                DRM_INFO("%s: object %p wait for seqno %08x\n",
+                          __func__, obj, obj_priv->last_rendering_seqno);
+#endif
+                ret = i915_do_wait_request(dev, obj_priv->last_rendering_seqno, 0);
+                if (ret != 0)
+                        return ret;
+        }
+
+        old_write_domain = obj->write_domain;
+        old_read_domains = obj->read_domains;
+
+        obj->read_domains &= I915_GEM_DOMAIN_GTT;
+
+        i915_gem_object_flush_cpu_write_domain(obj);
+
+        /* It should now be out of any other write domains, and we can update
+         * the domain values for our changes.
+         */
+        BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0);
+        obj->read_domains |= I915_GEM_DOMAIN_GTT;
+        obj->write_domain = I915_GEM_DOMAIN_GTT;
+        obj_priv->dirty = 1;
+
+        trace_i915_gem_object_change_domain(obj,
+                                            old_read_domains,
+                                            old_write_domain);
+
+        return 0;
+}
+
 /**
  * Moves a single object to the CPU read, and possibly write domain.
  *
@@ -3198,7 +3227,7 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
 static int
 i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                                  struct drm_file *file_priv,
-                                 struct drm_i915_gem_exec_object *entry,
+                                 struct drm_i915_gem_exec_object2 *entry,
                                  struct drm_i915_gem_relocation_entry *relocs)
 {
         struct drm_device *dev = obj->dev;
@@ -3206,12 +3235,35 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         int i, ret;
         void __iomem *reloc_page;
+        bool need_fence;
+
+        need_fence = entry->flags & EXEC_OBJECT_NEEDS_FENCE &&
+                     obj_priv->tiling_mode != I915_TILING_NONE;
+
+        /* Check fence reg constraints and rebind if necessary */
+        if (need_fence && !i915_obj_fenceable(dev, obj))
+                i915_gem_object_unbind(obj);
 
         /* Choose the GTT offset for our buffer and put it there. */
         ret = i915_gem_object_pin(obj, (uint32_t) entry->alignment);
         if (ret)
                 return ret;
 
+        /*
+         * Pre-965 chips need a fence register set up in order to
+         * properly handle blits to/from tiled surfaces.
+         */
+        if (need_fence) {
+                ret = i915_gem_object_get_fence_reg(obj);
+                if (ret != 0) {
+                        if (ret != -EBUSY && ret != -ERESTARTSYS)
+                                DRM_ERROR("Failure to install fence: %d\n",
+                                          ret);
+                        i915_gem_object_unpin(obj);
+                        return ret;
+                }
+        }
+
         entry->offset = obj_priv->gtt_offset;
 
         /* Apply the relocations, using the GTT aperture to avoid cache
@@ -3373,7 +3425,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
  */
 static int
 i915_dispatch_gem_execbuffer(struct drm_device *dev,
-                              struct drm_i915_gem_execbuffer *exec,
+                              struct drm_i915_gem_execbuffer2 *exec,
                               struct drm_clip_rect *cliprects,
                               uint64_t exec_offset)
 {
@@ -3463,7 +3515,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv)
 }
 
 static int
-i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object *exec_list,
+i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object2 *exec_list,
                               uint32_t buffer_count,
                               struct drm_i915_gem_relocation_entry **relocs)
 {
@@ -3478,8 +3530,10 @@ i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object *exec_list,
         }
 
         *relocs = drm_calloc_large(reloc_count, sizeof(**relocs));
-        if (*relocs == NULL)
+        if (*relocs == NULL) {
+                DRM_ERROR("failed to alloc relocs, count %d\n", reloc_count);
                 return -ENOMEM;
+        }
 
         for (i = 0; i < buffer_count; i++) {
                 struct drm_i915_gem_relocation_entry __user *user_relocs;
@@ -3503,7 +3557,7 @@ i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object *exec_list,
 }
 
 static int
-i915_gem_put_relocs_to_user(struct drm_i915_gem_exec_object *exec_list,
+i915_gem_put_relocs_to_user(struct drm_i915_gem_exec_object2 *exec_list,
                             uint32_t buffer_count,
                             struct drm_i915_gem_relocation_entry *relocs)
 {
@@ -3536,7 +3590,7 @@ err:
 }
 
 static int
-i915_gem_check_execbuffer (struct drm_i915_gem_execbuffer *exec,
+i915_gem_check_execbuffer (struct drm_i915_gem_execbuffer2 *exec,
                            uint64_t exec_offset)
 {
         uint32_t exec_start, exec_len;
@@ -3589,18 +3643,18 @@ i915_gem_wait_for_pending_flip(struct drm_device *dev,
 }
 
 int
-i915_gem_execbuffer(struct drm_device *dev, void *data,
-                    struct drm_file *file_priv)
+i915_gem_do_execbuffer(struct drm_device *dev, void *data,
+                       struct drm_file *file_priv,
+                       struct drm_i915_gem_execbuffer2 *args,
+                       struct drm_i915_gem_exec_object2 *exec_list)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        struct drm_i915_gem_execbuffer *args = data;
-        struct drm_i915_gem_exec_object *exec_list = NULL;
         struct drm_gem_object **object_list = NULL;
         struct drm_gem_object *batch_obj;
         struct drm_i915_gem_object *obj_priv;
         struct drm_clip_rect *cliprects = NULL;
         struct drm_i915_gem_relocation_entry *relocs;
-        int ret, ret2, i, pinned = 0;
+        int ret = 0, ret2, i, pinned = 0;
         uint64_t exec_offset;
         uint32_t seqno, flush_domains, reloc_index;
         int pin_tries, flips;
@@ -3614,25 +3668,13 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                 DRM_ERROR("execbuf with %d buffers\n", args->buffer_count);
                 return -EINVAL;
         }
-        /* Copy in the exec list from userland */
-        exec_list = drm_malloc_ab(sizeof(*exec_list), args->buffer_count);
         object_list = drm_malloc_ab(sizeof(*object_list), args->buffer_count);
-        if (exec_list == NULL || object_list == NULL) {
-                DRM_ERROR("Failed to allocate exec or object list "
-                          "for %d buffers\n",
+        if (object_list == NULL) {
+                DRM_ERROR("Failed to allocate object list for %d buffers\n",
                           args->buffer_count);
                 ret = -ENOMEM;
                 goto pre_mutex_err;
         }
-        ret = copy_from_user(exec_list,
-                             (struct drm_i915_relocation_entry __user *)
-                             (uintptr_t) args->buffers_ptr,
-                             sizeof(*exec_list) * args->buffer_count);
-        if (ret != 0) {
-                DRM_ERROR("copy %d exec entries failed %d\n",
-                          args->buffer_count, ret);
-                goto pre_mutex_err;
-        }
 
         if (args->num_cliprects != 0) {
                 cliprects = kcalloc(args->num_cliprects, sizeof(*cliprects),
@@ -3884,20 +3926,6 @@ err:
 
         mutex_unlock(&dev->struct_mutex);
 
-        if (!ret) {
-                /* Copy the new buffer offsets back to the user's exec list. */
-                ret = copy_to_user((struct drm_i915_relocation_entry __user *)
-                                   (uintptr_t) args->buffers_ptr,
-                                   exec_list,
-                                   sizeof(*exec_list) * args->buffer_count);
-                if (ret) {
-                        ret = -EFAULT;
-                        DRM_ERROR("failed to copy %d exec entries "
-                                  "back to user (%d)\n",
-                                  args->buffer_count, ret);
-                }
-        }
-
         /* Copy the updated relocations out regardless of current error
          * state.  Failure to update the relocs would mean that the next
          * time userland calls execbuf, it would do so with presumed offset
@@ -3914,12 +3942,156 @@ err:
 
 pre_mutex_err:
         drm_free_large(object_list);
-        drm_free_large(exec_list);
         kfree(cliprects);
 
         return ret;
 }
 
+/*
+ * Legacy execbuffer just creates an exec2 list from the original exec object
+ * list array and passes it to the real function.
+ */
+int
+i915_gem_execbuffer(struct drm_device *dev, void *data,
+                    struct drm_file *file_priv)
+{
+        struct drm_i915_gem_execbuffer *args = data;
+        struct drm_i915_gem_execbuffer2 exec2;
+        struct drm_i915_gem_exec_object *exec_list = NULL;
+        struct drm_i915_gem_exec_object2 *exec2_list = NULL;
+        int ret, i;
+
+#if WATCH_EXEC
+        DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",
+                  (int) args->buffers_ptr, args->buffer_count, args->batch_len);
+#endif
+
+        if (args->buffer_count < 1) {
+                DRM_ERROR("execbuf with %d buffers\n", args->buffer_count);
+                return -EINVAL;
+        }
+
+        /* Copy in the exec list from userland */
+        exec_list = drm_malloc_ab(sizeof(*exec_list), args->buffer_count);
+        exec2_list = drm_malloc_ab(sizeof(*exec2_list), args->buffer_count);
+        if (exec_list == NULL || exec2_list == NULL) {
+                DRM_ERROR("Failed to allocate exec list for %d buffers\n",
+                          args->buffer_count);
+                drm_free_large(exec_list);
+                drm_free_large(exec2_list);
+                return -ENOMEM;
+        }
+        ret = copy_from_user(exec_list,
+                             (struct drm_i915_relocation_entry __user *)
+                             (uintptr_t) args->buffers_ptr,
+                             sizeof(*exec_list) * args->buffer_count);
+        if (ret != 0) {
+                DRM_ERROR("copy %d exec entries failed %d\n",
+                          args->buffer_count, ret);
+                drm_free_large(exec_list);
+                drm_free_large(exec2_list);
+                return -EFAULT;
+        }
+
+        for (i = 0; i < args->buffer_count; i++) {
+                exec2_list[i].handle = exec_list[i].handle;
+                exec2_list[i].relocation_count = exec_list[i].relocation_count;
+                exec2_list[i].relocs_ptr = exec_list[i].relocs_ptr;
+                exec2_list[i].alignment = exec_list[i].alignment;
+                exec2_list[i].offset = exec_list[i].offset;
+                if (!IS_I965G(dev))
+                        exec2_list[i].flags = EXEC_OBJECT_NEEDS_FENCE;
+                else
+                        exec2_list[i].flags = 0;
+        }
+
+        exec2.buffers_ptr = args->buffers_ptr;
+        exec2.buffer_count = args->buffer_count;
+        exec2.batch_start_offset = args->batch_start_offset;
+        exec2.batch_len = args->batch_len;
+        exec2.DR1 = args->DR1;
+        exec2.DR4 = args->DR4;
+        exec2.num_cliprects = args->num_cliprects;
+        exec2.cliprects_ptr = args->cliprects_ptr;
+        exec2.flags = 0;
+
+        ret = i915_gem_do_execbuffer(dev, data, file_priv, &exec2, exec2_list);
+        if (!ret) {
+                /* Copy the new buffer offsets back to the user's exec list. */
+                for (i = 0; i < args->buffer_count; i++)
+                        exec_list[i].offset = exec2_list[i].offset;
+                /* ... and back out to userspace */
+                ret = copy_to_user((struct drm_i915_relocation_entry __user *)
+                                   (uintptr_t) args->buffers_ptr,
+                                   exec_list,
+                                   sizeof(*exec_list) * args->buffer_count);
+                if (ret) {
+                        ret = -EFAULT;
+                        DRM_ERROR("failed to copy %d exec entries "
+                                  "back to user (%d)\n",
+                                  args->buffer_count, ret);
+                }
+        }
+
+        drm_free_large(exec_list);
+        drm_free_large(exec2_list);
+        return ret;
+}
+
+int
+i915_gem_execbuffer2(struct drm_device *dev, void *data,
+                     struct drm_file *file_priv)
+{
+        struct drm_i915_gem_execbuffer2 *args = data;
+        struct drm_i915_gem_exec_object2 *exec2_list = NULL;
+        int ret;
+
+#if WATCH_EXEC
+        DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",
+                  (int) args->buffers_ptr, args->buffer_count, args->batch_len);
+#endif
+
+        if (args->buffer_count < 1) {
+                DRM_ERROR("execbuf2 with %d buffers\n", args->buffer_count);
+                return -EINVAL;
+        }
+
+        exec2_list = drm_malloc_ab(sizeof(*exec2_list), args->buffer_count);
+        if (exec2_list == NULL) {
+                DRM_ERROR("Failed to allocate exec list for %d buffers\n",
+                          args->buffer_count);
+                return -ENOMEM;
+        }
+        ret = copy_from_user(exec2_list,
+                             (struct drm_i915_relocation_entry __user *)
+                             (uintptr_t) args->buffers_ptr,
+                             sizeof(*exec2_list) * args->buffer_count);
+        if (ret != 0) {
+                DRM_ERROR("copy %d exec entries failed %d\n",
+                          args->buffer_count, ret);
+                drm_free_large(exec2_list);
+                return -EFAULT;
+        }
+
+        ret = i915_gem_do_execbuffer(dev, data, file_priv, args, exec2_list);
+        if (!ret) {
+                /* Copy the new buffer offsets back to the user's exec list. */
+                ret = copy_to_user((struct drm_i915_relocation_entry __user *)
+                                   (uintptr_t) args->buffers_ptr,
+                                   exec2_list,
+                                   sizeof(*exec2_list) * args->buffer_count);
+                if (ret) {
+                        ret = -EFAULT;
+                        DRM_ERROR("failed to copy %d exec entries "
+                                  "back to user (%d)\n",
+                                  args->buffer_count, ret);
+                }
+        }
+
+        drm_free_large(exec2_list);
+        return ret;
+}
+
 int
 i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
 {
@@ -3933,19 +4105,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
                 if (ret)
                         return ret;
         }
-        /*
-         * Pre-965 chips need a fence register set up in order to
-         * properly handle tiled surfaces.
-         */
-        if (!IS_I965G(dev) && obj_priv->tiling_mode != I915_TILING_NONE) {
-                ret = i915_gem_object_get_fence_reg(obj);
-                if (ret != 0) {
-                        if (ret != -EBUSY && ret != -ERESTARTSYS)
-                                DRM_ERROR("Failure to install fence: %d\n",
-                                          ret);
-                        return ret;
-                }
-        }
+
         obj_priv->pin_count++;
 
         /* If the object is not active and not pending a flush,
@@ -4708,7 +4868,7 @@ int i915_gem_init_phys_object(struct drm_device *dev,
 
         phys_obj->id = id;
 
-        phys_obj->handle = drm_pci_alloc(dev, size, 0, 0xffffffff);
+        phys_obj->handle = drm_pci_alloc(dev, size, 0);
         if (!phys_obj->handle) {
                 ret = -ENOMEM;
                 goto kfree_obj;
@@ -4766,7 +4926,7 @@ void i915_gem_detach_phys_object(struct drm_device *dev,
         if (!obj_priv->phys_obj)
                 return;
 
-        ret = i915_gem_object_get_pages(obj);
+        ret = i915_gem_object_get_pages(obj, 0);
         if (ret)
                 goto out;
 
@@ -4824,7 +4984,7 @@ i915_gem_attach_phys_object(struct drm_device *dev,
         obj_priv->phys_obj = dev_priv->mm.phys_objs[id - 1];
         obj_priv->phys_obj->cur_obj = obj;
 
-        ret = i915_gem_object_get_pages(obj);
+        ret = i915_gem_object_get_pages(obj, 0);
         if (ret) {
                 DRM_ERROR("failed to get page list\n");
                 goto out;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 30d6af6c09bb..df278b2685bf 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -304,35 +304,39 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 
 
 /**
- * Returns the size of the fence for a tiled object of the given size.
+ * Returns whether an object is currently fenceable.  If not, it may need
+ * to be unbound and have its pitch adjusted.
  */
-static int
-i915_get_fence_size(struct drm_device *dev, int size)
+bool
+i915_obj_fenceable(struct drm_device *dev, struct drm_gem_object *obj)
 {
-        int i;
-        int start;
+        struct drm_i915_gem_object *obj_priv = obj->driver_private;
 
         if (IS_I965G(dev)) {
                 /* The 965 can have fences at any page boundary. */
-                return ALIGN(size, 4096);
+                if (obj->size & 4095)
+                        return false;
+                return true;
+        } else if (IS_I9XX(dev)) {
+                if (obj_priv->gtt_offset & ~I915_FENCE_START_MASK)
+                        return false;
         } else {
-                /* Align the size to a power of two greater than the smallest
-                 * fence size.
-                 */
-                if (IS_I9XX(dev))
-                        start = 1024 * 1024;
-                else
-                        start = 512 * 1024;
+                if (obj_priv->gtt_offset & ~I830_FENCE_START_MASK)
+                        return false;
+        }
 
-                for (i = start; i < size; i <<= 1)
-                        ;
+        /* Power of two sized... */
+        if (obj->size & (obj->size - 1))
+                return false;
 
-                return i;
-        }
+        /* Objects must be size aligned as well */
+        if (obj_priv->gtt_offset & (obj->size - 1))
+                return false;
+        return true;
 }
 
 /* Check pitch constriants for all chips & tiling formats */
-static bool
+bool
 i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
 {
         int tile_width;
@@ -384,12 +388,6 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
         if (stride & (stride - 1))
                 return false;
 
-        /* We don't 0handle the aperture area covered by the fence being bigger
-         * than the object size.
-         */
-        if (i915_get_fence_size(dev, size) != size)
-                return false;
-
         return true;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 85f4c5de97e2..89a071a3e6fb 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -274,7 +274,6 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         int ret = IRQ_NONE;
         u32 de_iir, gt_iir, de_ier, pch_iir;
-        u32 new_de_iir, new_gt_iir, new_pch_iir;
         struct drm_i915_master_private *master_priv;
 
         /* disable master interrupt before clearing iir  */
@@ -286,49 +285,42 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)
         gt_iir = I915_READ(GTIIR);
         pch_iir = I915_READ(SDEIIR);
 
-        for (;;) {
-                if (de_iir == 0 && gt_iir == 0 && pch_iir == 0)
-                        break;
-
-                ret = IRQ_HANDLED;
+        if (de_iir == 0 && gt_iir == 0 && pch_iir == 0)
+                goto done;
 
-                /* should clear PCH hotplug event before clear CPU irq */
-                I915_WRITE(SDEIIR, pch_iir);
-                new_pch_iir = I915_READ(SDEIIR);
-
-                I915_WRITE(DEIIR, de_iir);
-                new_de_iir = I915_READ(DEIIR);
-                I915_WRITE(GTIIR, gt_iir);
-                new_gt_iir = I915_READ(GTIIR);
-
-                if (dev->primary->master) {
-                        master_priv = dev->primary->master->driver_priv;
-                        if (master_priv->sarea_priv)
-                                master_priv->sarea_priv->last_dispatch =
-                                        READ_BREADCRUMB(dev_priv);
-                }
+        ret = IRQ_HANDLED;
 
-                if (gt_iir & GT_USER_INTERRUPT) {
-                        u32 seqno = i915_get_gem_seqno(dev);
-                        dev_priv->mm.irq_gem_seqno = seqno;
-                        trace_i915_gem_request_complete(dev, seqno);
-                        DRM_WAKEUP(&dev_priv->irq_queue);
-                }
+        if (dev->primary->master) {
+                master_priv = dev->primary->master->driver_priv;
+                if (master_priv->sarea_priv)
+                        master_priv->sarea_priv->last_dispatch =
+                                READ_BREADCRUMB(dev_priv);
+        }
 
-                if (de_iir & DE_GSE)
-                        ironlake_opregion_gse_intr(dev);
+        if (gt_iir & GT_USER_INTERRUPT) {
+                u32 seqno = i915_get_gem_seqno(dev);
+                dev_priv->mm.irq_gem_seqno = seqno;
+                trace_i915_gem_request_complete(dev, seqno);
+                DRM_WAKEUP(&dev_priv->irq_queue);
+                dev_priv->hangcheck_count = 0;
+                mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD);
+        }
 
-                /* check event from PCH */
-                if ((de_iir & DE_PCH_EVENT) &&
-                        (pch_iir & SDE_HOTPLUG_MASK)) {
-                        queue_work(dev_priv->wq, &dev_priv->hotplug_work);
-                }
+        if (de_iir & DE_GSE)
+                ironlake_opregion_gse_intr(dev);
 
-                de_iir = new_de_iir;
-                gt_iir = new_gt_iir;
-                pch_iir = new_pch_iir;
+        /* check event from PCH */
+        if ((de_iir & DE_PCH_EVENT) &&
+            (pch_iir & SDE_HOTPLUG_MASK)) {
+                queue_work(dev_priv->wq, &dev_priv->hotplug_work);
         }
 
+        /* should clear PCH hotplug event before clear CPU irq */
+        I915_WRITE(SDEIIR, pch_iir);
+        I915_WRITE(GTIIR, gt_iir);
+        I915_WRITE(DEIIR, de_iir);
+
+done:
         I915_WRITE(DEIER, de_ier);
         (void)I915_READ(DEIER);
 
@@ -1084,6 +1076,10 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
         (void) I915_READ(IER);
 }
 
+/*
+ * Must be called after intel_modeset_init or hotplug interrupts won't be
+ * enabled correctly.
+ */
 int i915_driver_irq_postinstall(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -1106,19 +1102,23 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
         if (I915_HAS_HOTPLUG(dev)) {
                 u32 hotplug_en = I915_READ(PORT_HOTPLUG_EN);
 
-                /* Leave other bits alone */
-                hotplug_en |= HOTPLUG_EN_MASK;
+                /* Note HDMI and DP share bits */
+                if (dev_priv->hotplug_supported_mask & HDMIB_HOTPLUG_INT_STATUS)
+                        hotplug_en |= HDMIB_HOTPLUG_INT_EN;
+                if (dev_priv->hotplug_supported_mask & HDMIC_HOTPLUG_INT_STATUS)
+                        hotplug_en |= HDMIC_HOTPLUG_INT_EN;
+                if (dev_priv->hotplug_supported_mask & HDMID_HOTPLUG_INT_STATUS)
+                        hotplug_en |= HDMID_HOTPLUG_INT_EN;
+                if (dev_priv->hotplug_supported_mask & SDVOC_HOTPLUG_INT_STATUS)
+                        hotplug_en |= SDVOC_HOTPLUG_INT_EN;
+                if (dev_priv->hotplug_supported_mask & SDVOB_HOTPLUG_INT_STATUS)
+                        hotplug_en |= SDVOB_HOTPLUG_INT_EN;
+                if (dev_priv->hotplug_supported_mask & CRT_HOTPLUG_INT_STATUS)
+                        hotplug_en |= CRT_HOTPLUG_INT_EN;
+                /* Ignore TV since it's buggy */
+
                 I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);
 
-                dev_priv->hotplug_supported_mask = CRT_HOTPLUG_INT_STATUS |
-                        TV_HOTPLUG_INT_STATUS | SDVOC_HOTPLUG_INT_STATUS |
-                        SDVOB_HOTPLUG_INT_STATUS;
-                if (IS_G4X(dev)) {
-                        dev_priv->hotplug_supported_mask |=
-                                HDMIB_HOTPLUG_INT_STATUS |
-                                HDMIC_HOTPLUG_INT_STATUS |
-                                HDMID_HOTPLUG_INT_STATUS;
-                }
                 /* Enable in IER... */
                 enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
                 /* and unmask in IMR */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 974b3cf70618..847006c5218e 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -879,13 +879,6 @@
 #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV        (1 << 2)
 #define CRT_HOTPLUG_MASK                        (0x3fc) /* Bits 9-2 */
 #define CRT_FORCE_HOTPLUG_MASK                  0xfffffe1f
-#define HOTPLUG_EN_MASK (HDMIB_HOTPLUG_INT_EN | \
-                         HDMIC_HOTPLUG_INT_EN |   \
-                         HDMID_HOTPLUG_INT_EN |   \
-                         SDVOB_HOTPLUG_INT_EN |   \
-                         SDVOC_HOTPLUG_INT_EN |   \
-                         CRT_HOTPLUG_INT_EN)
-
 
 #define PORT_HOTPLUG_STAT       0x61114
 #define   HDMIB_HOTPLUG_INT_STATUS              (1 << 29)
@@ -982,6 +975,8 @@
 #define   LVDS_PORT_EN                  (1 << 31)
 /* Selects pipe B for LVDS data.  Must be set on pre-965. */
 #define   LVDS_PIPEB_SELECT             (1 << 30)
+/* LVDS dithering flag on 965/g4x platform */
+#define   LVDS_ENABLE_DITHER            (1 << 25)
 /* Enable border for unscaled (or aspect-scaled) display */
 #define   LVDS_BORDER_ENABLE            (1 << 15)
 /*
@@ -1751,6 +1746,8 @@
 
 /* Display & cursor control */
 
+/* dithering flag on Ironlake */
+#define PIPE_ENABLE_DITHER      (1 << 4)
 /* Pipe A */
 #define PIPEADSL                0x70000
 #define PIPEACONF               0x70008
@@ -1818,7 +1815,7 @@
 #define   DSPFW_PLANEB_SHIFT    8
 #define DSPFW2                  0x70038
 #define   DSPFW_CURSORA_MASK    0x00003f00
-#define   DSPFW_CURSORA_SHIFT   16
+#define   DSPFW_CURSORA_SHIFT   8
 #define DSPFW3                  0x7003c
 #define   DSPFW_HPLL_SR_EN      (1<<31)
 #define   DSPFW_CURSOR_SR_SHIFT 24
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index d5ebb00a9d49..a3b90c9561dc 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -732,12 +732,6 @@ int i915_save_state(struct drm_device *dev)
 
         pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
 
-        /* Render Standby */
-        if (I915_HAS_RC6(dev)) {
-                dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY);
-                dev_priv->savePWRCTXA = I915_READ(PWRCTXA);
-        }
-
         /* Hardware status page */
         dev_priv->saveHWS = I915_READ(HWS_PGA);
 
@@ -793,12 +787,6 @@ int i915_restore_state(struct drm_device *dev)
 
         pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
 
-        /* Render Standby */
-        if (I915_HAS_RC6(dev)) {
-                I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY);
-                I915_WRITE(PWRCTXA, dev_priv->savePWRCTXA);
-        }
-
         /* Hardware status page */
         I915_WRITE(HWS_PGA, dev_priv->saveHWS);
 
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index f27567747580..15fbc1b5a83e 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -33,6 +33,8 @@
 #define SLAVE_ADDR1     0x70
 #define SLAVE_ADDR2     0x72
 
+static int panel_type;
+
 static void *
 find_section(struct bdb_header *bdb, int section_id)
 {
@@ -128,6 +130,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
         dev_priv->lvds_dither = lvds_options->pixel_dither;
         if (lvds_options->panel_type == 0xff)
                 return;
+        panel_type = lvds_options->panel_type;
 
         lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);
         if (!lvds_lfp_data)
@@ -197,7 +200,8 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
                 memset(temp_mode, 0, sizeof(*temp_mode));
         }
         kfree(temp_mode);
-        if (temp_downclock < panel_fixed_mode->clock) {
+        if (temp_downclock < panel_fixed_mode->clock &&
+            i915_lvds_downclock) {
                 dev_priv->lvds_downclock_avail = 1;
                 dev_priv->lvds_downclock = temp_downclock;
                 DRM_DEBUG_KMS("LVDS downclock is found in VBT. ",
@@ -405,6 +409,34 @@ parse_driver_features(struct drm_i915_private *dev_priv,
 }
 
 static void
+parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
+{
+        struct bdb_edp *edp;
+
+        edp = find_section(bdb, BDB_EDP);
+        if (!edp) {
+                if (SUPPORTS_EDP(dev_priv->dev) && dev_priv->edp_support) {
+                        DRM_DEBUG_KMS("No eDP BDB found but eDP panel supported,\
+                                       assume 18bpp panel color depth.\n");
+                        dev_priv->edp_bpp = 18;
+                }
+                return;
+        }
+
+        switch ((edp->color_depth >> (panel_type * 2)) & 3) {
+        case EDP_18BPP:
+                dev_priv->edp_bpp = 18;
+                break;
+        case EDP_24BPP:
+                dev_priv->edp_bpp = 24;
+                break;
+        case EDP_30BPP:
+                dev_priv->edp_bpp = 30;
+                break;
+        }
+}
+
+static void
 parse_device_mapping(struct drm_i915_private *dev_priv,
                        struct bdb_header *bdb)
 {
@@ -521,6 +553,7 @@ intel_init_bios(struct drm_device *dev)
         parse_sdvo_device_mapping(dev_priv, bdb);
         parse_device_mapping(dev_priv, bdb);
         parse_driver_features(dev_priv, bdb);
+        parse_edp(dev_priv, bdb);
 
         pci_unmap_rom(pdev, bios);
 
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 425ac9d7f724..4c18514f6f80 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -98,6 +98,7 @@ struct vbios_data {
 #define BDB_SDVO_LVDS_PNP_IDS    24
 #define BDB_SDVO_LVDS_POWER_SEQ  25
 #define BDB_TV_OPTIONS           26
+#define BDB_EDP                  27
 #define BDB_LVDS_OPTIONS         40
 #define BDB_LVDS_LFP_DATA_PTRS   41
 #define BDB_LVDS_LFP_DATA        42
@@ -426,6 +427,45 @@ struct bdb_driver_features {
         u8 custom_vbt_version;
 } __attribute__((packed));
 
+#define EDP_18BPP       0
+#define EDP_24BPP       1
+#define EDP_30BPP       2
+#define EDP_RATE_1_62   0
+#define EDP_RATE_2_7    1
+#define EDP_LANE_1      0
+#define EDP_LANE_2      1
+#define EDP_LANE_4      3
+#define EDP_PREEMPHASIS_NONE    0
+#define EDP_PREEMPHASIS_3_5dB   1
+#define EDP_PREEMPHASIS_6dB     2
+#define EDP_PREEMPHASIS_9_5dB   3
+#define EDP_VSWING_0_4V         0
+#define EDP_VSWING_0_6V         1
+#define EDP_VSWING_0_8V         2
+#define EDP_VSWING_1_2V         3
+
+struct edp_power_seq {
+        u16 t3;
+        u16 t7;
+        u16 t9;
+        u16 t10;
+        u16 t12;
+} __attribute__ ((packed));
+
+struct edp_link_params {
+        u8 rate:4;
+        u8 lanes:4;
+        u8 preemphasis:4;
+        u8 vswing:4;
+} __attribute__ ((packed));
+
+struct bdb_edp {
+        struct edp_power_seq power_seqs[16];
+        u32 color_depth;
+        u32 sdrrs_msa_timing_delay;
+        struct edp_link_params link_params[16];
+} __attribute__ ((packed));
+
 bool intel_init_bios(struct drm_device *dev);
 
 /*
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 9f3d3e563414..ddefc871edfe 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -548,4 +548,6 @@ void intel_crt_init(struct drm_device *dev)
         drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
         drm_sysfs_connector_add(connector);
+
+        dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 52cd9b006da2..45da78ef4a92 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -70,8 +70,6 @@ struct intel_limit {
     intel_p2_t      p2;
     bool (* find_pll)(const intel_limit_t *, struct drm_crtc *,
                       int, int, intel_clock_t *);
-    bool (* find_reduced_pll)(const intel_limit_t *, struct drm_crtc *,
-                              int, int, intel_clock_t *);
 };
 
 #define I8XX_DOT_MIN              25000
@@ -243,11 +241,11 @@ struct intel_limit {
 #define IRONLAKE_VCO_MIN         1760000
 #define IRONLAKE_VCO_MAX         3510000
 #define IRONLAKE_N_MIN           1
-#define IRONLAKE_N_MAX           5
+#define IRONLAKE_N_MAX           6
 #define IRONLAKE_M_MIN           79
-#define IRONLAKE_M_MAX           118
+#define IRONLAKE_M_MAX           127
 #define IRONLAKE_M1_MIN          12
-#define IRONLAKE_M1_MAX          23
+#define IRONLAKE_M1_MAX          22
 #define IRONLAKE_M2_MIN          5
 #define IRONLAKE_M2_MAX          9
 #define IRONLAKE_P_SDVO_DAC_MIN  5
@@ -262,18 +260,20 @@ struct intel_limit {
 #define IRONLAKE_P2_LVDS_FAST    7  /* double channel */
 #define IRONLAKE_P2_DOT_LIMIT    225000 /* 225Mhz */
 
+#define IRONLAKE_P_DISPLAY_PORT_MIN     10
+#define IRONLAKE_P_DISPLAY_PORT_MAX     20
+#define IRONLAKE_P2_DISPLAY_PORT_FAST   10
+#define IRONLAKE_P2_DISPLAY_PORT_SLOW   10
+#define IRONLAKE_P2_DISPLAY_PORT_LIMIT  0
+#define IRONLAKE_P1_DISPLAY_PORT_MIN    1
+#define IRONLAKE_P1_DISPLAY_PORT_MAX    2
+
 static bool
 intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                     int target, int refclk, intel_clock_t *best_clock);
 static bool
-intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
-                            int target, int refclk, intel_clock_t *best_clock);
-static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                         int target, int refclk, intel_clock_t *best_clock);
-static bool
-intel_ironlake_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
-                             int target, int refclk, intel_clock_t *best_clock);
 
 static bool
 intel_find_pll_g4x_dp(const intel_limit_t *, struct drm_crtc *crtc,
@@ -294,7 +294,6 @@ static const intel_limit_t intel_limits_i8xx_dvo = {
         .p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
                  .p2_slow = I8XX_P2_SLOW,       .p2_fast = I8XX_P2_FAST },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i8xx_lvds = {
@@ -309,7 +308,6 @@ static const intel_limit_t intel_limits_i8xx_lvds = {
         .p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
                  .p2_slow = I8XX_P2_LVDS_SLOW,  .p2_fast = I8XX_P2_LVDS_FAST },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
         
 static const intel_limit_t intel_limits_i9xx_sdvo = {
@@ -324,7 +322,6 @@ static const intel_limit_t intel_limits_i9xx_sdvo = {
         .p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
                  .p2_slow = I9XX_P2_SDVO_DAC_SLOW,      .p2_fast = I9XX_P2_SDVO_DAC_FAST },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i9xx_lvds = {
@@ -342,7 +339,6 @@ static const intel_limit_t intel_limits_i9xx_lvds = {
         .p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
                  .p2_slow = I9XX_P2_LVDS_SLOW,  .p2_fast = I9XX_P2_LVDS_FAST },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
     /* below parameter and function is for G4X Chipset Family*/
@@ -360,7 +356,6 @@ static const intel_limit_t intel_limits_g4x_sdvo = {
                  .p2_fast = G4X_P2_SDVO_FAST
         },
         .find_pll = intel_g4x_find_best_PLL,
-        .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_hdmi = {
@@ -377,7 +372,6 @@ static const intel_limit_t intel_limits_g4x_hdmi = {
                  .p2_fast = G4X_P2_HDMI_DAC_FAST
         },
         .find_pll = intel_g4x_find_best_PLL,
-        .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
@@ -402,7 +396,6 @@ static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
                  .p2_fast = G4X_P2_SINGLE_CHANNEL_LVDS_FAST
         },
         .find_pll = intel_g4x_find_best_PLL,
-        .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
@@ -427,7 +420,6 @@ static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
                  .p2_fast = G4X_P2_DUAL_CHANNEL_LVDS_FAST
         },
         .find_pll = intel_g4x_find_best_PLL,
-        .find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_display_port = {
@@ -465,7 +457,6 @@ static const intel_limit_t intel_limits_pineview_sdvo = {
         .p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
                  .p2_slow = I9XX_P2_SDVO_DAC_SLOW,      .p2_fast = I9XX_P2_SDVO_DAC_FAST },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_pineview_lvds = {
@@ -481,7 +472,6 @@ static const intel_limit_t intel_limits_pineview_lvds = {
         .p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
                  .p2_slow = I9XX_P2_LVDS_SLOW,  .p2_fast = I9XX_P2_LVDS_SLOW },
         .find_pll = intel_find_best_PLL,
-        .find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_ironlake_sdvo = {
@@ -496,7 +486,7 @@ static const intel_limit_t intel_limits_ironlake_sdvo = {
         .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
                  .p2_slow = IRONLAKE_P2_SDVO_DAC_SLOW,
                  .p2_fast = IRONLAKE_P2_SDVO_DAC_FAST },
-        .find_pll = intel_ironlake_find_best_PLL,
+        .find_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_ironlake_lvds = {
@@ -511,7 +501,30 @@ static const intel_limit_t intel_limits_ironlake_lvds = {
         .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
                  .p2_slow = IRONLAKE_P2_LVDS_SLOW,
                  .p2_fast = IRONLAKE_P2_LVDS_FAST },
-        .find_pll = intel_ironlake_find_best_PLL,
+        .find_pll = intel_g4x_find_best_PLL,
+};
+
+static const intel_limit_t intel_limits_ironlake_display_port = {
+        .dot = { .min = IRONLAKE_DOT_MIN,
+                 .max = IRONLAKE_DOT_MAX },
+        .vco = { .min = IRONLAKE_VCO_MIN,
+                 .max = IRONLAKE_VCO_MAX},
+        .n   = { .min = IRONLAKE_N_MIN,
+                 .max = IRONLAKE_N_MAX },
+        .m   = { .min = IRONLAKE_M_MIN,
+                 .max = IRONLAKE_M_MAX },
+        .m1  = { .min = IRONLAKE_M1_MIN,
+                 .max = IRONLAKE_M1_MAX },
+        .m2  = { .min = IRONLAKE_M2_MIN,
+                 .max = IRONLAKE_M2_MAX },
+        .p   = { .min = IRONLAKE_P_DISPLAY_PORT_MIN,
+                 .max = IRONLAKE_P_DISPLAY_PORT_MAX },
+        .p1  = { .min = IRONLAKE_P1_DISPLAY_PORT_MIN,
+                 .max = IRONLAKE_P1_DISPLAY_PORT_MAX},
+        .p2  = { .dot_limit = IRONLAKE_P2_DISPLAY_PORT_LIMIT,
+                 .p2_slow = IRONLAKE_P2_DISPLAY_PORT_SLOW,
+                 .p2_fast = IRONLAKE_P2_DISPLAY_PORT_FAST },
+        .find_pll = intel_find_pll_ironlake_dp,
 };
 
 static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc)
@@ -519,6 +532,9 @@ static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc)
         const intel_limit_t *limit;
         if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
                 limit = &intel_limits_ironlake_lvds;
+        else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+                        HAS_eDP)
+                limit = &intel_limits_ironlake_display_port;
         else
                 limit = &intel_limits_ironlake_sdvo;
 
@@ -737,46 +753,6 @@ intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
         return (err != target);
 }
 
-
-static bool
-intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
-                            int target, int refclk, intel_clock_t *best_clock)
-
-{
-        struct drm_device *dev = crtc->dev;
-        intel_clock_t clock;
-        int err = target;
-        bool found = false;
-
-        memcpy(&clock, best_clock, sizeof(intel_clock_t));
-
-        for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
-                for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++) {
-                        /* m1 is always 0 in Pineview */
-                        if (clock.m2 >= clock.m1 && !IS_PINEVIEW(dev))
-                                break;
-                        for (clock.n = limit->n.min; clock.n <= limit->n.max;
-                             clock.n++) {
-                                int this_err;
-
-                                intel_clock(dev, refclk, &clock);
-
-                                if (!intel_PLL_is_valid(crtc, &clock))
-                                        continue;
-
-                                this_err = abs(clock.dot - target);
-                                if (this_err < err) {
-                                        *best_clock = clock;
-                                        err = this_err;
-                                        found = true;
-                                }
-                        }
-                }
-        }
-
-        return found;
-}
-
 static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                         int target, int refclk, intel_clock_t *best_clock)
@@ -791,7 +767,13 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
         found = false;
 
         if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
-                if ((I915_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
+                int lvds_reg;
+
+                if (IS_IRONLAKE(dev))
+                        lvds_reg = PCH_LVDS;
+                else
+                        lvds_reg = LVDS;
+                if ((I915_READ(lvds_reg) & LVDS_CLKB_POWER_MASK) ==
                     LVDS_CLKB_POWER_UP)
                         clock.p2 = limit->p2.p2_fast;
                 else
@@ -839,6 +821,11 @@ intel_find_pll_ironlake_dp(const intel_limit_t *limit, struct drm_crtc *crtc,
 {
         struct drm_device *dev = crtc->dev;
         intel_clock_t clock;
+
+        /* return directly when it is eDP */
+        if (HAS_eDP)
+                return true;
+
         if (target < 200000) {
                 clock.n = 1;
                 clock.p1 = 2;
@@ -857,68 +844,6 @@ intel_find_pll_ironlake_dp(const intel_limit_t *limit, struct drm_crtc *crtc,
         return true;
 }
 
-static bool
-intel_ironlake_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
-                             int target, int refclk, intel_clock_t *best_clock)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        intel_clock_t clock;
-        int err_most = 47;
-        int err_min = 10000;
-
-        /* eDP has only 2 clock choice, no n/m/p setting */
-        if (HAS_eDP)
-                return true;
-
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
-                return intel_find_pll_ironlake_dp(limit, crtc, target,
-                                               refclk, best_clock);
-
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
-                if ((I915_READ(PCH_LVDS) & LVDS_CLKB_POWER_MASK) ==
-                    LVDS_CLKB_POWER_UP)
-                        clock.p2 = limit->p2.p2_fast;
-                else
-                        clock.p2 = limit->p2.p2_slow;
-        } else {
-                if (target < limit->p2.dot_limit)
-                        clock.p2 = limit->p2.p2_slow;
-                else
-                        clock.p2 = limit->p2.p2_fast;
-        }
-
-        memset(best_clock, 0, sizeof(*best_clock));
-        for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
-                /* based on hardware requriment prefer smaller n to precision */
-                for (clock.n = limit->n.min; clock.n <= limit->n.max; clock.n++) {
-                        /* based on hardware requirment prefere larger m1,m2 */
-                        for (clock.m1 = limit->m1.max;
-                             clock.m1 >= limit->m1.min; clock.m1--) {
-                                for (clock.m2 = limit->m2.max;
-                                     clock.m2 >= limit->m2.min; clock.m2--) {
-                                        int this_err;
-
-                                        intel_clock(dev, refclk, &clock);
-                                        if (!intel_PLL_is_valid(crtc, &clock))
-                                                continue;
-                                        this_err = abs((10000 - (target*10000/clock.dot)));
-                                        if (this_err < err_most) {
-                                                *best_clock = clock;
-                                                /* found on first matching */
-                                                goto out;
-                                        } else if (this_err < err_min) {
-                                                *best_clock = clock;
-                                                err_min = this_err;
-                                        }
-                                }
-                        }
-                }
-        }
-out:
-        return true;
-}
-
 /* DisplayPort has only two frequencies, 162MHz and 270MHz */
 static bool
 intel_find_pll_g4x_dp(const intel_limit_t *limit, struct drm_crtc *crtc,
@@ -1282,7 +1207,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 return ret;
         }
 
-        ret = i915_gem_object_set_to_gtt_domain(obj, 1);
+        ret = i915_gem_object_set_to_display_plane(obj);
         if (ret != 0) {
                 i915_gem_object_unpin(obj);
                 mutex_unlock(&dev->struct_mutex);
@@ -1493,6 +1418,10 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
         int trans_vsync_reg = (pipe == 0) ? TRANS_VSYNC_A : TRANS_VSYNC_B;
         u32 temp;
         int tries = 5, j, n;
+        u32 pipe_bpc;
+
+        temp = I915_READ(pipeconf_reg);
+        pipe_bpc = temp & PIPE_BPC_MASK;
 
         /* XXX: When our outputs are all unaware of DPMS modes other than off
          * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
@@ -1524,6 +1453,12 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
 
                         /* enable PCH FDI RX PLL, wait warmup plus DMI latency */
                         temp = I915_READ(fdi_rx_reg);
+                        /*
+                         * make the BPC in FDI Rx be consistent with that in
+                         * pipeconf reg.
+                         */
+                        temp &= ~(0x7 << 16);
+                        temp |= (pipe_bpc << 11);
                         I915_WRITE(fdi_rx_reg, temp | FDI_RX_PLL_ENABLE |
                                         FDI_SEL_PCDCLK |
                                         FDI_DP_PORT_WIDTH_X4); /* default 4 lanes */
@@ -1666,6 +1601,12 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
 
                         /* enable PCH transcoder */
                         temp = I915_READ(transconf_reg);
+                        /*
+                         * make the BPC in transcoder be consistent with
+                         * that in pipeconf reg.
+                         */
+                        temp &= ~PIPE_BPC_MASK;
+                        temp |= pipe_bpc;
                         I915_WRITE(transconf_reg, temp | TRANS_ENABLE);
                         I915_READ(transconf_reg);
 
@@ -1745,6 +1686,9 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                 I915_READ(fdi_tx_reg);
 
                 temp = I915_READ(fdi_rx_reg);
+                /* BPC in FDI rx is consistent with that in pipeconf */
+                temp &= ~(0x07 << 16);
+                temp |= (pipe_bpc << 11);
                 I915_WRITE(fdi_rx_reg, temp & ~FDI_RX_ENABLE);
                 I915_READ(fdi_rx_reg);
 
@@ -1789,7 +1733,12 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                                 }
                         }
                 }
-
+                temp = I915_READ(transconf_reg);
+                /* BPC in transcoder is consistent with that in pipeconf */
+                temp &= ~PIPE_BPC_MASK;
+                temp |= pipe_bpc;
+                I915_WRITE(transconf_reg, temp);
+                I915_READ(transconf_reg);
                 udelay(100);
 
                 /* disable PCH DPLL */
@@ -2448,7 +2397,7 @@ static void pineview_enable_cxsr(struct drm_device *dev, unsigned long clock,
  * A value of 5us seems to be a good balance; safe for very low end
  * platforms but not overly aggressive on lower latency configs.
  */
-const static int latency_ns = 5000;
+static const int latency_ns = 5000;
 
 static int i9xx_get_fifo_size(struct drm_device *dev, int plane)
 {
@@ -2559,7 +2508,7 @@ static void g4x_update_wm(struct drm_device *dev,  int planea_clock,
         /* Calc sr entries for one plane configs */
         if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
                 /* self-refresh has much higher latency */
-                const static int sr_latency_ns = 12000;
+                static const int sr_latency_ns = 12000;
 
                 sr_clock = planea_clock ? planea_clock : planeb_clock;
                 line_time_us = ((sr_hdisplay * 1000) / sr_clock);
@@ -2598,7 +2547,7 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
         /* Calc sr entries for one plane configs */
         if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
                 /* self-refresh has much higher latency */
-                const static int sr_latency_ns = 12000;
+                static const int sr_latency_ns = 12000;
 
                 sr_clock = planea_clock ? planea_clock : planeb_clock;
                 line_time_us = ((sr_hdisplay * 1000) / sr_clock);
@@ -2667,7 +2616,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
         if (HAS_FW_BLC(dev) && sr_hdisplay &&
             (!planea_clock || !planeb_clock)) {
                 /* self-refresh has much higher latency */
-                const static int sr_latency_ns = 6000;
+                static const int sr_latency_ns = 6000;
 
                 sr_clock = planea_clock ? planea_clock : planeb_clock;
                 line_time_us = ((sr_hdisplay * 1000) / sr_clock);
@@ -2906,10 +2855,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        if (is_lvds && limit->find_reduced_pll &&
-                        dev_priv->lvds_downclock_avail) {
-                memcpy(&reduced_clock, &clock, sizeof(intel_clock_t));
-                has_reduced_clock = limit->find_reduced_pll(limit, crtc,
+        if (is_lvds && dev_priv->lvds_downclock_avail) {
+                has_reduced_clock = limit->find_pll(limit, crtc,
                                                             dev_priv->lvds_downclock,
                                                             refclk,
                                                             &reduced_clock);
@@ -2969,6 +2916,33 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 
                 /* determine panel color depth */
                 temp = I915_READ(pipeconf_reg);
+                temp &= ~PIPE_BPC_MASK;
+                if (is_lvds) {
+                        int lvds_reg = I915_READ(PCH_LVDS);
+                        /* the BPC will be 6 if it is 18-bit LVDS panel */
+                        if ((lvds_reg & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP)
+                                temp |= PIPE_8BPC;
+                        else
+                                temp |= PIPE_6BPC;
+                } else if (is_edp) {
+                        switch (dev_priv->edp_bpp/3) {
+                        case 8:
+                                temp |= PIPE_8BPC;
+                                break;
+                        case 10:
+                                temp |= PIPE_10BPC;
+                                break;
+                        case 6:
+                                temp |= PIPE_6BPC;
+                                break;
+                        case 12:
+                                temp |= PIPE_12BPC;
+                                break;
+                        }
+                } else
+                        temp |= PIPE_8BPC;
+                I915_WRITE(pipeconf_reg, temp);
+                I915_READ(pipeconf_reg);
 
                 switch (temp & PIPE_BPC_MASK) {
                 case PIPE_8BPC:
@@ -3195,7 +3169,20 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                  * appropriately here, but we need to look more thoroughly into how
                  * panels behave in the two modes.
                  */
-
+                /* set the dithering flag */
+                if (IS_I965G(dev)) {
+                        if (dev_priv->lvds_dither) {
+                                if (IS_IRONLAKE(dev))
+                                        pipeconf |= PIPE_ENABLE_DITHER;
+                                else
+                                        lvds |= LVDS_ENABLE_DITHER;
+                        } else {
+                                if (IS_IRONLAKE(dev))
+                                        pipeconf &= ~PIPE_ENABLE_DITHER;
+                                else
+                                        lvds &= ~LVDS_ENABLE_DITHER;
+                        }
+                }
                 I915_WRITE(lvds_reg, lvds);
                 I915_READ(lvds_reg);
         }
@@ -3385,7 +3372,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
 
         /* we only need to pin inside GTT if cursor is non-phy */
         mutex_lock(&dev->struct_mutex);
-        if (!dev_priv->cursor_needs_physical) {
+        if (!dev_priv->info->cursor_needs_physical) {
                 ret = i915_gem_object_pin(bo, PAGE_SIZE);
                 if (ret) {
                         DRM_ERROR("failed to pin cursor bo\n");
@@ -3420,7 +3407,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
         I915_WRITE(base, addr);
 
         if (intel_crtc->cursor_bo) {
-                if (dev_priv->cursor_needs_physical) {
+                if (dev_priv->info->cursor_needs_physical) {
                         if (intel_crtc->cursor_bo != bo)
                                 i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo);
                 } else
@@ -3779,125 +3766,6 @@ static void intel_gpu_idle_timer(unsigned long arg)
         queue_work(dev_priv->wq, &dev_priv->idle_work);
 }
 
-void intel_increase_renderclock(struct drm_device *dev, bool schedule)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-
-        if (IS_IRONLAKE(dev))
-                return;
-
-        if (!dev_priv->render_reclock_avail) {
-                DRM_DEBUG_DRIVER("not reclocking render clock\n");
-                return;
-        }
-
-        /* Restore render clock frequency to original value */
-        if (IS_G4X(dev) || IS_I9XX(dev))
-                pci_write_config_word(dev->pdev, GCFGC, dev_priv->orig_clock);
-        else if (IS_I85X(dev))
-                pci_write_config_word(dev->pdev, HPLLCC, dev_priv->orig_clock);
-        DRM_DEBUG_DRIVER("increasing render clock frequency\n");
-
-        /* Schedule downclock */
-        if (schedule)
-                mod_timer(&dev_priv->idle_timer, jiffies +
-                          msecs_to_jiffies(GPU_IDLE_TIMEOUT));
-}
-
-void intel_decrease_renderclock(struct drm_device *dev)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-
-        if (IS_IRONLAKE(dev))
-                return;
-
-        if (!dev_priv->render_reclock_avail) {
-                DRM_DEBUG_DRIVER("not reclocking render clock\n");
-                return;
-        }
-
-        if (IS_G4X(dev)) {
-                u16 gcfgc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
-
-                /* Down to minimum... */
-                gcfgc &= ~GM45_GC_RENDER_CLOCK_MASK;
-                gcfgc |= GM45_GC_RENDER_CLOCK_266_MHZ;
-
-                pci_write_config_word(dev->pdev, GCFGC, gcfgc);
-        } else if (IS_I965G(dev)) {
-                u16 gcfgc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
-
-                /* Down to minimum... */
-                gcfgc &= ~I965_GC_RENDER_CLOCK_MASK;
-                gcfgc |= I965_GC_RENDER_CLOCK_267_MHZ;
-
-                pci_write_config_word(dev->pdev, GCFGC, gcfgc);
-        } else if (IS_I945G(dev) || IS_I945GM(dev)) {
-                u16 gcfgc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
-
-                /* Down to minimum... */
-                gcfgc &= ~I945_GC_RENDER_CLOCK_MASK;
-                gcfgc |= I945_GC_RENDER_CLOCK_166_MHZ;
-
-                pci_write_config_word(dev->pdev, GCFGC, gcfgc);
-        } else if (IS_I915G(dev)) {
-                u16 gcfgc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
-
-                /* Down to minimum... */
-                gcfgc &= ~I915_GC_RENDER_CLOCK_MASK;
-                gcfgc |= I915_GC_RENDER_CLOCK_166_MHZ;
-
-                pci_write_config_word(dev->pdev, GCFGC, gcfgc);
-        } else if (IS_I85X(dev)) {
-                u16 hpllcc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, HPLLCC, &hpllcc);
-
-                /* Up to maximum... */
-                hpllcc &= ~GC_CLOCK_CONTROL_MASK;
-                hpllcc |= GC_CLOCK_133_200;
-
-                pci_write_config_word(dev->pdev, HPLLCC, hpllcc);
-        }
-        DRM_DEBUG_DRIVER("decreasing render clock frequency\n");
-}
-
-/* Note that no increase function is needed for this - increase_renderclock()
- *  will also rewrite these bits
- */
-void intel_decrease_displayclock(struct drm_device *dev)
-{
-        if (IS_IRONLAKE(dev))
-                return;
-
-        if (IS_I945G(dev) || IS_I945GM(dev) || IS_I915G(dev) ||
-            IS_I915GM(dev)) {
-                u16 gcfgc;
-
-                /* Adjust render clock... */
-                pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
-
-                /* Down to minimum... */
-                gcfgc &= ~0xf0;
-                gcfgc |= 0x80;
-
-                pci_write_config_word(dev->pdev, GCFGC, gcfgc);
-        }
-}
-
 #define CRTC_IDLE_TIMEOUT 1000 /* ms */
 
 static void intel_crtc_idle_timer(unsigned long arg)
@@ -4011,12 +3879,6 @@ static void intel_idle_update(struct work_struct *work)
 
         mutex_lock(&dev->struct_mutex);
 
-        /* GPU isn't processing, downclock it. */
-        if (!dev_priv->busy) {
-                intel_decrease_renderclock(dev);
-                intel_decrease_displayclock(dev);
-        }
-
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 /* Skip inactive CRTCs */
                 if (!crtc->fb)
@@ -4050,13 +3912,11 @@ void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj)
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return;
 
-        if (!dev_priv->busy) {
+        if (!dev_priv->busy)
                 dev_priv->busy = true;
-                intel_increase_renderclock(dev, true);
-        } else {
+        else
                 mod_timer(&dev_priv->idle_timer, jiffies +
                           msecs_to_jiffies(GPU_IDLE_TIMEOUT));
-        }
 
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 if (!crtc->fb)
@@ -4400,29 +4260,43 @@ static void intel_setup_outputs(struct drm_device *dev)
                 bool found = false;
 
                 if (I915_READ(SDVOB) & SDVO_DETECTED) {
+                        DRM_DEBUG_KMS("probing SDVOB\n");
                         found = intel_sdvo_init(dev, SDVOB);
-                        if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
+                        if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) {
+                                DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
                                 intel_hdmi_init(dev, SDVOB);
+                        }
 
-                        if (!found && SUPPORTS_INTEGRATED_DP(dev))
+                        if (!found && SUPPORTS_INTEGRATED_DP(dev)) {
+                                DRM_DEBUG_KMS("probing DP_B\n");
                                 intel_dp_init(dev, DP_B);
+                        }
                 }
 
                 /* Before G4X SDVOC doesn't have its own detect register */
 
-                if (I915_READ(SDVOB) & SDVO_DETECTED)
+                if (I915_READ(SDVOB) & SDVO_DETECTED) {
+                        DRM_DEBUG_KMS("probing SDVOC\n");
                         found = intel_sdvo_init(dev, SDVOC);
+                }
 
                 if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
 
-                        if (SUPPORTS_INTEGRATED_HDMI(dev))
+                        if (SUPPORTS_INTEGRATED_HDMI(dev)) {
+                                DRM_DEBUG_KMS("probing HDMI on SDVOC\n");
                                 intel_hdmi_init(dev, SDVOC);
-                        if (SUPPORTS_INTEGRATED_DP(dev))
+                        }
+                        if (SUPPORTS_INTEGRATED_DP(dev)) {
+                                DRM_DEBUG_KMS("probing DP_C\n");
                                 intel_dp_init(dev, DP_C);
+                        }
                 }
 
-                if (SUPPORTS_INTEGRATED_DP(dev) && (I915_READ(DP_D) & DP_DETECTED))
+                if (SUPPORTS_INTEGRATED_DP(dev) &&
+                    (I915_READ(DP_D) & DP_DETECTED)) {
+                        DRM_DEBUG_KMS("probing DP_D\n");
                         intel_dp_init(dev, DP_D);
+                }
         } else if (IS_I8XX(dev))
                 intel_dvo_init(dev);
 
@@ -4527,6 +4401,42 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
         .fb_changed = intelfb_probe,
 };
 
+static struct drm_gem_object *
+intel_alloc_power_context(struct drm_device *dev)
+{
+        struct drm_gem_object *pwrctx;
+        int ret;
+
+        pwrctx = drm_gem_object_alloc(dev, 4096);
+        if (!pwrctx) {
+                DRM_DEBUG("failed to alloc power context, RC6 disabled\n");
+                return NULL;
+        }
+
+        mutex_lock(&dev->struct_mutex);
+        ret = i915_gem_object_pin(pwrctx, 4096);
+        if (ret) {
+                DRM_ERROR("failed to pin power context: %d\n", ret);
+                goto err_unref;
+        }
+
+        ret = i915_gem_object_set_to_gtt_domain(pwrctx, 1);
+        if (ret) {
+                DRM_ERROR("failed to set-domain on power context: %d\n", ret);
+                goto err_unpin;
+        }
+        mutex_unlock(&dev->struct_mutex);
+
+        return pwrctx;
+
+err_unpin:
+        i915_gem_object_unpin(pwrctx);
+err_unref:
+        drm_gem_object_unreference(pwrctx);
+        mutex_unlock(&dev->struct_mutex);
+        return NULL;
+}
+
 void intel_init_clock_gating(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -4579,42 +4489,27 @@ void intel_init_clock_gating(struct drm_device *dev)
          * GPU can automatically power down the render unit if given a page
          * to save state.
          */
-        if (I915_HAS_RC6(dev)) {
-                struct drm_gem_object *pwrctx;
-                struct drm_i915_gem_object *obj_priv;
-                int ret;
+        if (I915_HAS_RC6(dev) && drm_core_check_feature(dev, DRIVER_MODESET)) {
+                struct drm_i915_gem_object *obj_priv = NULL;
 
                 if (dev_priv->pwrctx) {
                         obj_priv = dev_priv->pwrctx->driver_private;
                 } else {
-                        pwrctx = drm_gem_object_alloc(dev, 4096);
-                        if (!pwrctx) {
-                                DRM_DEBUG("failed to alloc power context, "
-                                          "RC6 disabled\n");
-                                goto out;
-                        }
+                        struct drm_gem_object *pwrctx;
 
-                        ret = i915_gem_object_pin(pwrctx, 4096);
-                        if (ret) {
-                                DRM_ERROR("failed to pin power context: %d\n",
-                                          ret);
-                                drm_gem_object_unreference(pwrctx);
-                                goto out;
+                        pwrctx = intel_alloc_power_context(dev);
+                        if (pwrctx) {
+                                dev_priv->pwrctx = pwrctx;
+                                obj_priv = pwrctx->driver_private;
                         }
-
-                        i915_gem_object_set_to_gtt_domain(pwrctx, 1);
-
-                        dev_priv->pwrctx = pwrctx;
-                        obj_priv = pwrctx->driver_private;
                 }
 
-                I915_WRITE(PWRCTXA, obj_priv->gtt_offset | PWRCTX_EN);
-                I915_WRITE(MCHBAR_RENDER_STANDBY,
-                           I915_READ(MCHBAR_RENDER_STANDBY) & ~RCX_SW_EXIT);
+                if (obj_priv) {
+                        I915_WRITE(PWRCTXA, obj_priv->gtt_offset | PWRCTX_EN);
+                        I915_WRITE(MCHBAR_RENDER_STANDBY,
+                                   I915_READ(MCHBAR_RENDER_STANDBY) & ~RCX_SW_EXIT);
+                }
         }
-
-out:
-        return;
 }
 
 /* Set up chip specific display functions */
@@ -4770,7 +4665,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
                 del_timer_sync(&intel_crtc->idle_timer);
         }
 
-        intel_increase_renderclock(dev, false);
         del_timer_sync(&dev_priv->idle_timer);
 
         if (dev_priv->display.disable_fbc)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 4e7aa8b7b938..439506cefc14 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -125,9 +125,15 @@ intel_dp_link_clock(uint8_t link_bw)
 
 /* I think this is a fiction */
 static int
-intel_dp_link_required(int pixel_clock)
+intel_dp_link_required(struct drm_device *dev,
+                       struct intel_output *intel_output, int pixel_clock)
 {
-        return pixel_clock * 3;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        if (IS_eDP(intel_output))
+                return (pixel_clock * dev_priv->edp_bpp) / 8;
+        else
+                return pixel_clock * 3;
 }
 
 static int
@@ -138,7 +144,8 @@ intel_dp_mode_valid(struct drm_connector *connector,
         int max_link_clock = intel_dp_link_clock(intel_dp_max_link_bw(intel_output));
         int max_lanes = intel_dp_max_lane_count(intel_output);
 
-        if (intel_dp_link_required(mode->clock) > max_link_clock * max_lanes)
+        if (intel_dp_link_required(connector->dev, intel_output, mode->clock)
+                        > max_link_clock * max_lanes)
                 return MODE_CLOCK_HIGH;
 
         if (mode->clock < 10000)
@@ -492,7 +499,8 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
                 for (clock = 0; clock <= max_clock; clock++) {
                         int link_avail = intel_dp_link_clock(bws[clock]) * lane_count;
 
-                        if (intel_dp_link_required(mode->clock) <= link_avail) {
+                        if (intel_dp_link_required(encoder->dev, intel_output, mode->clock)
+                                        <= link_avail) {
                                 dp_priv->link_bw = bws[clock];
                                 dp_priv->lane_count = lane_count;
                                 adjusted_mode->clock = intel_dp_link_clock(dp_priv->link_bw);
@@ -1289,53 +1297,7 @@ intel_dp_hot_plug(struct intel_output *intel_output)
         if (dp_priv->dpms_mode == DRM_MODE_DPMS_ON)
                 intel_dp_check_link_status(intel_output);
 }
-/*
- * Enumerate the child dev array parsed from VBT to check whether
- * the given DP is present.
- * If it is present, return 1.
- * If it is not present, return false.
- * If no child dev is parsed from VBT, it is assumed that the given
- * DP is present.
- */
-static int dp_is_present_in_vbt(struct drm_device *dev, int dp_reg)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct child_device_config *p_child;
-        int i, dp_port, ret;
-
-        if (!dev_priv->child_dev_num)
-                return 1;
-
-        dp_port = 0;
-        if (dp_reg == DP_B || dp_reg == PCH_DP_B)
-                dp_port = PORT_IDPB;
-        else if (dp_reg == DP_C || dp_reg == PCH_DP_C)
-                dp_port = PORT_IDPC;
-        else if (dp_reg == DP_D || dp_reg == PCH_DP_D)
-                dp_port = PORT_IDPD;
-
-        ret = 0;
-        for (i = 0; i < dev_priv->child_dev_num; i++) {
-                p_child = dev_priv->child_dev + i;
-                /*
-                 * If the device type is not DP, continue.
-                 */
-                if (p_child->device_type != DEVICE_TYPE_DP &&
-                        p_child->device_type != DEVICE_TYPE_eDP)
-                        continue;
-                /* Find the eDP port */
-                if (dp_reg == DP_A && p_child->device_type == DEVICE_TYPE_eDP) {
-                        ret = 1;
-                        break;
-                }
-                /* Find the DP port */
-                if (p_child->dvo_port == dp_port) {
-                        ret = 1;
-                        break;
-                }
-        }
-        return ret;
-}
+
 void
 intel_dp_init(struct drm_device *dev, int output_reg)
 {
@@ -1345,10 +1307,6 @@ intel_dp_init(struct drm_device *dev, int output_reg)
         struct intel_dp_priv *dp_priv;
         const char *name = NULL;
 
-        if (!dp_is_present_in_vbt(dev, output_reg)) {
-                DRM_DEBUG_KMS("DP is not present. Ignore it\n");
-                return;
-        }
         intel_output = kcalloc(sizeof(struct intel_output) + 
                                sizeof(struct intel_dp_priv), 1, GFP_KERNEL);
         if (!intel_output)
@@ -1373,11 +1331,10 @@ intel_dp_init(struct drm_device *dev, int output_reg)
         else if (output_reg == DP_D || output_reg == PCH_DP_D)
                 intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
 
-        if (IS_eDP(intel_output)) {
-                intel_output->crtc_mask = (1 << 1);
+        if (IS_eDP(intel_output))
                 intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT);
-        } else
-                intel_output->crtc_mask = (1 << 0) | (1 << 1);
+
+        intel_output->crtc_mask = (1 << 0) | (1 << 1);
         connector->interlace_allowed = true;
         connector->doublescan_allowed = 0;
 
@@ -1402,14 +1359,20 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                         break;
                 case DP_B:
                 case PCH_DP_B:
+                        dev_priv->hotplug_supported_mask |=
+                                HDMIB_HOTPLUG_INT_STATUS;
                         name = "DPDDC-B";
                         break;
                 case DP_C:
                 case PCH_DP_C:
+                        dev_priv->hotplug_supported_mask |=
+                                HDMIC_HOTPLUG_INT_STATUS;
                         name = "DPDDC-C";
                         break;
                 case DP_D:
                 case PCH_DP_D:
+                        dev_priv->hotplug_supported_mask |=
+                                HDMID_HOTPLUG_INT_STATUS;
                         name = "DPDDC-D";
                         break;
         }
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index f04dbbe7d400..0e268deed761 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -225,52 +225,6 @@ static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
         .destroy = intel_hdmi_enc_destroy,
 };
 
-/*
- * Enumerate the child dev array parsed from VBT to check whether
- * the given HDMI is present.
- * If it is present, return 1.
- * If it is not present, return false.
- * If no child dev is parsed from VBT, it assumes that the given
- * HDMI is present.
- */
-static int hdmi_is_present_in_vbt(struct drm_device *dev, int hdmi_reg)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct child_device_config *p_child;
-        int i, hdmi_port, ret;
-
-        if (!dev_priv->child_dev_num)
-                return 1;
-
-        if (hdmi_reg == SDVOB)
-                hdmi_port = DVO_B;
-        else if (hdmi_reg == SDVOC)
-                hdmi_port = DVO_C;
-        else if (hdmi_reg == HDMIB)
-                hdmi_port = DVO_B;
-        else if (hdmi_reg == HDMIC)
-                hdmi_port = DVO_C;
-        else if (hdmi_reg == HDMID)
-                hdmi_port = DVO_D;
-        else
-                return 0;
-
-        ret = 0;
-        for (i = 0; i < dev_priv->child_dev_num; i++) {
-                p_child = dev_priv->child_dev + i;
-                /*
-                 * If the device type is not HDMI, continue.
-                 */
-                if (p_child->device_type != DEVICE_TYPE_HDMI)
-                        continue;
-                /* Find the HDMI port */
-                if (p_child->dvo_port == hdmi_port) {
-                        ret = 1;
-                        break;
-                }
-        }
-        return ret;
-}
 void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -278,10 +232,6 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
         struct intel_output *intel_output;
         struct intel_hdmi_priv *hdmi_priv;
 
-        if (!hdmi_is_present_in_vbt(dev, sdvox_reg)) {
-                DRM_DEBUG_KMS("HDMI is not present. Ignored it \n");
-                return;
-        }
         intel_output = kcalloc(sizeof(struct intel_output) +
                                sizeof(struct intel_hdmi_priv), 1, GFP_KERNEL);
         if (!intel_output)
@@ -303,21 +253,26 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
         if (sdvox_reg == SDVOB) {
                 intel_output->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT);
                 intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "HDMIB");
+                dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
         } else if (sdvox_reg == SDVOC) {
                 intel_output->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT);
                 intel_output->ddc_bus = intel_i2c_create(dev, GPIOD, "HDMIC");
+                dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
         } else if (sdvox_reg == HDMIB) {
                 intel_output->clone_mask = (1 << INTEL_HDMID_CLONE_BIT);
                 intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOE,
                                                                 "HDMIB");
+                dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
         } else if (sdvox_reg == HDMIC) {
                 intel_output->clone_mask = (1 << INTEL_HDMIE_CLONE_BIT);
                 intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOD,
                                                                 "HDMIC");
+                dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
         } else if (sdvox_reg == HDMID) {
                 intel_output->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT);
                 intel_output->ddc_bus = intel_i2c_create(dev, PCH_GPIOF,
                                                                 "HDMID");
+                dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS;
         }
         if (!intel_output->ddc_bus)
                 goto err_connector;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 3118ce274e67..aa74e59bec61 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -602,12 +602,33 @@ static void intel_lvds_mode_set(struct drm_encoder *encoder,
 /* Some lid devices report incorrect lid status, assume they're connected */
 static const struct dmi_system_id bad_lid_status[] = {
         {
+                .ident = "Compaq nx9020",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_BOARD_NAME, "3084"),
+                },
+        },
+        {
+                .ident = "Samsung SX20S",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Phoenix Technologies LTD"),
+                        DMI_MATCH(DMI_BOARD_NAME, "SX20S"),
+                },
+        },
+        {
                 .ident = "Aspire One",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire one"),
                 },
         },
+        {
+                .ident = "PC-81005",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MALATA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "PC-81005"),
+                },
+        },
         { }
 };
 
@@ -679,7 +700,14 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
         struct drm_i915_private *dev_priv =
                 container_of(nb, struct drm_i915_private, lid_notifier);
         struct drm_device *dev = dev_priv->dev;
+        struct drm_connector *connector = dev_priv->int_lvds_connector;
 
+        /*
+         * check and update the status of LVDS connector after receiving
+         * the LID nofication event.
+         */
+        if (connector)
+                connector->status = connector->funcs->detect(connector);
         if (!acpi_lid_open()) {
                 dev_priv->modeset_on_lid = 1;
                 return NOTIFY_OK;
@@ -854,65 +882,6 @@ static const struct dmi_system_id intel_no_lvds[] = {
         { }     /* terminating entry */
 };
 
-#ifdef CONFIG_ACPI
-/*
- * check_lid_device -- check whether @handle is an ACPI LID device.
- * @handle: ACPI device handle
- * @level : depth in the ACPI namespace tree
- * @context: the number of LID device when we find the device
- * @rv: a return value to fill if desired (Not use)
- */
-static acpi_status
-check_lid_device(acpi_handle handle, u32 level, void *context,
-                        void **return_value)
-{
-        struct acpi_device *acpi_dev;
-        int *lid_present = context;
-
-        acpi_dev = NULL;
-        /* Get the acpi device for device handle */
-        if (acpi_bus_get_device(handle, &acpi_dev) || !acpi_dev) {
-                /* If there is no ACPI device for handle, return */
-                return AE_OK;
-        }
-
-        if (!strncmp(acpi_device_hid(acpi_dev), "PNP0C0D", 7))
-                *lid_present = 1;
-
-        return AE_OK;
-}
-
-/**
- * check whether there exists the ACPI LID device by enumerating the ACPI
- * device tree.
- */
-static int intel_lid_present(void)
-{
-        int lid_present = 0;
-
-        if (acpi_disabled) {
-                /* If ACPI is disabled, there is no ACPI device tree to
-                 * check, so assume the LID device would have been present.
-                 */
-                return 1;
-        }
-
-        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                ACPI_UINT32_MAX,
-                                check_lid_device, NULL, &lid_present, NULL);
-
-        return lid_present;
-}
-#else
-static int intel_lid_present(void)
-{
-        /* In the absence of ACPI built in, assume that the LID device would
-         * have been present.
-         */
-        return 1;
-}
-#endif
-
 /**
  * intel_find_lvds_downclock - find the reduced downclock for LVDS in EDID
  * @dev: drm device
@@ -957,7 +926,8 @@ static void intel_find_lvds_downclock(struct drm_device *dev,
                 }
         }
         mutex_unlock(&dev->mode_config.mutex);
-        if (temp_downclock < panel_fixed_mode->clock) {
+        if (temp_downclock < panel_fixed_mode->clock &&
+            i915_lvds_downclock) {
                 /* We found the downclock for LVDS. */
                 dev_priv->lvds_downclock_avail = 1;
                 dev_priv->lvds_downclock = temp_downclock;
@@ -1031,12 +1001,8 @@ void intel_lvds_init(struct drm_device *dev)
         if (dmi_check_system(intel_no_lvds))
                 return;
 
-        /*
-         * Assume LVDS is present if there's an ACPI lid device or if the
-         * device is present in the VBT.
-         */
-        if (!lvds_is_present_in_vbt(dev) && !intel_lid_present()) {
-                DRM_DEBUG_KMS("LVDS is not present in VBT and no lid detected\n");
+        if (!lvds_is_present_in_vbt(dev)) {
+                DRM_DEBUG_KMS("LVDS is not present in VBT\n");
                 return;
         }
 
@@ -1180,6 +1146,8 @@ out:
                 DRM_DEBUG_KMS("lid notifier registration failed\n");
                 dev_priv->lid_notifier.notifier_call = NULL;
         }
+        /* keep the LVDS connector */
+        dev_priv->int_lvds_connector = connector;
         drm_sysfs_connector_add(connector);
         return;
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 24a3dc99716c..eaacfd0920df 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -462,14 +462,63 @@ static int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode)
 }
 
 /**
- * Don't check status code from this as it switches the bus back to the
- * SDVO chips which defeats the purpose of doing a bus switch in the first
- * place.
+ * Try to read the response after issuie the DDC switch command. But it
+ * is noted that we must do the action of reading response and issuing DDC
+ * switch command in one I2C transaction. Otherwise when we try to start
+ * another I2C transaction after issuing the DDC bus switch, it will be
+ * switched to the internal SDVO register.
  */
 static void intel_sdvo_set_control_bus_switch(struct intel_output *intel_output,
                                               u8 target)
 {
-        intel_sdvo_write_cmd(intel_output, SDVO_CMD_SET_CONTROL_BUS_SWITCH, &target, 1);
+        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+        u8 out_buf[2], cmd_buf[2], ret_value[2], ret;
+        struct i2c_msg msgs[] = {
+                {
+                        .addr = sdvo_priv->slave_addr >> 1,
+                        .flags = 0,
+                        .len = 2,
+                        .buf = out_buf,
+                },
+                /* the following two are to read the response */
+                {
+                        .addr = sdvo_priv->slave_addr >> 1,
+                        .flags = 0,
+                        .len = 1,
+                        .buf = cmd_buf,
+                },
+                {
+                        .addr = sdvo_priv->slave_addr >> 1,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = ret_value,
+                },
+        };
+
+        intel_sdvo_debug_write(intel_output, SDVO_CMD_SET_CONTROL_BUS_SWITCH,
+                                        &target, 1);
+        /* write the DDC switch command argument */
+        intel_sdvo_write_byte(intel_output, SDVO_I2C_ARG_0, target);
+
+        out_buf[0] = SDVO_I2C_OPCODE;
+        out_buf[1] = SDVO_CMD_SET_CONTROL_BUS_SWITCH;
+        cmd_buf[0] = SDVO_I2C_CMD_STATUS;
+        cmd_buf[1] = 0;
+        ret_value[0] = 0;
+        ret_value[1] = 0;
+
+        ret = i2c_transfer(intel_output->i2c_bus, msgs, 3);
+        if (ret != 3) {
+                /* failure in I2C transfer */
+                DRM_DEBUG_KMS("I2c transfer returned %d\n", ret);
+                return;
+        }
+        if (ret_value[0] != SDVO_CMD_STATUS_SUCCESS) {
+                DRM_DEBUG_KMS("DDC switch command returns response %d\n",
+                                        ret_value[0]);
+                return;
+        }
+        return;
 }
 
 static bool intel_sdvo_set_target_input(struct intel_output *intel_output, bool target_0, bool target_1)
@@ -1579,6 +1628,32 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector, u16 response)
         edid = drm_get_edid(&intel_output->base,
                             intel_output->ddc_bus);
 
+        /* This is only applied to SDVO cards with multiple outputs */
+        if (edid == NULL && intel_sdvo_multifunc_encoder(intel_output)) {
+                uint8_t saved_ddc, temp_ddc;
+                saved_ddc = sdvo_priv->ddc_bus;
+                temp_ddc = sdvo_priv->ddc_bus >> 1;
+                /*
+                 * Don't use the 1 as the argument of DDC bus switch to get
+                 * the EDID. It is used for SDVO SPD ROM.
+                 */
+                while(temp_ddc > 1) {
+                        sdvo_priv->ddc_bus = temp_ddc;
+                        edid = drm_get_edid(&intel_output->base,
+                                intel_output->ddc_bus);
+                        if (edid) {
+                                /*
+                                 * When we can get the EDID, maybe it is the
+                                 * correct DDC bus. Update it.
+                                 */
+                                sdvo_priv->ddc_bus = temp_ddc;
+                                break;
+                        }
+                        temp_ddc >>= 1;
+                }
+                if (edid == NULL)
+                        sdvo_priv->ddc_bus = saved_ddc;
+        }
         /* when there is no edid and no monitor is connected with VGA
          * port, try to use the CRT ddc to read the EDID for DVI-connector
          */
@@ -2662,6 +2737,7 @@ static void intel_sdvo_create_enhance_property(struct drm_connector *connector)
 
 bool intel_sdvo_init(struct drm_device *dev, int output_device)
 {
+        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_connector *connector;
         struct intel_output *intel_output;
         struct intel_sdvo_priv *sdvo_priv;
@@ -2708,10 +2784,12 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOB DDC BUS");
                 sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
                                                 "SDVOB/VGA DDC BUS");
+                dev_priv->hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;
         } else {
                 intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOC DDC BUS");
                 sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
                                                 "SDVOC/VGA DDC BUS");
+                dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
         }
 
         if (intel_output->ddc_bus == NULL)
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index b1bc1ea182b8..1175429da102 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -30,12 +30,11 @@ config DRM_NOUVEAU_DEBUG
           via debugfs.
 
 menu "I2C encoder or helper chips"
-     depends on DRM && I2C
+     depends on DRM && DRM_KMS_HELPER && I2C
 
 config DRM_I2C_CH7006
         tristate "Chrontel ch7006 TV encoder"
-        depends on DRM_NOUVEAU
-        default m
+        default m if DRM_NOUVEAU
         help
           Support for Chrontel ch7006 and similar TV encoders, found
           on some nVidia video cards.
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index ba143972769f..d7f8d8b4a4b8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -310,63 +310,22 @@ valid_reg(struct nvbios *bios, uint32_t reg)
         struct drm_device *dev = bios->dev;
 
         /* C51 has misaligned regs on purpose. Marvellous */
-        if (reg & 0x2 || (reg & 0x1 && dev_priv->VBIOS.pub.chip_version != 0x51)) {
-                NV_ERROR(dev, "========== misaligned reg 0x%08X ==========\n",
-                         reg);
-                return 0;
-        }
-        /*
-         * Warn on C51 regs that have not been verified accessible in
-         * mmiotracing
-         */
+        if (reg & 0x2 ||
+            (reg & 0x1 && dev_priv->VBIOS.pub.chip_version != 0x51))
+                NV_ERROR(dev, "======= misaligned reg 0x%08X =======\n", reg);
+
+        /* warn on C51 regs that haven't been verified accessible in tracing */
         if (reg & 0x1 && dev_priv->VBIOS.pub.chip_version == 0x51 &&
             reg != 0x130d && reg != 0x1311 && reg != 0x60081d)
                 NV_WARN(dev, "=== C51 misaligned reg 0x%08X not verified ===\n",
                         reg);
 
-        /* Trust the init scripts on G80 */
-        if (dev_priv->card_type >= NV_50)
-                return 1;
-
-        #define WITHIN(x, y, z) ((x >= y) && (x < y + z))
-        if (WITHIN(reg, NV_PMC_OFFSET, NV_PMC_SIZE))
-                return 1;
-        if (WITHIN(reg, NV_PBUS_OFFSET, NV_PBUS_SIZE))
-                return 1;
-        if (WITHIN(reg, NV_PFIFO_OFFSET, NV_PFIFO_SIZE))
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version >= 0x30 &&
-            (WITHIN(reg, 0x4000, 0x600) || reg == 0x00004600))
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version >= 0x40 &&
-                                                WITHIN(reg, 0xc000, 0x48))
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version >= 0x17 && reg == 0x0000d204)
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version >= 0x40) {
-                if (reg == 0x00011014 || reg == 0x00020328)
-                        return 1;
-                if (WITHIN(reg, 0x88000, NV_PBUS_SIZE)) /* new PBUS */
-                        return 1;
+        if (reg >= (8*1024*1024)) {
+                NV_ERROR(dev, "=== reg 0x%08x out of mapped bounds ===\n", reg);
+                return 0;
         }
-        if (WITHIN(reg, NV_PFB_OFFSET, NV_PFB_SIZE))
-                return 1;
-        if (WITHIN(reg, NV_PEXTDEV_OFFSET, NV_PEXTDEV_SIZE))
-                return 1;
-        if (WITHIN(reg, NV_PCRTC0_OFFSET, NV_PCRTC0_SIZE * 2))
-                return 1;
-        if (WITHIN(reg, NV_PRAMDAC0_OFFSET, NV_PRAMDAC0_SIZE * 2))
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version >= 0x17 && reg == 0x0070fff0)
-                return 1;
-        if (dev_priv->VBIOS.pub.chip_version == 0x51 &&
-                                WITHIN(reg, NV_PRAMIN_OFFSET, NV_PRAMIN_SIZE))
-                return 1;
-        #undef WITHIN
 
-        NV_ERROR(dev, "========== unknown reg 0x%08X ==========\n", reg);
-
-        return 0;
+        return 1;
 }
 
 static bool
@@ -3196,16 +3155,25 @@ static int call_lvds_manufacturer_script(struct drm_device *dev, struct dcb_entr
         }
 #ifdef __powerpc__
         /* Powerbook specific quirks */
-        if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0329))
-                nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
-        if ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0189 || (dev->pci_device & 0xffff) == 0x0329) {
-                if (script == LVDS_PANEL_ON) {
-                        bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL, bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL) | (1 << 31));
-                        bios_wr32(bios, NV_PCRTC_GPIO_EXT, bios_rd32(bios, NV_PCRTC_GPIO_EXT) | 1);
-                }
-                if (script == LVDS_PANEL_OFF) {
-                        bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL, bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL) & ~(1 << 31));
-                        bios_wr32(bios, NV_PCRTC_GPIO_EXT, bios_rd32(bios, NV_PCRTC_GPIO_EXT) & ~3);
+        if ((dev->pci_device & 0xffff) == 0x0179 ||
+            (dev->pci_device & 0xffff) == 0x0189 ||
+            (dev->pci_device & 0xffff) == 0x0329) {
+                if (script == LVDS_RESET) {
+                        nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
+
+                } else if (script == LVDS_PANEL_ON) {
+                        bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,
+                                  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)
+                                  | (1 << 31));
+                        bios_wr32(bios, NV_PCRTC_GPIO_EXT,
+                                  bios_rd32(bios, NV_PCRTC_GPIO_EXT) | 1);
+
+                } else if (script == LVDS_PANEL_OFF) {
+                        bios_wr32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL,
+                                  bios_rd32(bios, NV_PBUS_DEBUG_DUALHEAD_CTL)
+                                  & ~(1 << 31));
+                        bios_wr32(bios, NV_PCRTC_GPIO_EXT,
+                                  bios_rd32(bios, NV_PCRTC_GPIO_EXT) & ~3);
                 }
         }
 #endif
@@ -5434,52 +5402,49 @@ static bool
 parse_dcb15_entry(struct drm_device *dev, struct parsed_dcb *dcb,
                   uint32_t conn, uint32_t conf, struct dcb_entry *entry)
 {
-        if (conn != 0xf0003f00 && conn != 0xf2247f10 && conn != 0xf2204001 &&
-            conn != 0xf2204301 && conn != 0xf2204311 && conn != 0xf2208001 &&
-            conn != 0xf2244001 && conn != 0xf2244301 && conn != 0xf2244311 &&
-            conn != 0xf4204011 && conn != 0xf4208011 && conn != 0xf4248011 &&
-            conn != 0xf2045ff2 && conn != 0xf2045f14 && conn != 0xf207df14 &&
-            conn != 0xf2205004 && conn != 0xf2209004) {
-                NV_ERROR(dev, "Unknown DCB 1.5 entry, please report\n");
-
-                /* cause output setting to fail for !TV, so message is seen */
-                if ((conn & 0xf) != 0x1)
-                        dcb->entries = 0;
-
-                return false;
-        }
-        /* most of the below is a "best guess" atm */
-        entry->type = conn & 0xf;
-        if (entry->type == 2)
-                /* another way of specifying straps based lvds... */
+        switch (conn & 0x0000000f) {
+        case 0:
+                entry->type = OUTPUT_ANALOG;
+                break;
+        case 1:
+                entry->type = OUTPUT_TV;
+                break;
+        case 2:
+        case 3:
                 entry->type = OUTPUT_LVDS;
-        if (entry->type == 4) { /* digital */
-                if (conn & 0x10)
-                        entry->type = OUTPUT_LVDS;
-                else
+                break;
+        case 4:
+                switch ((conn & 0x000000f0) >> 4) {
+                case 0:
                         entry->type = OUTPUT_TMDS;
+                        break;
+                case 1:
+                        entry->type = OUTPUT_LVDS;
+                        break;
+                default:
+                        NV_ERROR(dev, "Unknown DCB subtype 4/%d\n",
+                                 (conn & 0x000000f0) >> 4);
+                        return false;
+                }
+                break;
+        default:
+                NV_ERROR(dev, "Unknown DCB type %d\n", conn & 0x0000000f);
+                return false;
         }
-        /* what's in bits 5-13? could be some encoder maker thing, in tv case */
-        entry->i2c_index = (conn >> 14) & 0xf;
-        /* raw heads field is in range 0-1, so move to 1-2 */
-        entry->heads = ((conn >> 18) & 0x7) + 1;
-        entry->location = (conn >> 21) & 0xf;
-        /* unused: entry->bus = (conn >> 25) & 0x7; */
-        /* set or to be same as heads -- hopefully safe enough */
-        entry->or = entry->heads;
+
+        entry->i2c_index = (conn & 0x0003c000) >> 14;
+        entry->heads = ((conn & 0x001c0000) >> 18) + 1;
+        entry->or = entry->heads; /* same as heads, hopefully safe enough */
+        entry->location = (conn & 0x01e00000) >> 21;
+        entry->bus = (conn & 0x0e000000) >> 25;
         entry->duallink_possible = false;
 
         switch (entry->type) {
         case OUTPUT_ANALOG:
                 entry->crtconf.maxfreq = (conf & 0xffff) * 10;
                 break;
-        case OUTPUT_LVDS:
-                /*
-                 * This is probably buried in conn's unknown bits.
-                 * This will upset EDID-ful models, if they exist
-                 */
-                entry->lvdsconf.use_straps_for_mode = true;
-                entry->lvdsconf.use_power_scripts = true;
+        case OUTPUT_TV:
+                entry->tvconf.has_component_output = false;
                 break;
         case OUTPUT_TMDS:
                 /*
@@ -5488,8 +5453,12 @@ parse_dcb15_entry(struct drm_device *dev, struct parsed_dcb *dcb,
                  */
                 fabricate_vga_output(dcb, entry->i2c_index, entry->heads);
                 break;
-        case OUTPUT_TV:
-                entry->tvconf.has_component_output = false;
+        case OUTPUT_LVDS:
+                if ((conn & 0x00003f00) != 0x10)
+                        entry->lvdsconf.use_straps_for_mode = true;
+                entry->lvdsconf.use_power_scripts = true;
+                break;
+        default:
                 break;
         }
 
@@ -5564,11 +5533,13 @@ void merge_like_dcb_entries(struct drm_device *dev, struct parsed_dcb *dcb)
         dcb->entries = newentries;
 }
 
-static int parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
+static int
+parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
 {
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct bios_parsed_dcb *bdcb = &bios->bdcb;
         struct parsed_dcb *dcb;
-        uint16_t dcbptr, i2ctabptr = 0;
+        uint16_t dcbptr = 0, i2ctabptr = 0;
         uint8_t *dcbtable;
         uint8_t headerlen = 0x4, entries = DCB_MAX_NUM_ENTRIES;
         bool configblock = true;
@@ -5579,16 +5550,18 @@ static int parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool two
         dcb->entries = 0;
 
         /* get the offset from 0x36 */
-        dcbptr = ROM16(bios->data[0x36]);
+        if (dev_priv->card_type > NV_04) {
+                dcbptr = ROM16(bios->data[0x36]);
+                if (dcbptr == 0x0000)
+                        NV_WARN(dev, "No output data (DCB) found in BIOS\n");
+        }
 
+        /* this situation likely means a really old card, pre DCB */
         if (dcbptr == 0x0) {
-                NV_WARN(dev, "No output data (DCB) found in BIOS, "
-                               "assuming a CRT output exists\n");
-                /* this situation likely means a really old card, pre DCB */
+                NV_INFO(dev, "Assuming a CRT output exists\n");
                 fabricate_vga_output(dcb, LEGACY_I2C_CRT, 1);
 
-                if (nv04_tv_identify(dev,
-                                     bios->legacy.i2c_indices.tv) >= 0)
+                if (nv04_tv_identify(dev, bios->legacy.i2c_indices.tv) >= 0)
                         fabricate_tv_output(dcb, twoHeads);
 
                 return 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 0cad6d834eb2..db0ed4c13f98 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -33,10 +33,13 @@
 #include "nouveau_drv.h"
 #include "nouveau_dma.h"
 
+#include <linux/log2.h>
+
 static void
 nouveau_bo_del_ttm(struct ttm_buffer_object *bo)
 {
         struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
+        struct drm_device *dev = dev_priv->dev;
         struct nouveau_bo *nvbo = nouveau_bo(bo);
 
         ttm_bo_kunmap(&nvbo->kmap);
@@ -44,12 +47,87 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo)
         if (unlikely(nvbo->gem))
                 DRM_ERROR("bo %p still attached to GEM object\n", bo);
 
+        if (nvbo->tile)
+                nv10_mem_expire_tiling(dev, nvbo->tile, NULL);
+
         spin_lock(&dev_priv->ttm.bo_list_lock);
         list_del(&nvbo->head);
         spin_unlock(&dev_priv->ttm.bo_list_lock);
         kfree(nvbo);
 }
 
+static void
+nouveau_bo_fixup_align(struct drm_device *dev,
+                       uint32_t tile_mode, uint32_t tile_flags,
+                       int *align, int *size)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+        /*
+         * Some of the tile_flags have a periodic structure of N*4096 bytes,
+         * align to to that as well as the page size. Overallocate memory to
+         * avoid corruption of other buffer objects.
+         */
+        if (dev_priv->card_type == NV_50) {
+                uint32_t block_size = nouveau_mem_fb_amount(dev) >> 15;
+                int i;
+
+                switch (tile_flags) {
+                case 0x1800:
+                case 0x2800:
+                case 0x4800:
+                case 0x7a00:
+                        *size = roundup(*size, block_size);
+                        if (is_power_of_2(block_size)) {
+                                *size += 3 * block_size;
+                                for (i = 1; i < 10; i++) {
+                                        *align = 12 * i * block_size;
+                                        if (!(*align % 65536))
+                                                break;
+                                }
+                        } else {
+                                *size += 6 * block_size;
+                                for (i = 1; i < 10; i++) {
+                                        *align = 8 * i * block_size;
+                                        if (!(*align % 65536))
+                                                break;
+                                }
+                        }
+                        break;
+                default:
+                        break;
+                }
+
+        } else {
+                if (tile_mode) {
+                        if (dev_priv->chipset >= 0x40) {
+                                *align = 65536;
+                                *size = roundup(*size, 64 * tile_mode);
+
+                        } else if (dev_priv->chipset >= 0x30) {
+                                *align = 32768;
+                                *size = roundup(*size, 64 * tile_mode);
+
+                        } else if (dev_priv->chipset >= 0x20) {
+                                *align = 16384;
+                                *size = roundup(*size, 64 * tile_mode);
+
+                        } else if (dev_priv->chipset >= 0x10) {
+                                *align = 16384;
+                                *size = roundup(*size, 32 * tile_mode);
+                        }
+                }
+        }
+
+        /* ALIGN works only on powers of two. */
+        *size = roundup(*size, PAGE_SIZE);
+
+        if (dev_priv->card_type == NV_50) {
+                *size = roundup(*size, 65536);
+                *align = max(65536, *align);
+        }
+}
+
 int
 nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan,
                int size, int align, uint32_t flags, uint32_t tile_mode,
@@ -58,7 +136,7 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan,
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_bo *nvbo;
-        int ret, n = 0;
+        int ret = 0;
 
         nvbo = kzalloc(sizeof(struct nouveau_bo), GFP_KERNEL);
         if (!nvbo)
@@ -70,59 +148,14 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan,
         nvbo->tile_mode = tile_mode;
         nvbo->tile_flags = tile_flags;
 
-        /*
-         * Some of the tile_flags have a periodic structure of N*4096 bytes,
-         * align to to that as well as the page size. Overallocate memory to
-         * avoid corruption of other buffer objects.
-         */
-        switch (tile_flags) {
-        case 0x1800:
-        case 0x2800:
-        case 0x4800:
-        case 0x7a00:
-                if (dev_priv->chipset >= 0xA0) {
-                        /* This is based on high end cards with 448 bits
-                         * memory bus, could be different elsewhere.*/
-                        size += 6 * 28672;
-                        /* 8 * 28672 is the actual alignment requirement,
-                         * but we must also align to page size. */
-                        align = 2 * 8 * 28672;
-                } else if (dev_priv->chipset >= 0x90) {
-                        size += 3 * 16384;
-                        align = 12 * 16834;
-                } else {
-                        size += 3 * 8192;
-                        /* 12 * 8192 is the actual alignment requirement,
-                         * but we must also align to page size. */
-                        align = 2 * 12 * 8192;
-                }
-                break;
-        default:
-                break;
-        }
-
+        nouveau_bo_fixup_align(dev, tile_mode, tile_flags, &align, &size);
         align >>= PAGE_SHIFT;
 
-        size = (size + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
-        if (dev_priv->card_type == NV_50) {
-                size = (size + 65535) & ~65535;
-                if (align < (65536 / PAGE_SIZE))
-                        align = (65536 / PAGE_SIZE);
-        }
-
-        if (flags & TTM_PL_FLAG_VRAM)
-                nvbo->placements[n++] = TTM_PL_FLAG_VRAM | TTM_PL_MASK_CACHING;
-        if (flags & TTM_PL_FLAG_TT)
-                nvbo->placements[n++] = TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
         nvbo->placement.fpfn = 0;
         nvbo->placement.lpfn = mappable ? dev_priv->fb_mappable_pages : 0;
-        nvbo->placement.placement = nvbo->placements;
-        nvbo->placement.busy_placement = nvbo->placements;
-        nvbo->placement.num_placement = n;
-        nvbo->placement.num_busy_placement = n;
+        nouveau_bo_placement_set(nvbo, flags);
 
         nvbo->channel = chan;
-        nouveau_bo_placement_set(nvbo, flags);
         ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size,
                           ttm_bo_type_device, &nvbo->placement, align, 0,
                           false, NULL, size, nouveau_bo_del_ttm);
@@ -421,6 +454,7 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 /* GPU-assisted copy using NV_MEMORY_TO_MEMORY_FORMAT, can access
  * TTM_PL_{VRAM,TT} directly.
  */
+
 static int
 nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
                               struct nouveau_bo *nvbo, bool evict, bool no_wait,
@@ -435,6 +469,8 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
 
         ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
                                         evict, no_wait, new_mem);
+        if (nvbo->channel && nvbo->channel != chan)
+                ret = nouveau_fence_wait(fence, NULL, false, false);
         nouveau_fence_unref((void *)&fence);
         return ret;
 }
@@ -455,11 +491,12 @@ nouveau_bo_mem_ctxdma(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
 }
 
 static int
-nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, int no_wait,
-                     struct ttm_mem_reg *old_mem, struct ttm_mem_reg *new_mem)
+nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
+                     int no_wait, struct ttm_mem_reg *new_mem)
 {
         struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
+        struct ttm_mem_reg *old_mem = &bo->mem;
         struct nouveau_channel *chan;
         uint64_t src_offset, dst_offset;
         uint32_t page_count;
@@ -547,7 +584,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         placement.fpfn = placement.lpfn = 0;
         placement.num_placement = placement.num_busy_placement = 1;
-        placement.placement = &placement_memtype;
+        placement.placement = placement.busy_placement = &placement_memtype;
 
         tmp_mem = *new_mem;
         tmp_mem.mm_node = NULL;
@@ -559,7 +596,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
         if (ret)
                 goto out;
 
-        ret = nouveau_bo_move_m2mf(bo, true, no_wait, &bo->mem, &tmp_mem);
+        ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait, &tmp_mem);
         if (ret)
                 goto out;
 
@@ -585,7 +622,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         placement.fpfn = placement.lpfn = 0;
         placement.num_placement = placement.num_busy_placement = 1;
-        placement.placement = &placement_memtype;
+        placement.placement = placement.busy_placement = &placement_memtype;
 
         tmp_mem = *new_mem;
         tmp_mem.mm_node = NULL;
@@ -597,7 +634,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
         if (ret)
                 goto out;
 
-        ret = nouveau_bo_move_m2mf(bo, true, no_wait, &bo->mem, new_mem);
+        ret = nouveau_bo_move_m2mf(bo, evict, intr, no_wait, new_mem);
         if (ret)
                 goto out;
 
@@ -612,52 +649,106 @@ out:
 }
 
 static int
-nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
-                bool no_wait, struct ttm_mem_reg *new_mem)
+nouveau_bo_vm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem,
+                   struct nouveau_tile_reg **new_tile)
 {
         struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
-        struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct drm_device *dev = dev_priv->dev;
-        struct ttm_mem_reg *old_mem = &bo->mem;
+        struct nouveau_bo *nvbo = nouveau_bo(bo);
+        uint64_t offset;
         int ret;
 
-        if (dev_priv->card_type == NV_50 && new_mem->mem_type == TTM_PL_VRAM &&
-            !nvbo->no_vm) {
-                uint64_t offset = new_mem->mm_node->start << PAGE_SHIFT;
+        if (nvbo->no_vm || new_mem->mem_type != TTM_PL_VRAM) {
+                /* Nothing to do. */
+                *new_tile = NULL;
+                return 0;
+        }
+
+        offset = new_mem->mm_node->start << PAGE_SHIFT;
 
+        if (dev_priv->card_type == NV_50) {
                 ret = nv50_mem_vm_bind_linear(dev,
                                               offset + dev_priv->vm_vram_base,
                                               new_mem->size, nvbo->tile_flags,
                                               offset);
                 if (ret)
                         return ret;
+
+        } else if (dev_priv->card_type >= NV_10) {
+                *new_tile = nv10_mem_set_tiling(dev, offset, new_mem->size,
+                                                nvbo->tile_mode);
         }
 
+        return 0;
+}
+
+static void
+nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,
+                      struct nouveau_tile_reg *new_tile,
+                      struct nouveau_tile_reg **old_tile)
+{
+        struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
+        struct drm_device *dev = dev_priv->dev;
+
+        if (dev_priv->card_type >= NV_10 &&
+            dev_priv->card_type < NV_50) {
+                if (*old_tile)
+                        nv10_mem_expire_tiling(dev, *old_tile, bo->sync_obj);
+
+                *old_tile = new_tile;
+        }
+}
+
+static int
+nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
+                bool no_wait, struct ttm_mem_reg *new_mem)
+{
+        struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
+        struct nouveau_bo *nvbo = nouveau_bo(bo);
+        struct ttm_mem_reg *old_mem = &bo->mem;
+        struct nouveau_tile_reg *new_tile = NULL;
+        int ret = 0;
+
+        ret = nouveau_bo_vm_bind(bo, new_mem, &new_tile);
+        if (ret)
+                return ret;
+
+        /* Software copy if the card isn't up and running yet. */
         if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE ||
-            !dev_priv->channel)
-                return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+            !dev_priv->channel) {
+                ret = ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+                goto out;
+        }
 
+        /* Fake bo copy. */
         if (old_mem->mem_type == TTM_PL_SYSTEM && !bo->ttm) {
                 BUG_ON(bo->mem.mm_node != NULL);
                 bo->mem = *new_mem;
                 new_mem->mm_node = NULL;
-                return 0;
+                goto out;
         }
 
-        if (new_mem->mem_type == TTM_PL_SYSTEM) {
-                if (old_mem->mem_type == TTM_PL_SYSTEM)
-                        return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-                if (nouveau_bo_move_flipd(bo, evict, intr, no_wait, new_mem))
-                        return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-        } else if (old_mem->mem_type == TTM_PL_SYSTEM) {
-                if (nouveau_bo_move_flips(bo, evict, intr, no_wait, new_mem))
-                        return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-        } else {
-                if (nouveau_bo_move_m2mf(bo, evict, no_wait, old_mem, new_mem))
-                        return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-        }
+        /* Hardware assisted copy. */
+        if (new_mem->mem_type == TTM_PL_SYSTEM)
+                ret = nouveau_bo_move_flipd(bo, evict, intr, no_wait, new_mem);
+        else if (old_mem->mem_type == TTM_PL_SYSTEM)
+                ret = nouveau_bo_move_flips(bo, evict, intr, no_wait, new_mem);
+        else
+                ret = nouveau_bo_move_m2mf(bo, evict, intr, no_wait, new_mem);
 
-        return 0;
+        if (!ret)
+                goto out;
+
+        /* Fallback to software copy. */
+        ret = ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+
+out:
+        if (ret)
+                nouveau_bo_vm_cleanup(bo, NULL, &new_tile);
+        else
+                nouveau_bo_vm_cleanup(bo, new_tile, &nvbo->tile);
+
+        return ret;
 }
 
 static int
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 9aaa972f8822..343d718a9667 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -158,6 +158,8 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
                 return ret;
         }
 
+        nouveau_dma_pre_init(chan);
+
         /* Locate channel's user control regs */
         if (dev_priv->card_type < NV_40)
                 user = NV03_USER(channel);
@@ -235,47 +237,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
         return 0;
 }
 
-int
-nouveau_channel_idle(struct nouveau_channel *chan)
-{
-        struct drm_device *dev = chan->dev;
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_engine *engine = &dev_priv->engine;
-        uint32_t caches;
-        int idle;
-
-        if (!chan) {
-                NV_ERROR(dev, "no channel...\n");
-                return 1;
-        }
-
-        caches = nv_rd32(dev, NV03_PFIFO_CACHES);
-        nv_wr32(dev, NV03_PFIFO_CACHES, caches & ~1);
-
-        if (engine->fifo.channel_id(dev) != chan->id) {
-                struct nouveau_gpuobj *ramfc =
-                        chan->ramfc ? chan->ramfc->gpuobj : NULL;
-
-                if (!ramfc) {
-                        NV_ERROR(dev, "No RAMFC for channel %d\n", chan->id);
-                        return 1;
-                }
-
-                engine->instmem.prepare_access(dev, false);
-                if (nv_ro32(dev, ramfc, 0) != nv_ro32(dev, ramfc, 1))
-                        idle = 0;
-                else
-                        idle = 1;
-                engine->instmem.finish_access(dev);
-        } else {
-                idle = (nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_GET) ==
-                        nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUT));
-        }
-
-        nv_wr32(dev, NV03_PFIFO_CACHES, caches);
-        return idle;
-}
-
 /* stops a fifo */
 void
 nouveau_channel_free(struct nouveau_channel *chan)
@@ -414,7 +375,9 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
                 init->subchan[0].grclass = 0x0039;
         else
                 init->subchan[0].grclass = 0x5039;
-        init->nr_subchan = 1;
+        init->subchan[1].handle = NvSw;
+        init->subchan[1].grclass = NV_SW;
+        init->nr_subchan = 2;
 
         /* Named memory object area */
         ret = drm_gem_handle_create(file_priv, chan->notifier_bo->gem,
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 5a10deb8bdbd..7e6d673f3a23 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -24,9 +24,12 @@
  *
  */
 
+#include <acpi/button.h>
+
 #include "drmP.h"
 #include "drm_edid.h"
 #include "drm_crtc_helper.h"
+
 #include "nouveau_reg.h"
 #include "nouveau_drv.h"
 #include "nouveau_encoder.h"
@@ -83,14 +86,16 @@ nouveau_encoder_connector_get(struct nouveau_encoder *encoder)
 static void
 nouveau_connector_destroy(struct drm_connector *drm_connector)
 {
-        struct nouveau_connector *connector = nouveau_connector(drm_connector);
-        struct drm_device *dev = connector->base.dev;
+        struct nouveau_connector *nv_connector =
+                nouveau_connector(drm_connector);
+        struct drm_device *dev = nv_connector->base.dev;
 
         NV_DEBUG_KMS(dev, "\n");
 
-        if (!connector)
+        if (!nv_connector)
                 return;
 
+        kfree(nv_connector->edid);
         drm_sysfs_connector_remove(drm_connector);
         drm_connector_cleanup(drm_connector);
         kfree(drm_connector);
@@ -233,10 +238,21 @@ nouveau_connector_detect(struct drm_connector *connector)
         if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
                 nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
         if (nv_encoder && nv_connector->native_mode) {
+#ifdef CONFIG_ACPI
+                if (!nouveau_ignorelid && !acpi_lid_open())
+                        return connector_status_disconnected;
+#endif
                 nouveau_connector_set_encoder(connector, nv_encoder);
                 return connector_status_connected;
         }
 
+        /* Cleanup the previous EDID block. */
+        if (nv_connector->edid) {
+                drm_mode_connector_update_edid_property(connector, NULL);
+                kfree(nv_connector->edid);
+                nv_connector->edid = NULL;
+        }
+
         i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
         if (i2c) {
                 nouveau_connector_ddc_prepare(connector, &flags);
@@ -247,7 +263,7 @@ nouveau_connector_detect(struct drm_connector *connector)
                 if (!nv_connector->edid) {
                         NV_ERROR(dev, "DDC responded, but no EDID for %s\n",
                                  drm_get_connector_name(connector));
-                        return connector_status_disconnected;
+                        goto detect_analog;
                 }
 
                 if (nv_encoder->dcb->type == OUTPUT_DP &&
@@ -281,6 +297,7 @@ nouveau_connector_detect(struct drm_connector *connector)
                 return connector_status_connected;
         }
 
+detect_analog:
         nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);
         if (!nv_encoder)
                 nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);
@@ -687,8 +704,12 @@ nouveau_connector_create_lvds(struct drm_device *dev,
          */
         if (!nv_connector->edid && !nv_connector->native_mode &&
             !dev_priv->VBIOS.pub.fp_no_ddc) {
-                nv_connector->edid =
+                struct edid *edid =
                         (struct edid *)nouveau_bios_embedded_edid(dev);
+                if (edid) {
+                        nv_connector->edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                        *(nv_connector->edid) = *edid;
+                }
         }
 
         if (!nv_connector->edid)
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 703553687b20..50d9e67745af 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -29,12 +29,22 @@
 #include "nouveau_drv.h"
 #include "nouveau_dma.h"
 
+void
+nouveau_dma_pre_init(struct nouveau_channel *chan)
+{
+        chan->dma.max  = (chan->pushbuf_bo->bo.mem.size >> 2) - 2;
+        chan->dma.put  = 0;
+        chan->dma.cur  = chan->dma.put;
+        chan->dma.free = chan->dma.max - chan->dma.cur;
+}
+
 int
 nouveau_dma_init(struct nouveau_channel *chan)
 {
         struct drm_device *dev = chan->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_gpuobj *m2mf = NULL;
+        struct nouveau_gpuobj *nvsw = NULL;
         int ret, i;
 
         /* Create NV_MEMORY_TO_MEMORY_FORMAT for buffer moves */
@@ -47,6 +57,15 @@ nouveau_dma_init(struct nouveau_channel *chan)
         if (ret)
                 return ret;
 
+        /* Create an NV_SW object for various sync purposes */
+        ret = nouveau_gpuobj_sw_new(chan, NV_SW, &nvsw);
+        if (ret)
+                return ret;
+
+        ret = nouveau_gpuobj_ref_add(dev, chan, NvSw, nvsw, NULL);
+        if (ret)
+                return ret;
+
         /* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */
         ret = nouveau_notifier_alloc(chan, NvNotify0, 32, &chan->m2mf_ntfy);
         if (ret)
@@ -64,12 +83,6 @@ nouveau_dma_init(struct nouveau_channel *chan)
                         return ret;
         }
 
-        /* Initialise DMA vars */
-        chan->dma.max  = (chan->pushbuf_bo->bo.mem.size >> 2) - 2;
-        chan->dma.put  = 0;
-        chan->dma.cur  = chan->dma.put;
-        chan->dma.free = chan->dma.max - chan->dma.cur;
-
         /* Insert NOPS for NOUVEAU_DMA_SKIPS */
         ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);
         if (ret)
@@ -87,6 +100,13 @@ nouveau_dma_init(struct nouveau_channel *chan)
         BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
         OUT_RING(chan, NvNotify0);
 
+        /* Initialise NV_SW */
+        ret = RING_SPACE(chan, 2);
+        if (ret)
+                return ret;
+        BEGIN_RING(chan, NvSubSw, 0, 1);
+        OUT_RING(chan, NvSw);
+
         /* Sit back and pray the channel works.. */
         FIRE_RING(chan);
 
@@ -106,47 +126,52 @@ OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords)
         chan->dma.cur += nr_dwords;
 }
 
-static inline bool
-READ_GET(struct nouveau_channel *chan, uint32_t *get)
+/* Fetch and adjust GPU GET pointer
+ *
+ * Returns:
+ *  value >= 0, the adjusted GET pointer
+ *  -EINVAL if GET pointer currently outside main push buffer
+ *  -EBUSY if timeout exceeded
+ */
+static inline int
+READ_GET(struct nouveau_channel *chan, uint32_t *prev_get, uint32_t *timeout)
 {
         uint32_t val;
 
         val = nvchan_rd32(chan, chan->user_get);
-        if (val < chan->pushbuf_base ||
-            val >= chan->pushbuf_base + chan->pushbuf_bo->bo.mem.size) {
-                /* meaningless to dma_wait() except to know whether the
-                 * GPU has stalled or not
-                 */
-                *get = val;
-                return false;
+
+        /* reset counter as long as GET is still advancing, this is
+         * to avoid misdetecting a GPU lockup if the GPU happens to
+         * just be processing an operation that takes a long time
+         */
+        if (val != *prev_get) {
+                *prev_get = val;
+                *timeout = 0;
+        }
+
+        if ((++*timeout & 0xff) == 0) {
+                DRM_UDELAY(1);
+                if (*timeout > 100000)
+                        return -EBUSY;
         }
 
-        *get = (val - chan->pushbuf_base) >> 2;
-        return true;
+        if (val < chan->pushbuf_base ||
+            val > chan->pushbuf_base + (chan->dma.max << 2))
+                return -EINVAL;
+
+        return (val - chan->pushbuf_base) >> 2;
 }
 
 int
 nouveau_dma_wait(struct nouveau_channel *chan, int size)
 {
-        uint32_t get, prev_get = 0, cnt = 0;
-        bool get_valid;
+        uint32_t prev_get = 0, cnt = 0;
+        int get;
 
         while (chan->dma.free < size) {
-                /* reset counter as long as GET is still advancing, this is
-                 * to avoid misdetecting a GPU lockup if the GPU happens to
-                 * just be processing an operation that takes a long time
-                 */
-                get_valid = READ_GET(chan, &get);
-                if (get != prev_get) {
-                        prev_get = get;
-                        cnt = 0;
-                }
-
-                if ((++cnt & 0xff) == 0) {
-                        DRM_UDELAY(1);
-                        if (cnt > 100000)
-                                return -EBUSY;
-                }
+                get = READ_GET(chan, &prev_get, &cnt);
+                if (unlikely(get == -EBUSY))
+                        return -EBUSY;
 
                 /* loop until we have a usable GET pointer.  the value
                  * we read from the GPU may be outside the main ring if
@@ -157,7 +182,7 @@ nouveau_dma_wait(struct nouveau_channel *chan, int size)
                  * from the SKIPS area, so the code below doesn't have to deal
                  * with some fun corner cases.
                  */
-                if (!get_valid || get < NOUVEAU_DMA_SKIPS)
+                if (unlikely(get == -EINVAL) || get < NOUVEAU_DMA_SKIPS)
                         continue;
 
                 if (get <= chan->dma.cur) {
@@ -183,6 +208,19 @@ nouveau_dma_wait(struct nouveau_channel *chan, int size)
                          * after processing the currently pending commands.
                          */
                         OUT_RING(chan, chan->pushbuf_base | 0x20000000);
+
+                        /* wait for GET to depart from the skips area.
+                         * prevents writing GET==PUT and causing a race
+                         * condition that causes us to think the GPU is
+                         * idle when it's not.
+                         */
+                        do {
+                                get = READ_GET(chan, &prev_get, &cnt);
+                                if (unlikely(get == -EBUSY))
+                                        return -EBUSY;
+                                if (unlikely(get == -EINVAL))
+                                        continue;
+                        } while (get <= NOUVEAU_DMA_SKIPS);
                         WRITE_PUT(NOUVEAU_DMA_SKIPS);
 
                         /* we're now submitting commands at the start of
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index 04e85d8f757e..dabfd655f93e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -46,10 +46,11 @@
 /* Hardcoded object assignments to subchannels (subchannel id). */
 enum {
         NvSubM2MF       = 0,
-        NvSub2D         = 1,
-        NvSubCtxSurf2D  = 1,
-        NvSubGdiRect    = 2,
-        NvSubImageBlit  = 3
+        NvSubSw         = 1,
+        NvSub2D         = 2,
+        NvSubCtxSurf2D  = 2,
+        NvSubGdiRect    = 3,
+        NvSubImageBlit  = 4
 };
 
 /* Object handles. */
@@ -67,6 +68,7 @@ enum {
         NvClipRect      = 0x8000000b,
         NvGdiRect       = 0x8000000c,
         NvImageBlit     = 0x8000000d,
+        NvSw            = 0x8000000e,
 
         /* G80+ display objects */
         NvEvoVRAM       = 0x01000000,
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 9e2926c48579..dd4937224220 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -490,7 +490,8 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
                 if (!nv_wait(NV50_AUXCH_CTRL(index), 0x00010000, 0x00000000)) {
                         NV_ERROR(dev, "expected bit 16 == 0, got 0x%08x\n",
                                  nv_rd32(dev, NV50_AUXCH_CTRL(index)));
-                        return -EBUSY;
+                        ret = -EBUSY;
+                        goto out;
                 }
 
                 udelay(400);
@@ -501,6 +502,11 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
                         break;
         }
 
+        if ((stat & NV50_AUXCH_STAT_COUNT) != data_nr) {
+                ret = -EREMOTEIO;
+                goto out;
+        }
+
         if (cmd & 1) {
                 for (i = 0; i < 4; i++) {
                         data32[i] = nv_rd32(dev, NV50_AUXCH_DATA_IN(index, i));
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 06eb993e0883..343ab7f17ccc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -71,6 +71,10 @@ MODULE_PARM_DESC(uscript_tmds, "TMDS output script table ID (>=GeForce 8)");
 int nouveau_uscript_tmds = -1;
 module_param_named(uscript_tmds, nouveau_uscript_tmds, int, 0400);
 
+MODULE_PARM_DESC(ignorelid, "Ignore ACPI lid status");
+int nouveau_ignorelid = 0;
+module_param_named(ignorelid, nouveau_ignorelid, int, 0400);
+
 MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
                  "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"
                  "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 5f8cbb79c499..6b9690418bc7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -59,11 +59,19 @@ struct nouveau_grctx;
 #define MAX_NUM_DCB_ENTRIES 16
 
 #define NOUVEAU_MAX_CHANNEL_NR 128
+#define NOUVEAU_MAX_TILE_NR 15
 
 #define NV50_VM_MAX_VRAM (2*1024*1024*1024ULL)
 #define NV50_VM_BLOCK    (512*1024*1024ULL)
 #define NV50_VM_VRAM_NR  (NV50_VM_MAX_VRAM / NV50_VM_BLOCK)
 
+struct nouveau_tile_reg {
+        struct nouveau_fence *fence;
+        uint32_t addr;
+        uint32_t size;
+        bool used;
+};
+
 struct nouveau_bo {
         struct ttm_buffer_object bo;
         struct ttm_placement placement;
@@ -83,6 +91,7 @@ struct nouveau_bo {
 
         uint32_t tile_mode;
         uint32_t tile_flags;
+        struct nouveau_tile_reg *tile;
 
         struct drm_gem_object *gem;
         struct drm_file *cpu_filp;
@@ -277,8 +286,13 @@ struct nouveau_timer_engine {
 };
 
 struct nouveau_fb_engine {
+        int num_tiles;
+
         int  (*init)(struct drm_device *dev);
         void (*takedown)(struct drm_device *dev);
+
+        void (*set_region_tiling)(struct drm_device *dev, int i, uint32_t addr,
+                                 uint32_t size, uint32_t pitch);
 };
 
 struct nouveau_fifo_engine {
@@ -292,6 +306,8 @@ struct nouveau_fifo_engine {
         void (*disable)(struct drm_device *);
         void (*enable)(struct drm_device *);
         bool (*reassign)(struct drm_device *, bool enable);
+        bool (*cache_flush)(struct drm_device *dev);
+        bool (*cache_pull)(struct drm_device *dev, bool enable);
 
         int  (*channel_id)(struct drm_device *);
 
@@ -330,6 +346,9 @@ struct nouveau_pgraph_engine {
         void (*destroy_context)(struct nouveau_channel *);
         int  (*load_context)(struct nouveau_channel *);
         int  (*unload_context)(struct drm_device *);
+
+        void (*set_region_tiling)(struct drm_device *dev, int i, uint32_t addr,
+                                  uint32_t size, uint32_t pitch);
 };
 
 struct nouveau_engine {
@@ -490,6 +509,8 @@ struct drm_nouveau_private {
         void __iomem *ramin;
         uint32_t ramin_size;
 
+        struct nouveau_bo *vga_ram;
+
         struct workqueue_struct *wq;
         struct work_struct irq_work;
 
@@ -548,6 +569,12 @@ struct drm_nouveau_private {
                 unsigned long sg_handle;
         } gart_info;
 
+        /* nv10-nv40 tiling regions */
+        struct {
+                struct nouveau_tile_reg reg[NOUVEAU_MAX_TILE_NR];
+                spinlock_t lock;
+        } tile;
+
         /* G8x/G9x virtual address space */
         uint64_t vm_gart_base;
         uint64_t vm_gart_size;
@@ -650,6 +677,7 @@ extern char *nouveau_tv_norm;
 extern int nouveau_reg_debug;
 extern char *nouveau_vbios;
 extern int nouveau_ctxfw;
+extern int nouveau_ignorelid;
 
 /* nouveau_state.c */
 extern void nouveau_preclose(struct drm_device *dev, struct drm_file *);
@@ -685,6 +713,13 @@ extern void nouveau_mem_release(struct drm_file *, struct mem_block *heap);
 extern int  nouveau_mem_init(struct drm_device *);
 extern int  nouveau_mem_init_agp(struct drm_device *);
 extern void nouveau_mem_close(struct drm_device *);
+extern struct nouveau_tile_reg *nv10_mem_set_tiling(struct drm_device *dev,
+                                                    uint32_t addr,
+                                                    uint32_t size,
+                                                    uint32_t pitch);
+extern void nv10_mem_expire_tiling(struct drm_device *dev,
+                                   struct nouveau_tile_reg *tile,
+                                   struct nouveau_fence *fence);
 extern int  nv50_mem_vm_bind_linear(struct drm_device *, uint64_t virt,
                                     uint32_t size, uint32_t flags,
                                     uint64_t phys);
@@ -713,7 +748,6 @@ extern int  nouveau_channel_alloc(struct drm_device *dev,
                                   struct drm_file *file_priv,
                                   uint32_t fb_ctxdma, uint32_t tt_ctxdma);
 extern void nouveau_channel_free(struct nouveau_channel *);
-extern int  nouveau_channel_idle(struct nouveau_channel *chan);
 
 /* nouveau_object.c */
 extern int  nouveau_gpuobj_early_init(struct drm_device *);
@@ -756,6 +790,8 @@ extern int nouveau_gpuobj_gart_dma_new(struct nouveau_channel *,
                                        uint32_t *o_ret);
 extern int nouveau_gpuobj_gr_new(struct nouveau_channel *, int class,
                                  struct nouveau_gpuobj **);
+extern int nouveau_gpuobj_sw_new(struct nouveau_channel *, int class,
+                                 struct nouveau_gpuobj **);
 extern int nouveau_ioctl_grobj_alloc(struct drm_device *, void *data,
                                      struct drm_file *);
 extern int nouveau_ioctl_gpuobj_free(struct drm_device *, void *data,
@@ -804,6 +840,7 @@ nouveau_debugfs_channel_fini(struct nouveau_channel *chan)
 #endif
 
 /* nouveau_dma.c */
+extern void nouveau_dma_pre_init(struct nouveau_channel *);
 extern int  nouveau_dma_init(struct nouveau_channel *);
 extern int  nouveau_dma_wait(struct nouveau_channel *, int size);
 
@@ -879,16 +916,22 @@ extern void nv04_fb_takedown(struct drm_device *);
 /* nv10_fb.c */
 extern int  nv10_fb_init(struct drm_device *);
 extern void nv10_fb_takedown(struct drm_device *);
+extern void nv10_fb_set_region_tiling(struct drm_device *, int, uint32_t,
+                                      uint32_t, uint32_t);
 
 /* nv40_fb.c */
 extern int  nv40_fb_init(struct drm_device *);
 extern void nv40_fb_takedown(struct drm_device *);
+extern void nv40_fb_set_region_tiling(struct drm_device *, int, uint32_t,
+                                      uint32_t, uint32_t);
 
 /* nv04_fifo.c */
 extern int  nv04_fifo_init(struct drm_device *);
 extern void nv04_fifo_disable(struct drm_device *);
 extern void nv04_fifo_enable(struct drm_device *);
 extern bool nv04_fifo_reassign(struct drm_device *, bool);
+extern bool nv04_fifo_cache_flush(struct drm_device *);
+extern bool nv04_fifo_cache_pull(struct drm_device *, bool);
 extern int  nv04_fifo_channel_id(struct drm_device *);
 extern int  nv04_fifo_create_context(struct nouveau_channel *);
 extern void nv04_fifo_destroy_context(struct nouveau_channel *);
@@ -941,6 +984,8 @@ extern void nv10_graph_destroy_context(struct nouveau_channel *);
 extern int  nv10_graph_load_context(struct nouveau_channel *);
 extern int  nv10_graph_unload_context(struct drm_device *);
 extern void nv10_graph_context_switch(struct drm_device *);
+extern void nv10_graph_set_region_tiling(struct drm_device *, int, uint32_t,
+                                         uint32_t, uint32_t);
 
 /* nv20_graph.c */
 extern struct nouveau_pgraph_object_class nv20_graph_grclass[];
@@ -952,6 +997,8 @@ extern int  nv20_graph_unload_context(struct drm_device *);
 extern int  nv20_graph_init(struct drm_device *);
 extern void nv20_graph_takedown(struct drm_device *);
 extern int  nv30_graph_init(struct drm_device *);
+extern void nv20_graph_set_region_tiling(struct drm_device *, int, uint32_t,
+                                         uint32_t, uint32_t);
 
 /* nv40_graph.c */
 extern struct nouveau_pgraph_object_class nv40_graph_grclass[];
@@ -963,6 +1010,8 @@ extern void nv40_graph_destroy_context(struct nouveau_channel *);
 extern int  nv40_graph_load_context(struct nouveau_channel *);
 extern int  nv40_graph_unload_context(struct drm_device *);
 extern void nv40_grctx_init(struct nouveau_grctx *);
+extern void nv40_graph_set_region_tiling(struct drm_device *, int, uint32_t,
+                                         uint32_t, uint32_t);
 
 /* nv50_graph.c */
 extern struct nouveau_pgraph_object_class nv50_graph_grclass[];
@@ -1030,8 +1079,7 @@ extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd,
 
 /* nv04_dac.c */
 extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry);
-extern enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
-                                                 struct drm_connector *connector);
+extern uint32_t nv17_dac_sample_load(struct drm_encoder *encoder);
 extern int nv04_dac_output_offset(struct drm_encoder *encoder);
 extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable);
 
@@ -1049,9 +1097,6 @@ extern int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry);
 
 /* nv17_tv.c */
 extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry);
-extern enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
-                                                struct drm_connector *connector,
-                                                uint32_t pin_mask);
 
 /* nv04_display.c */
 extern int nv04_display_create(struct drm_device *);
@@ -1290,14 +1335,14 @@ nv_two_reg_pll(struct drm_device *dev)
         return false;
 }
 
-#define NV50_NVSW                                                    0x0000506e
-#define NV50_NVSW_DMA_SEMAPHORE                                      0x00000060
-#define NV50_NVSW_SEMAPHORE_OFFSET                                   0x00000064
-#define NV50_NVSW_SEMAPHORE_ACQUIRE                                  0x00000068
-#define NV50_NVSW_SEMAPHORE_RELEASE                                  0x0000006c
-#define NV50_NVSW_DMA_VBLSEM                                         0x0000018c
-#define NV50_NVSW_VBLSEM_OFFSET                                      0x00000400
-#define NV50_NVSW_VBLSEM_RELEASE_VALUE                               0x00000404
-#define NV50_NVSW_VBLSEM_RELEASE                                     0x00000408
+#define NV_SW                                                        0x0000506e
+#define NV_SW_DMA_SEMAPHORE                                          0x00000060
+#define NV_SW_SEMAPHORE_OFFSET                                       0x00000064
+#define NV_SW_SEMAPHORE_ACQUIRE                                      0x00000068
+#define NV_SW_SEMAPHORE_RELEASE                                      0x0000006c
+#define NV_SW_DMA_VBLSEM                                             0x0000018c
+#define NV_SW_VBLSEM_OFFSET                                          0x00000400
+#define NV_SW_VBLSEM_RELEASE_VALUE                                   0x00000404
+#define NV_SW_VBLSEM_RELEASE                                         0x00000408
 
 #endif /* __NOUVEAU_DRV_H__ */
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 84af25c238b6..0b05c869e0e7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -64,8 +64,7 @@ nouveau_fbcon_sync(struct fb_info *info)
                 return 0;
 
         if (RING_SPACE(chan, 4)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
                 return 0;
         }
 
@@ -86,8 +85,7 @@ nouveau_fbcon_sync(struct fb_info *info)
         }
 
         if (ret) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
                 return 0;
         }
 
@@ -212,11 +210,11 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
 
         mode_cmd.bpp = surface_bpp;
         mode_cmd.pitch = mode_cmd.width * (mode_cmd.bpp >> 3);
-        mode_cmd.pitch = ALIGN(mode_cmd.pitch, 256);
+        mode_cmd.pitch = roundup(mode_cmd.pitch, 256);
         mode_cmd.depth = surface_depth;
 
         size = mode_cmd.pitch * mode_cmd.height;
-        size = ALIGN(size, PAGE_SIZE);
+        size = roundup(size, PAGE_SIZE);
 
         ret = nouveau_gem_new(dev, dev_priv->channel, size, 0, TTM_PL_FLAG_VRAM,
                               0, 0x0000, false, true, &nvbo);
@@ -380,3 +378,12 @@ nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 
         return 0;
 }
+
+void nouveau_fbcon_gpu_lockup(struct fb_info *info)
+{
+        struct nouveau_fbcon_par *par = info->par;
+        struct drm_device *dev = par->dev;
+
+        NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
+        info->flags |= FBINFO_HWACCEL_DISABLED;
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
index 8531140fedbc..462e0b87b4bd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
@@ -43,5 +43,6 @@ void nouveau_fbcon_zfill(struct drm_device *dev);
 int nv04_fbcon_accel_init(struct fb_info *info);
 int nv50_fbcon_accel_init(struct fb_info *info);
 
+void nouveau_fbcon_gpu_lockup(struct fb_info *info);
 #endif /* __NV50_FBCON_H__ */
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index dacac9a0842a..faddf53ff9ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -142,7 +142,7 @@ nouveau_fence_emit(struct nouveau_fence *fence)
         list_add_tail(&fence->entry, &chan->fence.pending);
         spin_unlock_irqrestore(&chan->fence.lock, flags);
 
-        BEGIN_RING(chan, NvSubM2MF, USE_REFCNT ? 0x0050 : 0x0150, 1);
+        BEGIN_RING(chan, NvSubSw, USE_REFCNT ? 0x0050 : 0x0150, 1);
         OUT_RING(chan, fence->sequence);
         FIRE_RING(chan);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 18fd8ac9fca7..6ac804b0c9f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -220,7 +220,6 @@ nouveau_gem_set_domain(struct drm_gem_object *gem, uint32_t read_domains,
 }
 
 struct validate_op {
-        struct nouveau_fence *fence;
         struct list_head vram_list;
         struct list_head gart_list;
         struct list_head both_list;
@@ -252,17 +251,11 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence)
 }
 
 static void
-validate_fini(struct validate_op *op, bool success)
+validate_fini(struct validate_op *op, struct nouveau_fence* fence)
 {
-        struct nouveau_fence *fence = op->fence;
-
-        if (unlikely(!success))
-                op->fence = NULL;
-
-        validate_fini_list(&op->vram_list, op->fence);
-        validate_fini_list(&op->gart_list, op->fence);
-        validate_fini_list(&op->both_list, op->fence);
-        nouveau_fence_unref((void *)&fence);
+        validate_fini_list(&op->vram_list, fence);
+        validate_fini_list(&op->gart_list, fence);
+        validate_fini_list(&op->both_list, fence);
 }
 
 static int
@@ -328,6 +321,7 @@ retry:
                 else {
                         NV_ERROR(dev, "invalid valid domains: 0x%08x\n",
                                  b->valid_domains);
+                        list_add_tail(&nvbo->entry, &op->both_list);
                         validate_fini(op, NULL);
                         return -EINVAL;
                 }
@@ -420,10 +414,6 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
         INIT_LIST_HEAD(&op->gart_list);
         INIT_LIST_HEAD(&op->both_list);
 
-        ret = nouveau_fence_new(chan, &op->fence, false);
-        if (ret)
-                return ret;
-
         if (nr_buffers == 0)
                 return 0;
 
@@ -477,13 +467,14 @@ u_memcpya(uint64_t user, unsigned nmemb, unsigned size)
 static int
 nouveau_gem_pushbuf_reloc_apply(struct nouveau_channel *chan, int nr_bo,
                                 struct drm_nouveau_gem_pushbuf_bo *bo,
-                                int nr_relocs, uint64_t ptr_relocs,
-                                int nr_dwords, int first_dword,
+                                unsigned nr_relocs, uint64_t ptr_relocs,
+                                unsigned nr_dwords, unsigned first_dword,
                                 uint32_t *pushbuf, bool is_iomem)
 {
         struct drm_nouveau_gem_pushbuf_reloc *reloc = NULL;
         struct drm_device *dev = chan->dev;
-        int ret = 0, i;
+        int ret = 0;
+        unsigned i;
 
         reloc = u_memcpya(ptr_relocs, nr_relocs, sizeof(*reloc));
         if (IS_ERR(reloc))
@@ -541,6 +532,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         struct drm_nouveau_gem_pushbuf_bo *bo = NULL;
         struct nouveau_channel *chan;
         struct validate_op op;
+        struct nouveau_fence* fence = 0;
         uint32_t *pushbuf = NULL;
         int ret = 0, do_reloc = 0, i;
 
@@ -597,7 +589,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
 
         OUT_RINGp(chan, pushbuf, req->nr_dwords);
 
-        ret = nouveau_fence_emit(op.fence);
+        ret = nouveau_fence_new(chan, &fence, true);
         if (ret) {
                 NV_ERROR(dev, "error fencing pushbuf: %d\n", ret);
                 WIND_RING(chan);
@@ -605,7 +597,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         }
 
         if (nouveau_gem_pushbuf_sync(chan)) {
-                ret = nouveau_fence_wait(op.fence, NULL, false, false);
+                ret = nouveau_fence_wait(fence, NULL, false, false);
                 if (ret) {
                         for (i = 0; i < req->nr_dwords; i++)
                                 NV_ERROR(dev, "0x%08x\n", pushbuf[i]);
@@ -614,7 +606,8 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
         }
 
 out:
-        validate_fini(&op, ret == 0);
+        validate_fini(&op, fence);
+        nouveau_fence_unref((void**)&fence);
         mutex_unlock(&dev->struct_mutex);
         kfree(pushbuf);
         kfree(bo);
@@ -634,6 +627,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
         struct drm_gem_object *gem;
         struct nouveau_bo *pbbo;
         struct validate_op op;
+        struct nouveau_fence* fence = 0;
         int i, ret = 0, do_reloc = 0;
 
         NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
@@ -675,6 +669,18 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
         }
         pbbo = nouveau_gem_object(gem);
 
+        if ((req->offset & 3) || req->nr_dwords < 2 ||
+            (unsigned long)req->offset > (unsigned long)pbbo->bo.mem.size ||
+            (unsigned long)req->nr_dwords >
+             ((unsigned long)(pbbo->bo.mem.size - req->offset ) >> 2)) {
+                NV_ERROR(dev, "pb call misaligned or out of bounds: "
+                              "%d + %d * 4 > %ld\n",
+                         req->offset, req->nr_dwords, pbbo->bo.mem.size);
+                ret = -EINVAL;
+                drm_gem_object_unreference(gem);
+                goto out;
+        }
+
         ret = ttm_bo_reserve(&pbbo->bo, false, false, true,
                              chan->fence.sequence);
         if (ret) {
@@ -772,7 +778,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
                         OUT_RING(chan, 0);
         }
 
-        ret = nouveau_fence_emit(op.fence);
+        ret = nouveau_fence_new(chan, &fence, true);
         if (ret) {
                 NV_ERROR(dev, "error fencing pushbuf: %d\n", ret);
                 WIND_RING(chan);
@@ -780,7 +786,8 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
         }
 
 out:
-        validate_fini(&op, ret == 0);
+        validate_fini(&op, fence);
+        nouveau_fence_unref((void**)&fence);
         mutex_unlock(&dev->struct_mutex);
         kfree(bo);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 370c72c968d1..3b9bad66162a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -483,6 +483,13 @@ nouveau_pgraph_intr_error(struct drm_device *dev, uint32_t nsource)
         if (nsource & NV03_PGRAPH_NSOURCE_ILLEGAL_MTHD) {
                 if (nouveau_pgraph_intr_swmthd(dev, &trap))
                         unhandled = 1;
+        } else if (nsource & NV03_PGRAPH_NSOURCE_DMA_VTX_PROTECTION) {
+                uint32_t v = nv_rd32(dev, 0x402000);
+                nv_wr32(dev, 0x402000, v);
+
+                /* dump the error anyway for now: it's useful for
+                   Gallium development */
+                unhandled = 1;
         } else {
                 unhandled = 1;
         }
@@ -635,6 +642,7 @@ nv50_pgraph_irq_handler(struct drm_device *dev)
 
                 if ((nv_rd32(dev, 0x400500) & isb) != isb)
                         nv_wr32(dev, 0x400500, nv_rd32(dev, 0x400500) | isb);
+                nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31));
         }
 
         nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PGRAPH_PENDING);
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 5158a12f7844..8f3a12f614ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -192,6 +192,92 @@ void nouveau_mem_release(struct drm_file *file_priv, struct mem_block *heap)
 }
 
 /*
+ * NV10-NV40 tiling helpers
+ */
+
+static void
+nv10_mem_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                           uint32_t size, uint32_t pitch)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
+        struct nouveau_tile_reg *tile = &dev_priv->tile.reg[i];
+
+        tile->addr = addr;
+        tile->size = size;
+        tile->used = !!pitch;
+        nouveau_fence_unref((void **)&tile->fence);
+
+        if (!pfifo->cache_flush(dev))
+                return;
+
+        pfifo->reassign(dev, false);
+        pfifo->cache_flush(dev);
+        pfifo->cache_pull(dev, false);
+
+        nouveau_wait_for_idle(dev);
+
+        pgraph->set_region_tiling(dev, i, addr, size, pitch);
+        pfb->set_region_tiling(dev, i, addr, size, pitch);
+
+        pfifo->cache_pull(dev, true);
+        pfifo->reassign(dev, true);
+}
+
+struct nouveau_tile_reg *
+nv10_mem_set_tiling(struct drm_device *dev, uint32_t addr, uint32_t size,
+                    uint32_t pitch)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
+        struct nouveau_tile_reg *tile = dev_priv->tile.reg, *found = NULL;
+        int i;
+
+        spin_lock(&dev_priv->tile.lock);
+
+        for (i = 0; i < pfb->num_tiles; i++) {
+                if (tile[i].used)
+                        /* Tile region in use. */
+                        continue;
+
+                if (tile[i].fence &&
+                    !nouveau_fence_signalled(tile[i].fence, NULL))
+                        /* Pending tile region. */
+                        continue;
+
+                if (max(tile[i].addr, addr) <
+                    min(tile[i].addr + tile[i].size, addr + size))
+                        /* Kill an intersecting tile region. */
+                        nv10_mem_set_region_tiling(dev, i, 0, 0, 0);
+
+                if (pitch && !found) {
+                        /* Free tile region. */
+                        nv10_mem_set_region_tiling(dev, i, addr, size, pitch);
+                        found = &tile[i];
+                }
+        }
+
+        spin_unlock(&dev_priv->tile.lock);
+
+        return found;
+}
+
+void
+nv10_mem_expire_tiling(struct drm_device *dev, struct nouveau_tile_reg *tile,
+                       struct nouveau_fence *fence)
+{
+        if (fence) {
+                /* Mark it as pending. */
+                tile->fence = fence;
+                nouveau_fence_ref(fence);
+        }
+
+        tile->used = false;
+}
+
+/*
  * NV50 VM helpers
  */
 int
@@ -297,9 +383,8 @@ void nouveau_mem_close(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
-        if (dev_priv->ttm.bdev.man[TTM_PL_PRIV0].has_type)
-                ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_PRIV0);
-        ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);
+        nouveau_bo_unpin(dev_priv->vga_ram);
+        nouveau_bo_ref(NULL, &dev_priv->vga_ram);
 
         ttm_bo_device_release(&dev_priv->ttm.bdev);
 
@@ -513,6 +598,7 @@ nouveau_mem_init(struct drm_device *dev)
 
         INIT_LIST_HEAD(&dev_priv->ttm.bo_list);
         spin_lock_init(&dev_priv->ttm.bo_list_lock);
+        spin_lock_init(&dev_priv->tile.lock);
 
         dev_priv->fb_available_size = nouveau_mem_fb_amount(dev);
 
@@ -535,6 +621,15 @@ nouveau_mem_init(struct drm_device *dev)
                 return ret;
         }
 
+        ret = nouveau_bo_new(dev, NULL, 256*1024, 0, TTM_PL_FLAG_VRAM,
+                             0, 0, true, true, &dev_priv->vga_ram);
+        if (ret == 0)
+                ret = nouveau_bo_pin(dev_priv->vga_ram, TTM_PL_FLAG_VRAM);
+        if (ret) {
+                NV_WARN(dev, "failed to reserve VGA memory\n");
+                nouveau_bo_ref(NULL, &dev_priv->vga_ram);
+        }
+
         /* GART */
 #if !defined(__powerpc__) && !defined(__ia64__)
         if (drm_device_is_agp(dev) && dev->agp) {
@@ -566,6 +661,7 @@ nouveau_mem_init(struct drm_device *dev)
         dev_priv->fb_mtrr = drm_mtrr_add(drm_get_resource_start(dev, 1),
                                          drm_get_resource_len(dev, 1),
                                          DRM_MTRR_WC);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 93379bb81bea..6c2cf81716df 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -881,7 +881,7 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, int class,
         return 0;
 }
 
-static int
+int
 nouveau_gpuobj_sw_new(struct nouveau_channel *chan, int class,
                       struct nouveau_gpuobj **gpuobj_ret)
 {
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h
index fa1b0e7165b9..251f1b3b38b9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_reg.h
+++ b/drivers/gpu/drm/nouveau/nouveau_reg.h
@@ -349,19 +349,19 @@
 #define NV04_PGRAPH_BLEND                                  0x00400824
 #define NV04_PGRAPH_STORED_FMT                             0x00400830
 #define NV04_PGRAPH_PATT_COLORRAM                          0x00400900
-#define NV40_PGRAPH_TILE0(i)                               (0x00400900 + (i*16))
-#define NV40_PGRAPH_TLIMIT0(i)                             (0x00400904 + (i*16))
-#define NV40_PGRAPH_TSIZE0(i)                              (0x00400908 + (i*16))
-#define NV40_PGRAPH_TSTATUS0(i)                            (0x0040090C + (i*16))
+#define NV20_PGRAPH_TILE(i)                                (0x00400900 + (i*16))
+#define NV20_PGRAPH_TLIMIT(i)                              (0x00400904 + (i*16))
+#define NV20_PGRAPH_TSIZE(i)                               (0x00400908 + (i*16))
+#define NV20_PGRAPH_TSTATUS(i)                             (0x0040090C + (i*16))
 #define NV10_PGRAPH_TILE(i)                                (0x00400B00 + (i*16))
 #define NV10_PGRAPH_TLIMIT(i)                              (0x00400B04 + (i*16))
 #define NV10_PGRAPH_TSIZE(i)                               (0x00400B08 + (i*16))
 #define NV10_PGRAPH_TSTATUS(i)                             (0x00400B0C + (i*16))
 #define NV04_PGRAPH_U_RAM                                  0x00400D00
-#define NV47_PGRAPH_TILE0(i)                               (0x00400D00 + (i*16))
-#define NV47_PGRAPH_TLIMIT0(i)                             (0x00400D04 + (i*16))
-#define NV47_PGRAPH_TSIZE0(i)                              (0x00400D08 + (i*16))
-#define NV47_PGRAPH_TSTATUS0(i)                            (0x00400D0C + (i*16))
+#define NV47_PGRAPH_TILE(i)                                (0x00400D00 + (i*16))
+#define NV47_PGRAPH_TLIMIT(i)                              (0x00400D04 + (i*16))
+#define NV47_PGRAPH_TSIZE(i)                               (0x00400D08 + (i*16))
+#define NV47_PGRAPH_TSTATUS(i)                             (0x00400D0C + (i*16))
 #define NV04_PGRAPH_V_RAM                                  0x00400D40
 #define NV04_PGRAPH_W_RAM                                  0x00400D80
 #define NV10_PGRAPH_COMBINER0_IN_ALPHA                     0x00400E40
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index e76ec2d207a9..f2d0187ba152 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -76,6 +76,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->fifo.disable            = nv04_fifo_disable;
                 engine->fifo.enable             = nv04_fifo_enable;
                 engine->fifo.reassign           = nv04_fifo_reassign;
+                engine->fifo.cache_flush        = nv04_fifo_cache_flush;
+                engine->fifo.cache_pull         = nv04_fifo_cache_pull;
                 engine->fifo.channel_id         = nv04_fifo_channel_id;
                 engine->fifo.create_context     = nv04_fifo_create_context;
                 engine->fifo.destroy_context    = nv04_fifo_destroy_context;
@@ -100,6 +102,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->timer.takedown          = nv04_timer_takedown;
                 engine->fb.init                 = nv10_fb_init;
                 engine->fb.takedown             = nv10_fb_takedown;
+                engine->fb.set_region_tiling    = nv10_fb_set_region_tiling;
                 engine->graph.grclass           = nv10_graph_grclass;
                 engine->graph.init              = nv10_graph_init;
                 engine->graph.takedown          = nv10_graph_takedown;
@@ -109,12 +112,15 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->graph.fifo_access       = nv04_graph_fifo_access;
                 engine->graph.load_context      = nv10_graph_load_context;
                 engine->graph.unload_context    = nv10_graph_unload_context;
+                engine->graph.set_region_tiling = nv10_graph_set_region_tiling;
                 engine->fifo.channels           = 32;
                 engine->fifo.init               = nv10_fifo_init;
                 engine->fifo.takedown           = nouveau_stub_takedown;
                 engine->fifo.disable            = nv04_fifo_disable;
                 engine->fifo.enable             = nv04_fifo_enable;
                 engine->fifo.reassign           = nv04_fifo_reassign;
+                engine->fifo.cache_flush        = nv04_fifo_cache_flush;
+                engine->fifo.cache_pull         = nv04_fifo_cache_pull;
                 engine->fifo.channel_id         = nv10_fifo_channel_id;
                 engine->fifo.create_context     = nv10_fifo_create_context;
                 engine->fifo.destroy_context    = nv10_fifo_destroy_context;
@@ -139,6 +145,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->timer.takedown          = nv04_timer_takedown;
                 engine->fb.init                 = nv10_fb_init;
                 engine->fb.takedown             = nv10_fb_takedown;
+                engine->fb.set_region_tiling    = nv10_fb_set_region_tiling;
                 engine->graph.grclass           = nv20_graph_grclass;
                 engine->graph.init              = nv20_graph_init;
                 engine->graph.takedown          = nv20_graph_takedown;
@@ -148,12 +155,15 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->graph.fifo_access       = nv04_graph_fifo_access;
                 engine->graph.load_context      = nv20_graph_load_context;
                 engine->graph.unload_context    = nv20_graph_unload_context;
+                engine->graph.set_region_tiling = nv20_graph_set_region_tiling;
                 engine->fifo.channels           = 32;
                 engine->fifo.init               = nv10_fifo_init;
                 engine->fifo.takedown           = nouveau_stub_takedown;
                 engine->fifo.disable            = nv04_fifo_disable;
                 engine->fifo.enable             = nv04_fifo_enable;
                 engine->fifo.reassign           = nv04_fifo_reassign;
+                engine->fifo.cache_flush        = nv04_fifo_cache_flush;
+                engine->fifo.cache_pull         = nv04_fifo_cache_pull;
                 engine->fifo.channel_id         = nv10_fifo_channel_id;
                 engine->fifo.create_context     = nv10_fifo_create_context;
                 engine->fifo.destroy_context    = nv10_fifo_destroy_context;
@@ -178,6 +188,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->timer.takedown          = nv04_timer_takedown;
                 engine->fb.init                 = nv10_fb_init;
                 engine->fb.takedown             = nv10_fb_takedown;
+                engine->fb.set_region_tiling    = nv10_fb_set_region_tiling;
                 engine->graph.grclass           = nv30_graph_grclass;
                 engine->graph.init              = nv30_graph_init;
                 engine->graph.takedown          = nv20_graph_takedown;
@@ -187,12 +198,15 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->graph.destroy_context   = nv20_graph_destroy_context;
                 engine->graph.load_context      = nv20_graph_load_context;
                 engine->graph.unload_context    = nv20_graph_unload_context;
+                engine->graph.set_region_tiling = nv20_graph_set_region_tiling;
                 engine->fifo.channels           = 32;
                 engine->fifo.init               = nv10_fifo_init;
                 engine->fifo.takedown           = nouveau_stub_takedown;
                 engine->fifo.disable            = nv04_fifo_disable;
                 engine->fifo.enable             = nv04_fifo_enable;
                 engine->fifo.reassign           = nv04_fifo_reassign;
+                engine->fifo.cache_flush        = nv04_fifo_cache_flush;
+                engine->fifo.cache_pull         = nv04_fifo_cache_pull;
                 engine->fifo.channel_id         = nv10_fifo_channel_id;
                 engine->fifo.create_context     = nv10_fifo_create_context;
                 engine->fifo.destroy_context    = nv10_fifo_destroy_context;
@@ -218,6 +232,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->timer.takedown          = nv04_timer_takedown;
                 engine->fb.init                 = nv40_fb_init;
                 engine->fb.takedown             = nv40_fb_takedown;
+                engine->fb.set_region_tiling    = nv40_fb_set_region_tiling;
                 engine->graph.grclass           = nv40_graph_grclass;
                 engine->graph.init              = nv40_graph_init;
                 engine->graph.takedown          = nv40_graph_takedown;
@@ -227,12 +242,15 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->graph.destroy_context   = nv40_graph_destroy_context;
                 engine->graph.load_context      = nv40_graph_load_context;
                 engine->graph.unload_context    = nv40_graph_unload_context;
+                engine->graph.set_region_tiling = nv40_graph_set_region_tiling;
                 engine->fifo.channels           = 32;
                 engine->fifo.init               = nv40_fifo_init;
                 engine->fifo.takedown           = nouveau_stub_takedown;
                 engine->fifo.disable            = nv04_fifo_disable;
                 engine->fifo.enable             = nv04_fifo_enable;
                 engine->fifo.reassign           = nv04_fifo_reassign;
+                engine->fifo.cache_flush        = nv04_fifo_cache_flush;
+                engine->fifo.cache_pull         = nv04_fifo_cache_pull;
                 engine->fifo.channel_id         = nv10_fifo_channel_id;
                 engine->fifo.create_context     = nv40_fifo_create_context;
                 engine->fifo.destroy_context    = nv40_fifo_destroy_context;
@@ -507,6 +525,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
                 engine->mc.takedown(dev);
 
                 mutex_lock(&dev->struct_mutex);
+                ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);
                 ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_TT);
                 mutex_unlock(&dev->struct_mutex);
                 nouveau_sgdma_takedown(dev);
@@ -624,7 +643,10 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                 dev_priv->chipset = (reg0 & 0xff00000) >> 20;
         /* NV04 or NV05 */
         } else if ((reg0 & 0xff00fff0) == 0x20004000) {
-                dev_priv->chipset = 0x04;
+                if (reg0 & 0x00f00000)
+                        dev_priv->chipset = 0x05;
+                else
+                        dev_priv->chipset = 0x04;
         } else
                 dev_priv->chipset = 0xff;
 
@@ -704,8 +726,8 @@ static void nouveau_close(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
-        /* In the case of an error dev_priv may not be be allocated yet */
-        if (dev_priv && dev_priv->card_type)
+        /* In the case of an error dev_priv may not be allocated yet */
+        if (dev_priv)
                 nouveau_card_takedown(dev);
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 187eb84e4da5..c385d50f041b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -28,45 +28,17 @@
 
 #include "nouveau_drv.h"
 
-static struct vm_operations_struct nouveau_ttm_vm_ops;
-static const struct vm_operations_struct *ttm_vm_ops;
-
-static int
-nouveau_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
-        struct ttm_buffer_object *bo = vma->vm_private_data;
-        int ret;
-
-        if (unlikely(bo == NULL))
-                return VM_FAULT_NOPAGE;
-
-        ret = ttm_vm_ops->fault(vma, vmf);
-        return ret;
-}
-
 int
 nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         struct drm_file *file_priv = filp->private_data;
         struct drm_nouveau_private *dev_priv =
                 file_priv->minor->dev->dev_private;
-        int ret;
 
         if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
                 return drm_mmap(filp, vma);
 
-        ret = ttm_bo_mmap(filp, vma, &dev_priv->ttm.bdev);
-        if (unlikely(ret != 0))
-                return ret;
-
-        if (unlikely(ttm_vm_ops == NULL)) {
-                ttm_vm_ops = vma->vm_ops;
-                nouveau_ttm_vm_ops = *ttm_vm_ops;
-                nouveau_ttm_vm_ops.fault = &nouveau_ttm_fault;
-        }
-
-        vma->vm_ops = &nouveau_ttm_vm_ops;
-        return 0;
+        return ttm_bo_mmap(filp, vma, &dev_priv->ttm.bdev);
 }
 
 static int
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index d9f32879ba38..d0e038d28948 100644
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -212,16 +212,15 @@ out:
         return connector_status_disconnected;
 }
 
-enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
-                                          struct drm_connector *connector)
+uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
-        uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
+        uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);
         uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,
                 saved_rtest_ctrl, saved_gpio0, saved_gpio1, temp, routput;
-        int head, present = 0;
+        int head;
 
 #define RGB_TEST_DATA(r, g, b) (r << 0 | g << 10 | b << 20)
         if (dcb->type == OUTPUT_TV) {
@@ -287,13 +286,7 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
                       temp | NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED);
         msleep(5);
 
-        temp = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
-
-        if (dcb->type == OUTPUT_TV)
-                present = (nv17_tv_detect(encoder, connector, temp)
-                           == connector_status_connected);
-        else
-                present = temp & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI;
+        sample = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
 
         temp = NVReadRAMDAC(dev, head, NV_PRAMDAC_TEST_CONTROL);
         NVWriteRAMDAC(dev, head, NV_PRAMDAC_TEST_CONTROL,
@@ -310,15 +303,25 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
         nv17_gpio_set(dev, DCB_GPIO_TVDAC1, saved_gpio1);
         nv17_gpio_set(dev, DCB_GPIO_TVDAC0, saved_gpio0);
 
-        if (present) {
-                NV_INFO(dev, "Load detected on output %c\n", '@' + ffs(dcb->or));
+        return sample;
+}
+
+static enum drm_connector_status
+nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+        struct drm_device *dev = encoder->dev;
+        struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
+        uint32_t sample = nv17_dac_sample_load(encoder);
+
+        if (sample & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
+                NV_INFO(dev, "Load detected on output %c\n",
+                        '@' + ffs(dcb->or));
                 return connector_status_connected;
+        } else {
+                return connector_status_disconnected;
         }
-
-        return connector_status_disconnected;
 }
 
-
 static bool nv04_dac_mode_fixup(struct drm_encoder *encoder,
                                 struct drm_display_mode *mode,
                                 struct drm_display_mode *adjusted_mode)
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index 09a31071ee58..d910873c1368 100644
--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
@@ -39,8 +39,7 @@ nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region)
                 return;
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 4)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -62,14 +61,12 @@ nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         struct drm_device *dev = par->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_channel *chan = dev_priv->channel;
-        uint32_t color = ((uint32_t *) info->pseudo_palette)[rect->color];
 
         if (info->state != FBINFO_STATE_RUNNING)
                 return;
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 7)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -80,7 +77,11 @@ nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         BEGIN_RING(chan, NvSubGdiRect, 0x02fc, 1);
         OUT_RING(chan, (rect->rop != ROP_COPY) ? 1 : 3);
         BEGIN_RING(chan, NvSubGdiRect, 0x03fc, 1);
-        OUT_RING(chan, color);
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+                OUT_RING(chan, ((uint32_t *)info->pseudo_palette)[rect->color]);
+        else
+                OUT_RING(chan, rect->color);
         BEGIN_RING(chan, NvSubGdiRect, 0x0400, 2);
         OUT_RING(chan, (rect->dx << 16) | rect->dy);
         OUT_RING(chan, (rect->width << 16) | rect->height);
@@ -109,8 +110,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         }
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 8)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -144,8 +144,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
                 int iter_len = dsize > 128 ? 128 : dsize;
 
                 if (RING_SPACE(chan, iter_len + 1)) {
-                        NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                        info->flags |= FBINFO_HWACCEL_DISABLED;
+                        nouveau_fbcon_gpu_lockup(info);
                         cfb_imageblit(info, image);
                         return;
                 }
@@ -184,6 +183,7 @@ nv04_fbcon_accel_init(struct fb_info *info)
         struct drm_device *dev = par->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_channel *chan = dev_priv->channel;
+        const int sub = NvSubCtxSurf2D;
         int surface_fmt, pattern_fmt, rect_fmt;
         int ret;
 
@@ -242,30 +242,29 @@ nv04_fbcon_accel_init(struct fb_info *info)
                 return ret;
 
         if (RING_SPACE(chan, 49)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
                 return 0;
         }
 
-        BEGIN_RING(chan, 1, 0x0000, 1);
+        BEGIN_RING(chan, sub, 0x0000, 1);
         OUT_RING(chan, NvCtxSurf2D);
-        BEGIN_RING(chan, 1, 0x0184, 2);
+        BEGIN_RING(chan, sub, 0x0184, 2);
         OUT_RING(chan, NvDmaFB);
         OUT_RING(chan, NvDmaFB);
-        BEGIN_RING(chan, 1, 0x0300, 4);
+        BEGIN_RING(chan, sub, 0x0300, 4);
         OUT_RING(chan, surface_fmt);
         OUT_RING(chan, info->fix.line_length | (info->fix.line_length << 16));
         OUT_RING(chan, info->fix.smem_start - dev->mode_config.fb_base);
         OUT_RING(chan, info->fix.smem_start - dev->mode_config.fb_base);
 
-        BEGIN_RING(chan, 1, 0x0000, 1);
+        BEGIN_RING(chan, sub, 0x0000, 1);
         OUT_RING(chan, NvRop);
-        BEGIN_RING(chan, 1, 0x0300, 1);
+        BEGIN_RING(chan, sub, 0x0300, 1);
         OUT_RING(chan, 0x55);
 
-        BEGIN_RING(chan, 1, 0x0000, 1);
+        BEGIN_RING(chan, sub, 0x0000, 1);
         OUT_RING(chan, NvImagePatt);
-        BEGIN_RING(chan, 1, 0x0300, 8);
+        BEGIN_RING(chan, sub, 0x0300, 8);
         OUT_RING(chan, pattern_fmt);
 #ifdef __BIG_ENDIAN
         OUT_RING(chan, 2);
@@ -279,9 +278,9 @@ nv04_fbcon_accel_init(struct fb_info *info)
         OUT_RING(chan, ~0);
         OUT_RING(chan, ~0);
 
-        BEGIN_RING(chan, 1, 0x0000, 1);
+        BEGIN_RING(chan, sub, 0x0000, 1);
         OUT_RING(chan, NvClipRect);
-        BEGIN_RING(chan, 1, 0x0300, 2);
+        BEGIN_RING(chan, sub, 0x0300, 2);
         OUT_RING(chan, 0);
         OUT_RING(chan, (info->var.yres_virtual << 16) | info->var.xres_virtual);
 
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
index 0c3cd53c7313..f31347b8c9b0 100644
--- a/drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv04_fifo.c
@@ -71,6 +71,40 @@ nv04_fifo_reassign(struct drm_device *dev, bool enable)
         return (reassign == 1);
 }
 
+bool
+nv04_fifo_cache_flush(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
+        uint64_t start = ptimer->read(dev);
+
+        do {
+                if (nv_rd32(dev, NV03_PFIFO_CACHE1_GET) ==
+                    nv_rd32(dev, NV03_PFIFO_CACHE1_PUT))
+                        return true;
+
+        } while (ptimer->read(dev) - start < 100000000);
+
+        NV_ERROR(dev, "Timeout flushing the PFIFO cache.\n");
+
+        return false;
+}
+
+bool
+nv04_fifo_cache_pull(struct drm_device *dev, bool enable)
+{
+        uint32_t pull = nv_rd32(dev, NV04_PFIFO_CACHE1_PULL0);
+
+        if (enable) {
+                nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, pull | 1);
+        } else {
+                nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, pull & ~1);
+                nv_wr32(dev, NV04_PFIFO_CACHE1_HASH, 0);
+        }
+
+        return !!(pull & 1);
+}
+
 int
 nv04_fifo_channel_id(struct drm_device *dev)
 {
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index d561d773c0f4..e260986ea65a 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -28,6 +28,10 @@
 #include "nouveau_drv.h"
 
 static uint32_t nv04_graph_ctx_regs[] = {
+        0x0040053c,
+        0x00400544,
+        0x00400540,
+        0x00400548,
         NV04_PGRAPH_CTX_SWITCH1,
         NV04_PGRAPH_CTX_SWITCH2,
         NV04_PGRAPH_CTX_SWITCH3,
@@ -102,69 +106,69 @@ static uint32_t nv04_graph_ctx_regs[] = {
         NV04_PGRAPH_PATT_COLOR0,
         NV04_PGRAPH_PATT_COLOR1,
         NV04_PGRAPH_PATT_COLORRAM+0x00,
-        NV04_PGRAPH_PATT_COLORRAM+0x01,
-        NV04_PGRAPH_PATT_COLORRAM+0x02,
-        NV04_PGRAPH_PATT_COLORRAM+0x03,
         NV04_PGRAPH_PATT_COLORRAM+0x04,
-        NV04_PGRAPH_PATT_COLORRAM+0x05,
-        NV04_PGRAPH_PATT_COLORRAM+0x06,
-        NV04_PGRAPH_PATT_COLORRAM+0x07,
         NV04_PGRAPH_PATT_COLORRAM+0x08,
-        NV04_PGRAPH_PATT_COLORRAM+0x09,
-        NV04_PGRAPH_PATT_COLORRAM+0x0A,
-        NV04_PGRAPH_PATT_COLORRAM+0x0B,
-        NV04_PGRAPH_PATT_COLORRAM+0x0C,
-        NV04_PGRAPH_PATT_COLORRAM+0x0D,
-        NV04_PGRAPH_PATT_COLORRAM+0x0E,
-        NV04_PGRAPH_PATT_COLORRAM+0x0F,
+        NV04_PGRAPH_PATT_COLORRAM+0x0c,
         NV04_PGRAPH_PATT_COLORRAM+0x10,
-        NV04_PGRAPH_PATT_COLORRAM+0x11,
-        NV04_PGRAPH_PATT_COLORRAM+0x12,
-        NV04_PGRAPH_PATT_COLORRAM+0x13,
         NV04_PGRAPH_PATT_COLORRAM+0x14,
-        NV04_PGRAPH_PATT_COLORRAM+0x15,
-        NV04_PGRAPH_PATT_COLORRAM+0x16,
-        NV04_PGRAPH_PATT_COLORRAM+0x17,
         NV04_PGRAPH_PATT_COLORRAM+0x18,
-        NV04_PGRAPH_PATT_COLORRAM+0x19,
-        NV04_PGRAPH_PATT_COLORRAM+0x1A,
-        NV04_PGRAPH_PATT_COLORRAM+0x1B,
-        NV04_PGRAPH_PATT_COLORRAM+0x1C,
-        NV04_PGRAPH_PATT_COLORRAM+0x1D,
-        NV04_PGRAPH_PATT_COLORRAM+0x1E,
-        NV04_PGRAPH_PATT_COLORRAM+0x1F,
+        NV04_PGRAPH_PATT_COLORRAM+0x1c,
         NV04_PGRAPH_PATT_COLORRAM+0x20,
-        NV04_PGRAPH_PATT_COLORRAM+0x21,
-        NV04_PGRAPH_PATT_COLORRAM+0x22,
-        NV04_PGRAPH_PATT_COLORRAM+0x23,
         NV04_PGRAPH_PATT_COLORRAM+0x24,
-        NV04_PGRAPH_PATT_COLORRAM+0x25,
-        NV04_PGRAPH_PATT_COLORRAM+0x26,
-        NV04_PGRAPH_PATT_COLORRAM+0x27,
         NV04_PGRAPH_PATT_COLORRAM+0x28,
-        NV04_PGRAPH_PATT_COLORRAM+0x29,
-        NV04_PGRAPH_PATT_COLORRAM+0x2A,
-        NV04_PGRAPH_PATT_COLORRAM+0x2B,
-        NV04_PGRAPH_PATT_COLORRAM+0x2C,
-        NV04_PGRAPH_PATT_COLORRAM+0x2D,
-        NV04_PGRAPH_PATT_COLORRAM+0x2E,
-        NV04_PGRAPH_PATT_COLORRAM+0x2F,
+        NV04_PGRAPH_PATT_COLORRAM+0x2c,
         NV04_PGRAPH_PATT_COLORRAM+0x30,
-        NV04_PGRAPH_PATT_COLORRAM+0x31,
-        NV04_PGRAPH_PATT_COLORRAM+0x32,
-        NV04_PGRAPH_PATT_COLORRAM+0x33,
         NV04_PGRAPH_PATT_COLORRAM+0x34,
-        NV04_PGRAPH_PATT_COLORRAM+0x35,
-        NV04_PGRAPH_PATT_COLORRAM+0x36,
-        NV04_PGRAPH_PATT_COLORRAM+0x37,
         NV04_PGRAPH_PATT_COLORRAM+0x38,
-        NV04_PGRAPH_PATT_COLORRAM+0x39,
-        NV04_PGRAPH_PATT_COLORRAM+0x3A,
-        NV04_PGRAPH_PATT_COLORRAM+0x3B,
-        NV04_PGRAPH_PATT_COLORRAM+0x3C,
-        NV04_PGRAPH_PATT_COLORRAM+0x3D,
-        NV04_PGRAPH_PATT_COLORRAM+0x3E,
-        NV04_PGRAPH_PATT_COLORRAM+0x3F,
+        NV04_PGRAPH_PATT_COLORRAM+0x3c,
+        NV04_PGRAPH_PATT_COLORRAM+0x40,
+        NV04_PGRAPH_PATT_COLORRAM+0x44,
+        NV04_PGRAPH_PATT_COLORRAM+0x48,
+        NV04_PGRAPH_PATT_COLORRAM+0x4c,
+        NV04_PGRAPH_PATT_COLORRAM+0x50,
+        NV04_PGRAPH_PATT_COLORRAM+0x54,
+        NV04_PGRAPH_PATT_COLORRAM+0x58,
+        NV04_PGRAPH_PATT_COLORRAM+0x5c,
+        NV04_PGRAPH_PATT_COLORRAM+0x60,
+        NV04_PGRAPH_PATT_COLORRAM+0x64,
+        NV04_PGRAPH_PATT_COLORRAM+0x68,
+        NV04_PGRAPH_PATT_COLORRAM+0x6c,
+        NV04_PGRAPH_PATT_COLORRAM+0x70,
+        NV04_PGRAPH_PATT_COLORRAM+0x74,
+        NV04_PGRAPH_PATT_COLORRAM+0x78,
+        NV04_PGRAPH_PATT_COLORRAM+0x7c,
+        NV04_PGRAPH_PATT_COLORRAM+0x80,
+        NV04_PGRAPH_PATT_COLORRAM+0x84,
+        NV04_PGRAPH_PATT_COLORRAM+0x88,
+        NV04_PGRAPH_PATT_COLORRAM+0x8c,
+        NV04_PGRAPH_PATT_COLORRAM+0x90,
+        NV04_PGRAPH_PATT_COLORRAM+0x94,
+        NV04_PGRAPH_PATT_COLORRAM+0x98,
+        NV04_PGRAPH_PATT_COLORRAM+0x9c,
+        NV04_PGRAPH_PATT_COLORRAM+0xa0,
+        NV04_PGRAPH_PATT_COLORRAM+0xa4,
+        NV04_PGRAPH_PATT_COLORRAM+0xa8,
+        NV04_PGRAPH_PATT_COLORRAM+0xac,
+        NV04_PGRAPH_PATT_COLORRAM+0xb0,
+        NV04_PGRAPH_PATT_COLORRAM+0xb4,
+        NV04_PGRAPH_PATT_COLORRAM+0xb8,
+        NV04_PGRAPH_PATT_COLORRAM+0xbc,
+        NV04_PGRAPH_PATT_COLORRAM+0xc0,
+        NV04_PGRAPH_PATT_COLORRAM+0xc4,
+        NV04_PGRAPH_PATT_COLORRAM+0xc8,
+        NV04_PGRAPH_PATT_COLORRAM+0xcc,
+        NV04_PGRAPH_PATT_COLORRAM+0xd0,
+        NV04_PGRAPH_PATT_COLORRAM+0xd4,
+        NV04_PGRAPH_PATT_COLORRAM+0xd8,
+        NV04_PGRAPH_PATT_COLORRAM+0xdc,
+        NV04_PGRAPH_PATT_COLORRAM+0xe0,
+        NV04_PGRAPH_PATT_COLORRAM+0xe4,
+        NV04_PGRAPH_PATT_COLORRAM+0xe8,
+        NV04_PGRAPH_PATT_COLORRAM+0xec,
+        NV04_PGRAPH_PATT_COLORRAM+0xf0,
+        NV04_PGRAPH_PATT_COLORRAM+0xf4,
+        NV04_PGRAPH_PATT_COLORRAM+0xf8,
+        NV04_PGRAPH_PATT_COLORRAM+0xfc,
         NV04_PGRAPH_PATTERN,
         0x0040080c,
         NV04_PGRAPH_PATTERN_SHAPE,
@@ -247,14 +251,6 @@ static uint32_t nv04_graph_ctx_regs[] = {
         0x004004f8,
         0x0040047c,
         0x004004fc,
-        0x0040053c,
-        0x00400544,
-        0x00400540,
-        0x00400548,
-        0x00400560,
-        0x00400568,
-        0x00400564,
-        0x0040056c,
         0x00400534,
         0x00400538,
         0x00400514,
@@ -341,9 +337,8 @@ static uint32_t nv04_graph_ctx_regs[] = {
         0x00400500,
         0x00400504,
         NV04_PGRAPH_VALID1,
-        NV04_PGRAPH_VALID2
-
-
+        NV04_PGRAPH_VALID2,
+        NV04_PGRAPH_DEBUG_3
 };
 
 struct graph_state {
@@ -388,6 +383,18 @@ nv04_graph_context_switch(struct drm_device *dev)
         pgraph->fifo_access(dev, true);
 }
 
+static uint32_t *ctx_reg(struct graph_state *ctx, uint32_t reg)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(nv04_graph_ctx_regs); i++) {
+                if (nv04_graph_ctx_regs[i] == reg)
+                        return &ctx->nv04[i];
+        }
+
+        return NULL;
+}
+
 int nv04_graph_create_context(struct nouveau_channel *chan)
 {
         struct graph_state *pgraph_ctx;
@@ -398,15 +405,8 @@ int nv04_graph_create_context(struct nouveau_channel *chan)
         if (pgraph_ctx == NULL)
                 return -ENOMEM;
 
-        /* dev_priv->fifos[channel].pgraph_ctx_user = channel << 24; */
-        pgraph_ctx->nv04[0] = 0x0001ffff;
-        /* is it really needed ??? */
-#if 0
-        dev_priv->fifos[channel].pgraph_ctx[1] =
-                                        nv_rd32(dev, NV_PGRAPH_DEBUG_4);
-        dev_priv->fifos[channel].pgraph_ctx[2] =
-                                        nv_rd32(dev, 0x004006b0);
-#endif
+        *ctx_reg(pgraph_ctx, NV04_PGRAPH_DEBUG_3) = 0xfad4ff31;
+
         return 0;
 }
 
@@ -429,9 +429,13 @@ int nv04_graph_load_context(struct nouveau_channel *chan)
                 nv_wr32(dev, nv04_graph_ctx_regs[i], pgraph_ctx->nv04[i]);
 
         nv_wr32(dev, NV04_PGRAPH_CTX_CONTROL, 0x10010100);
-        nv_wr32(dev, NV04_PGRAPH_CTX_USER, chan->id << 24);
+
+        tmp  = nv_rd32(dev, NV04_PGRAPH_CTX_USER) & 0x00ffffff;
+        nv_wr32(dev, NV04_PGRAPH_CTX_USER, tmp | chan->id << 24);
+
         tmp = nv_rd32(dev, NV04_PGRAPH_FFINTFC_ST2);
         nv_wr32(dev, NV04_PGRAPH_FFINTFC_ST2, tmp & 0x000fffff);
+
         return 0;
 }
 
@@ -494,7 +498,7 @@ int nv04_graph_init(struct drm_device *dev)
         nv_wr32(dev, NV04_PGRAPH_STATE        , 0xFFFFFFFF);
         nv_wr32(dev, NV04_PGRAPH_CTX_CONTROL  , 0x10000100);
         tmp  = nv_rd32(dev, NV04_PGRAPH_CTX_USER) & 0x00ffffff;
-        tmp |= dev_priv->engine.fifo.channels << 24;
+        tmp |= (dev_priv->engine.fifo.channels - 1) << 24;
         nv_wr32(dev, NV04_PGRAPH_CTX_USER, tmp);
 
         /* These don't belong here, they're part of a per-channel context */
@@ -533,7 +537,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass,
                               int mthd, uint32_t data)
 {
         struct drm_device *dev = chan->dev;
-        uint32_t instance = nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff;
+        uint32_t instance = (nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff) << 4;
         int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7;
         uint32_t tmp;
 
@@ -547,7 +551,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass,
         return 0;
 }
 
-static struct nouveau_pgraph_object_method nv04_graph_mthds_m2mf[] = {
+static struct nouveau_pgraph_object_method nv04_graph_mthds_sw[] = {
         { 0x0150, nv04_graph_mthd_set_ref },
         {}
 };
@@ -558,7 +562,7 @@ static struct nouveau_pgraph_object_method nv04_graph_mthds_set_operation[] = {
 };
 
 struct nouveau_pgraph_object_class nv04_graph_grclass[] = {
-        { 0x0039, false, nv04_graph_mthds_m2mf },
+        { 0x0039, false, NULL },
         { 0x004a, false, nv04_graph_mthds_set_operation }, /* gdirect */
         { 0x005f, false, nv04_graph_mthds_set_operation }, /* imageblit */
         { 0x0061, false, nv04_graph_mthds_set_operation }, /* ifc */
@@ -574,6 +578,7 @@ struct nouveau_pgraph_object_class nv04_graph_grclass[] = {
         { 0x0053, false, NULL }, /* surf3d */
         { 0x0054, false, NULL }, /* tex_tri */
         { 0x0055, false, NULL }, /* multitex_tri */
+        { 0x506e, true, nv04_graph_mthds_sw },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index a20c206625a2..a3b9563a6f60 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -30,7 +30,7 @@ nv04_instmem_determine_amount(struct drm_device *dev)
                  * of vram.  For now, only reserve a small piece until we know
                  * more about what each chipset requires.
                  */
-                switch (dev_priv->chipset & 0xf0) {
+                switch (dev_priv->chipset) {
                 case 0x40:
                 case 0x47:
                 case 0x49:
diff --git a/drivers/gpu/drm/nouveau/nv10_fb.c b/drivers/gpu/drm/nouveau/nv10_fb.c
index 79e2d104d70a..cc5cda44e501 100644
--- a/drivers/gpu/drm/nouveau/nv10_fb.c
+++ b/drivers/gpu/drm/nouveau/nv10_fb.c
@@ -3,17 +3,37 @@
 #include "nouveau_drv.h"
 #include "nouveau_drm.h"
 
+void
+nv10_fb_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                          uint32_t size, uint32_t pitch)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        uint32_t limit = max(1u, addr + size) - 1;
+
+        if (pitch) {
+                if (dev_priv->card_type >= NV_20)
+                        addr |= 1;
+                else
+                        addr |= 1 << 31;
+        }
+
+        nv_wr32(dev, NV10_PFB_TLIMIT(i), limit);
+        nv_wr32(dev, NV10_PFB_TSIZE(i), pitch);
+        nv_wr32(dev, NV10_PFB_TILE(i), addr);
+}
+
 int
 nv10_fb_init(struct drm_device *dev)
 {
-        uint32_t fb_bar_size;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
         int i;
 
-        fb_bar_size = drm_get_resource_len(dev, 0) - 1;
-        for (i = 0; i < NV10_PFB_TILE__SIZE; i++) {
-                nv_wr32(dev, NV10_PFB_TILE(i), 0);
-                nv_wr32(dev, NV10_PFB_TLIMIT(i), fb_bar_size);
-        }
+        pfb->num_tiles = NV10_PFB_TILE__SIZE;
+
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < pfb->num_tiles; i++)
+                pfb->set_region_tiling(dev, i, 0, 0, 0);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c
index 6870e0ee2e7e..fcf2cdd19493 100644
--- a/drivers/gpu/drm/nouveau/nv10_graph.c
+++ b/drivers/gpu/drm/nouveau/nv10_graph.c
@@ -807,6 +807,20 @@ void nv10_graph_destroy_context(struct nouveau_channel *chan)
         chan->pgraph_ctx = NULL;
 }
 
+void
+nv10_graph_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                             uint32_t size, uint32_t pitch)
+{
+        uint32_t limit = max(1u, addr + size) - 1;
+
+        if (pitch)
+                addr |= 1 << 31;
+
+        nv_wr32(dev, NV10_PGRAPH_TLIMIT(i), limit);
+        nv_wr32(dev, NV10_PGRAPH_TSIZE(i), pitch);
+        nv_wr32(dev, NV10_PGRAPH_TILE(i), addr);
+}
+
 int nv10_graph_init(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -838,17 +852,9 @@ int nv10_graph_init(struct drm_device *dev)
         } else
                 nv_wr32(dev, NV10_PGRAPH_DEBUG_4, 0x00000000);
 
-        /* copy tile info from PFB */
-        for (i = 0; i < NV10_PFB_TILE__SIZE; i++) {
-                nv_wr32(dev, NV10_PGRAPH_TILE(i),
-                                        nv_rd32(dev, NV10_PFB_TILE(i)));
-                nv_wr32(dev, NV10_PGRAPH_TLIMIT(i),
-                                        nv_rd32(dev, NV10_PFB_TLIMIT(i)));
-                nv_wr32(dev, NV10_PGRAPH_TSIZE(i),
-                                        nv_rd32(dev, NV10_PFB_TSIZE(i)));
-                nv_wr32(dev, NV10_PGRAPH_TSTATUS(i),
-                                        nv_rd32(dev, NV10_PFB_TSTATUS(i)));
-        }
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < NV10_PFB_TILE__SIZE; i++)
+                nv10_graph_set_region_tiling(dev, i, 0, 0, 0);
 
         nv_wr32(dev, NV10_PGRAPH_CTX_SWITCH1, 0x00000000);
         nv_wr32(dev, NV10_PGRAPH_CTX_SWITCH2, 0x00000000);
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 81c01353a9f9..58b917c3341b 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -33,13 +33,103 @@
 #include "nouveau_hw.h"
 #include "nv17_tv.h"
 
-enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
-                                         struct drm_connector *connector,
-                                         uint32_t pin_mask)
+static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
 {
+        struct drm_device *dev = encoder->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
+        uint32_t gpio0, gpio1, fp_htotal, fp_hsync_start, fp_hsync_end,
+                fp_control, test_ctrl, dacclk, ctv_14, ctv_1c, ctv_6c;
+        uint32_t sample = 0;
+        int head;
+
+#define RGB_TEST_DATA(r, g, b) (r << 0 | g << 10 | b << 20)
+        testval = RGB_TEST_DATA(0x82, 0xeb, 0x82);
+        if (dev_priv->vbios->tvdactestval)
+                testval = dev_priv->vbios->tvdactestval;
+
+        dacclk = NVReadRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset);
+        head = (dacclk & 0x100) >> 8;
+
+        /* Save the previous state. */
+        gpio1 = nv17_gpio_get(dev, DCB_GPIO_TVDAC1);
+        gpio0 = nv17_gpio_get(dev, DCB_GPIO_TVDAC0);
+        fp_htotal = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL);
+        fp_hsync_start = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START);
+        fp_hsync_end = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END);
+        fp_control = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL);
+        test_ctrl = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
+        ctv_1c = NVReadRAMDAC(dev, head, 0x680c1c);
+        ctv_14 = NVReadRAMDAC(dev, head, 0x680c14);
+        ctv_6c = NVReadRAMDAC(dev, head, 0x680c6c);
+
+        /* Prepare the DAC for load detection.  */
+        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, true);
+        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, true);
+
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, 1343);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, 1047);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, 1183);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL,
+                      NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS |
+                      NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12 |
+                      NV_PRAMDAC_FP_TG_CONTROL_READ_PROG |
+                      NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS |
+                      NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS);
+
+        NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset, 0);
+
+        NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset,
+                      (dacclk & ~0xff) | 0x22);
+        msleep(1);
+        NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset,
+                      (dacclk & ~0xff) | 0x21);
+
+        NVWriteRAMDAC(dev, head, 0x680c1c, 1 << 20);
+        NVWriteRAMDAC(dev, head, 0x680c14, 4 << 16);
+
+        /* Sample pin 0x4 (usually S-video luma). */
+        NVWriteRAMDAC(dev, head, 0x680c6c, testval >> 10 & 0x3ff);
+        msleep(20);
+        sample |= NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset)
+                & 0x4 << 28;
+
+        /* Sample the remaining pins. */
+        NVWriteRAMDAC(dev, head, 0x680c6c, testval & 0x3ff);
+        msleep(20);
+        sample |= NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset)
+                & 0xa << 28;
+
+        /* Restore the previous state. */
+        NVWriteRAMDAC(dev, head, 0x680c1c, ctv_1c);
+        NVWriteRAMDAC(dev, head, 0x680c14, ctv_14);
+        NVWriteRAMDAC(dev, head, 0x680c6c, ctv_6c);
+        NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset, dacclk);
+        NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset, test_ctrl);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL, fp_control);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, fp_hsync_end);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, fp_hsync_start);
+        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, fp_htotal);
+        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, gpio1);
+        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, gpio0);
+
+        return sample;
+}
+
+static enum drm_connector_status
+nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+        struct drm_device *dev = encoder->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct drm_mode_config *conf = &dev->mode_config;
         struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder);
+        struct dcb_entry *dcb = tv_enc->base.dcb;
 
-        tv_enc->pin_mask = pin_mask >> 28 & 0xe;
+        if (dev_priv->chipset == 0x42 ||
+            dev_priv->chipset == 0x43)
+                tv_enc->pin_mask = nv42_tv_sample_load(encoder) >> 28 & 0xe;
+        else
+                tv_enc->pin_mask = nv17_dac_sample_load(encoder) >> 28 & 0xe;
 
         switch (tv_enc->pin_mask) {
         case 0x2:
@@ -50,7 +140,7 @@ enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
                 tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_SVIDEO;
                 break;
         case 0xe:
-                if (nouveau_encoder(encoder)->dcb->tvconf.has_component_output)
+                if (dcb->tvconf.has_component_output)
                         tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_Component;
                 else
                         tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_SCART;
@@ -61,11 +151,16 @@ enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
         }
 
         drm_connector_property_set_value(connector,
-                        encoder->dev->mode_config.tv_subconnector_property,
-                                                        tv_enc->subconnector);
+                                         conf->tv_subconnector_property,
+                                         tv_enc->subconnector);
 
-        return tv_enc->subconnector ? connector_status_connected :
-                                        connector_status_disconnected;
+        if (tv_enc->subconnector) {
+                NV_INFO(dev, "Load detected on output %c\n",
+                        '@' + ffs(dcb->or));
+                return connector_status_connected;
+        } else {
+                return connector_status_disconnected;
+        }
 }
 
 static const struct {
@@ -633,7 +728,7 @@ static struct drm_encoder_helper_funcs nv17_tv_helper_funcs = {
         .prepare = nv17_tv_prepare,
         .commit = nv17_tv_commit,
         .mode_set = nv17_tv_mode_set,
-        .detect = nv17_dac_detect,
+        .detect = nv17_tv_detect,
 };
 
 static struct drm_encoder_slave_funcs nv17_tv_slave_funcs = {
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index 18ba74f19703..d6fc0a82f03d 100644
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c
@@ -514,6 +514,27 @@ nv20_graph_rdi(struct drm_device *dev)
         nouveau_wait_for_idle(dev);
 }
 
+void
+nv20_graph_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                             uint32_t size, uint32_t pitch)
+{
+        uint32_t limit = max(1u, addr + size) - 1;
+
+        if (pitch)
+                addr |= 1;
+
+        nv_wr32(dev, NV20_PGRAPH_TLIMIT(i), limit);
+        nv_wr32(dev, NV20_PGRAPH_TSIZE(i), pitch);
+        nv_wr32(dev, NV20_PGRAPH_TILE(i), addr);
+
+        nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0030 + 4 * i);
+        nv_wr32(dev, NV10_PGRAPH_RDI_DATA, limit);
+        nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0050 + 4 * i);
+        nv_wr32(dev, NV10_PGRAPH_RDI_DATA, pitch);
+        nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0010 + 4 * i);
+        nv_wr32(dev, NV10_PGRAPH_RDI_DATA, addr);
+}
+
 int
 nv20_graph_init(struct drm_device *dev)
 {
@@ -572,27 +593,10 @@ nv20_graph_init(struct drm_device *dev)
                 nv_wr32(dev, NV10_PGRAPH_RDI_DATA , 0x00000030);
         }
 
-        /* copy tile info from PFB */
-        for (i = 0; i < NV10_PFB_TILE__SIZE; i++) {
-                nv_wr32(dev, 0x00400904 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TLIMIT(i)));
-                        /* which is NV40_PGRAPH_TLIMIT0(i) ?? */
-                nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0030 + i * 4);
-                nv_wr32(dev, NV10_PGRAPH_RDI_DATA,
-                                        nv_rd32(dev, NV10_PFB_TLIMIT(i)));
-                nv_wr32(dev, 0x00400908 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TSIZE(i)));
-                        /* which is NV40_PGRAPH_TSIZE0(i) ?? */
-                nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0050 + i * 4);
-                nv_wr32(dev, NV10_PGRAPH_RDI_DATA,
-                                        nv_rd32(dev, NV10_PFB_TSIZE(i)));
-                nv_wr32(dev, 0x00400900 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TILE(i)));
-                        /* which is NV40_PGRAPH_TILE0(i) ?? */
-                nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0010 + i * 4);
-                nv_wr32(dev, NV10_PGRAPH_RDI_DATA,
-                                        nv_rd32(dev, NV10_PFB_TILE(i)));
-        }
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < NV10_PFB_TILE__SIZE; i++)
+                nv20_graph_set_region_tiling(dev, i, 0, 0, 0);
+
         for (i = 0; i < 8; i++) {
                 nv_wr32(dev, 0x400980 + i * 4, nv_rd32(dev, 0x100300 + i * 4));
                 nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0090 + i * 4);
@@ -704,18 +708,9 @@ nv30_graph_init(struct drm_device *dev)
 
         nv_wr32(dev, 0x4000c0, 0x00000016);
 
-        /* copy tile info from PFB */
-        for (i = 0; i < NV10_PFB_TILE__SIZE; i++) {
-                nv_wr32(dev, 0x00400904 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TLIMIT(i)));
-                        /* which is NV40_PGRAPH_TLIMIT0(i) ?? */
-                nv_wr32(dev, 0x00400908 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TSIZE(i)));
-                        /* which is NV40_PGRAPH_TSIZE0(i) ?? */
-                nv_wr32(dev, 0x00400900 + i * 0x10,
-                                        nv_rd32(dev, NV10_PFB_TILE(i)));
-                        /* which is NV40_PGRAPH_TILE0(i) ?? */
-        }
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < NV10_PFB_TILE__SIZE; i++)
+                nv20_graph_set_region_tiling(dev, i, 0, 0, 0);
 
         nv_wr32(dev, NV10_PGRAPH_CTX_CONTROL, 0x10000100);
         nv_wr32(dev, NV10_PGRAPH_STATE      , 0xFFFFFFFF);
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/nv40_fb.c
index ca1d27107a8e..3cd07d8d5bd7 100644
--- a/drivers/gpu/drm/nouveau/nv40_fb.c
+++ b/drivers/gpu/drm/nouveau/nv40_fb.c
@@ -3,12 +3,37 @@
 #include "nouveau_drv.h"
 #include "nouveau_drm.h"
 
+void
+nv40_fb_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                          uint32_t size, uint32_t pitch)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        uint32_t limit = max(1u, addr + size) - 1;
+
+        if (pitch)
+                addr |= 1;
+
+        switch (dev_priv->chipset) {
+        case 0x40:
+                nv_wr32(dev, NV10_PFB_TLIMIT(i), limit);
+                nv_wr32(dev, NV10_PFB_TSIZE(i), pitch);
+                nv_wr32(dev, NV10_PFB_TILE(i), addr);
+                break;
+
+        default:
+                nv_wr32(dev, NV40_PFB_TLIMIT(i), limit);
+                nv_wr32(dev, NV40_PFB_TSIZE(i), pitch);
+                nv_wr32(dev, NV40_PFB_TILE(i), addr);
+                break;
+        }
+}
+
 int
 nv40_fb_init(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t fb_bar_size, tmp;
-        int num_tiles;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
+        uint32_t tmp;
         int i;
 
         /* This is strictly a NV4x register (don't know about NV5x). */
@@ -23,35 +48,23 @@ nv40_fb_init(struct drm_device *dev)
         case 0x45:
                 tmp = nv_rd32(dev, NV10_PFB_CLOSE_PAGE2);
                 nv_wr32(dev, NV10_PFB_CLOSE_PAGE2, tmp & ~(1 << 15));
-                num_tiles = NV10_PFB_TILE__SIZE;
+                pfb->num_tiles = NV10_PFB_TILE__SIZE;
                 break;
         case 0x46: /* G72 */
         case 0x47: /* G70 */
         case 0x49: /* G71 */
         case 0x4b: /* G73 */
         case 0x4c: /* C51 (G7X version) */
-                num_tiles = NV40_PFB_TILE__SIZE_1;
+                pfb->num_tiles = NV40_PFB_TILE__SIZE_1;
                 break;
         default:
-                num_tiles = NV40_PFB_TILE__SIZE_0;
+                pfb->num_tiles = NV40_PFB_TILE__SIZE_0;
                 break;
         }
 
-        fb_bar_size = drm_get_resource_len(dev, 0) - 1;
-        switch (dev_priv->chipset) {
-        case 0x40:
-                for (i = 0; i < num_tiles; i++) {
-                        nv_wr32(dev, NV10_PFB_TILE(i), 0);
-                        nv_wr32(dev, NV10_PFB_TLIMIT(i), fb_bar_size);
-                }
-                break;
-        default:
-                for (i = 0; i < num_tiles; i++) {
-                        nv_wr32(dev, NV40_PFB_TILE(i), 0);
-                        nv_wr32(dev, NV40_PFB_TLIMIT(i), fb_bar_size);
-                }
-                break;
-        }
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < pfb->num_tiles; i++)
+                pfb->set_region_tiling(dev, i, 0, 0, 0);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index 2b332bb55acf..53e8afe1dcd1 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -181,6 +181,48 @@ nv40_graph_unload_context(struct drm_device *dev)
         return ret;
 }
 
+void
+nv40_graph_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
+                             uint32_t size, uint32_t pitch)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        uint32_t limit = max(1u, addr + size) - 1;
+
+        if (pitch)
+                addr |= 1;
+
+        switch (dev_priv->chipset) {
+        case 0x44:
+        case 0x4a:
+        case 0x4e:
+                nv_wr32(dev, NV20_PGRAPH_TSIZE(i), pitch);
+                nv_wr32(dev, NV20_PGRAPH_TLIMIT(i), limit);
+                nv_wr32(dev, NV20_PGRAPH_TILE(i), addr);
+                break;
+
+        case 0x46:
+        case 0x47:
+        case 0x49:
+        case 0x4b:
+                nv_wr32(dev, NV47_PGRAPH_TSIZE(i), pitch);
+                nv_wr32(dev, NV47_PGRAPH_TLIMIT(i), limit);
+                nv_wr32(dev, NV47_PGRAPH_TILE(i), addr);
+                nv_wr32(dev, NV40_PGRAPH_TSIZE1(i), pitch);
+                nv_wr32(dev, NV40_PGRAPH_TLIMIT1(i), limit);
+                nv_wr32(dev, NV40_PGRAPH_TILE1(i), addr);
+                break;
+
+        default:
+                nv_wr32(dev, NV20_PGRAPH_TSIZE(i), pitch);
+                nv_wr32(dev, NV20_PGRAPH_TLIMIT(i), limit);
+                nv_wr32(dev, NV20_PGRAPH_TILE(i), addr);
+                nv_wr32(dev, NV40_PGRAPH_TSIZE1(i), pitch);
+                nv_wr32(dev, NV40_PGRAPH_TLIMIT1(i), limit);
+                nv_wr32(dev, NV40_PGRAPH_TILE1(i), addr);
+                break;
+        }
+}
+
 /*
  * G70          0x47
  * G71          0x49
@@ -195,7 +237,8 @@ nv40_graph_init(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv =
                 (struct drm_nouveau_private *)dev->dev_private;
-        uint32_t vramsz, tmp;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
+        uint32_t vramsz;
         int i, j;
 
         nv_wr32(dev, NV03_PMC_ENABLE, nv_rd32(dev, NV03_PMC_ENABLE) &
@@ -292,74 +335,9 @@ nv40_graph_init(struct drm_device *dev)
         nv_wr32(dev, 0x400b38, 0x2ffff800);
         nv_wr32(dev, 0x400b3c, 0x00006000);
 
-        /* copy tile info from PFB */
-        switch (dev_priv->chipset) {
-        case 0x40: /* vanilla NV40 */
-                for (i = 0; i < NV10_PFB_TILE__SIZE; i++) {
-                        tmp = nv_rd32(dev, NV10_PFB_TILE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TILE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TILE1(i), tmp);
-                        tmp = nv_rd32(dev, NV10_PFB_TLIMIT(i));
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT1(i), tmp);
-                        tmp = nv_rd32(dev, NV10_PFB_TSIZE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE1(i), tmp);
-                        tmp = nv_rd32(dev, NV10_PFB_TSTATUS(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS1(i), tmp);
-                }
-                break;
-        case 0x44:
-        case 0x4a:
-        case 0x4e: /* NV44-based cores don't have 0x406900? */
-                for (i = 0; i < NV40_PFB_TILE__SIZE_0; i++) {
-                        tmp = nv_rd32(dev, NV40_PFB_TILE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TILE0(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TLIMIT(i));
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT0(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSIZE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE0(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSTATUS(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS0(i), tmp);
-                }
-                break;
-        case 0x46:
-        case 0x47:
-        case 0x49:
-        case 0x4b: /* G7X-based cores */
-                for (i = 0; i < NV40_PFB_TILE__SIZE_1; i++) {
-                        tmp = nv_rd32(dev, NV40_PFB_TILE(i));
-                        nv_wr32(dev, NV47_PGRAPH_TILE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TILE1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TLIMIT(i));
-                        nv_wr32(dev, NV47_PGRAPH_TLIMIT0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSIZE(i));
-                        nv_wr32(dev, NV47_PGRAPH_TSIZE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSTATUS(i));
-                        nv_wr32(dev, NV47_PGRAPH_TSTATUS0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS1(i), tmp);
-                }
-                break;
-        default: /* everything else */
-                for (i = 0; i < NV40_PFB_TILE__SIZE_0; i++) {
-                        tmp = nv_rd32(dev, NV40_PFB_TILE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TILE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TILE1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TLIMIT(i));
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TLIMIT1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSIZE(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSIZE1(i), tmp);
-                        tmp = nv_rd32(dev, NV40_PFB_TSTATUS(i));
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS0(i), tmp);
-                        nv_wr32(dev, NV40_PGRAPH_TSTATUS1(i), tmp);
-                }
-                break;
-        }
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < pfb->num_tiles; i++)
+                nv40_graph_set_region_tiling(dev, i, 0, 0, 0);
 
         /* begin RAM config */
         vramsz = drm_get_resource_len(dev, 0) - 1;
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index 118d3285fd8c..40b7360841f8 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -432,6 +432,7 @@ nv50_crtc_prepare(struct drm_crtc *crtc)
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         struct drm_device *dev = crtc->dev;
         struct drm_encoder *encoder;
+        uint32_t dac = 0, sor = 0;
 
         NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);
 
@@ -439,9 +440,28 @@ nv50_crtc_prepare(struct drm_crtc *crtc)
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                 struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
 
-                if (drm_helper_encoder_in_use(encoder))
+                if (!drm_helper_encoder_in_use(encoder))
                         continue;
 
+                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
+                    nv_encoder->dcb->type == OUTPUT_TV)
+                        dac |= (1 << nv_encoder->or);
+                else
+                        sor |= (1 << nv_encoder->or);
+        }
+
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+
+                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
+                    nv_encoder->dcb->type == OUTPUT_TV) {
+                        if (dac & (1 << nv_encoder->or))
+                                continue;
+                } else {
+                        if (sor & (1 << nv_encoder->or))
+                                continue;
+                }
+
                 nv_encoder->disconnect(nv_encoder);
         }
 
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index a9263d92a231..90f0bf59fbcd 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -690,9 +690,21 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcbent,
                            int pxclk)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_connector *nv_connector = NULL;
+        struct drm_encoder *encoder;
         struct nvbios *bios = &dev_priv->VBIOS;
         uint32_t mc, script = 0, or;
 
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+
+                if (nv_encoder->dcb != dcbent)
+                        continue;
+
+                nv_connector = nouveau_encoder_connector_get(nv_encoder);
+                break;
+        }
+
         or = ffs(dcbent->or) - 1;
         mc = nv50_display_mode_ctrl(dev, dcbent->type != OUTPUT_ANALOG, or);
         switch (dcbent->type) {
@@ -711,6 +723,11 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcbent,
                         } else
                         if (bios->fp.strapless_is_24bit & 1)
                                 script |= 0x0200;
+
+                        if (nv_connector && nv_connector->edid &&
+                            (nv_connector->edid->revision >= 4) &&
+                            (nv_connector->edid->input & 0x70) >= 0x20)
+                                script |= 0x0200;
                 }
 
                 if (nouveau_uscript_lvds >= 0) {
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 6bcc6d39e9b0..e4f279ee61cf 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -16,9 +16,7 @@ nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) &&
              RING_SPACE(chan, rect->rop == ROP_COPY ? 7 : 11)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -31,7 +29,11 @@ nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
                 OUT_RING(chan, 1);
         }
         BEGIN_RING(chan, NvSub2D, 0x0588, 1);
-        OUT_RING(chan, rect->color);
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+                OUT_RING(chan, ((uint32_t *)info->pseudo_palette)[rect->color]);
+        else
+                OUT_RING(chan, rect->color);
         BEGIN_RING(chan, NvSub2D, 0x0600, 4);
         OUT_RING(chan, rect->dx);
         OUT_RING(chan, rect->dy);
@@ -56,9 +58,7 @@ nv50_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region)
                 return;
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 12)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -101,8 +101,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
         }
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED) && RING_SPACE(chan, 11)) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
-                info->flags |= FBINFO_HWACCEL_DISABLED;
+                nouveau_fbcon_gpu_lockup(info);
         }
 
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
@@ -135,9 +134,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
                 int push = dwords > 2047 ? 2047 : dwords;
 
                 if (RING_SPACE(chan, push + 1)) {
-                        NV_ERROR(dev,
-                                 "GPU lockup - switching to software fbcon\n");
-                        info->flags |= FBINFO_HWACCEL_DISABLED;
+                        nouveau_fbcon_gpu_lockup(info);
                         cfb_imageblit(info, image);
                         return;
                 }
@@ -199,7 +196,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
 
         ret = RING_SPACE(chan, 59);
         if (ret) {
-                NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
+                nouveau_fbcon_gpu_lockup(info);
                 return ret;
         }
 
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
index b7282284f080..32b244bcb482 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
@@ -272,7 +272,7 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
                         return ret;
                 ramfc = chan->ramfc->gpuobj;
 
-                ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, 4096, 256,
+                ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, 4096, 1024,
                                              0, &chan->cache);
                 if (ret)
                         return ret;
@@ -384,8 +384,8 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
                 nv_wr32(dev, NV40_PFIFO_CACHE1_DATA(ptr),
                         nv_ro32(dev, cache, (ptr * 2) + 1));
         }
-        nv_wr32(dev, 0x3210, cnt << 2);
-        nv_wr32(dev, 0x3270, 0);
+        nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, cnt << 2);
+        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
 
         /* guessing that all the 0x34xx regs aren't on NV50 */
         if (!IS_G80) {
@@ -398,8 +398,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
 
         dev_priv->engine.instmem.finish_access(dev);
 
-        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
-        nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
         nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16));
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index ca79f32be44c..20319e59d368 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -84,7 +84,7 @@ nv50_graph_init_regs__nv(struct drm_device *dev)
         nv_wr32(dev, 0x400804, 0xc0000000);
         nv_wr32(dev, 0x406800, 0xc0000000);
         nv_wr32(dev, 0x400c04, 0xc0000000);
-        nv_wr32(dev, 0x401804, 0xc0000000);
+        nv_wr32(dev, 0x401800, 0xc0000000);
         nv_wr32(dev, 0x405018, 0xc0000000);
         nv_wr32(dev, 0x402000, 0xc0000000);
 
@@ -282,6 +282,7 @@ nv50_graph_unload_context(struct drm_device *dev)
                 return 0;
         inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
 
+        nouveau_wait_for_idle(dev);
         nv_wr32(dev, 0x400500, fifo & ~1);
         nv_wr32(dev, 0x400784, inst);
         nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) | 0x20);
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index e395c16d30f5..ecf1936b8224 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -90,11 +90,24 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
 {
         struct drm_device *dev = encoder->dev;
         struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+        struct drm_encoder *enc;
         uint32_t val;
         int or = nv_encoder->or;
 
         NV_DEBUG_KMS(dev, "or %d mode %d\n", or, mode);
 
+        nv_encoder->last_dpms = mode;
+        list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
+                struct nouveau_encoder *nvenc = nouveau_encoder(enc);
+
+                if (nvenc == nv_encoder ||
+                    nvenc->dcb->or != nv_encoder->dcb->or)
+                        continue;
+
+                if (nvenc->last_dpms == DRM_MODE_DPMS_ON)
+                        return;
+        }
+
         /* wait for it to be done */
         if (!nv_wait(NV50_PDISPLAY_SOR_DPMS_CTRL(or),
                      NV50_PDISPLAY_SOR_DPMS_CTRL_PENDING, 0)) {
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index b5f5fe75e6af..1cc7b937b1ea 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -24,6 +24,9 @@ $(obj)/rv515_reg_safe.h: $(src)/reg_srcs/rv515 $(obj)/mkregtable
 $(obj)/r300_reg_safe.h: $(src)/reg_srcs/r300 $(obj)/mkregtable
         $(call if_changed,mkregtable)
 
+$(obj)/r420_reg_safe.h: $(src)/reg_srcs/r420 $(obj)/mkregtable
+        $(call if_changed,mkregtable)
+
 $(obj)/rs600_reg_safe.h: $(src)/reg_srcs/rs600 $(obj)/mkregtable
         $(call if_changed,mkregtable)
 
@@ -35,6 +38,8 @@ $(obj)/rv515.o: $(obj)/rv515_reg_safe.h
 
 $(obj)/r300.o: $(obj)/r300_reg_safe.h
 
+$(obj)/r420.o: $(obj)/r420_reg_safe.h
+
 $(obj)/rs600.o: $(obj)/rs600_reg_safe.h
 
 radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \
diff --git a/drivers/gpu/drm/radeon/ObjectID.h b/drivers/gpu/drm/radeon/ObjectID.h
index 6d0183c61d3b..c714179d1bfa 100644
--- a/drivers/gpu/drm/radeon/ObjectID.h
+++ b/drivers/gpu/drm/radeon/ObjectID.h
@@ -1,5 +1,5 @@
 /*
-* Copyright 2006-2007 Advanced Micro Devices, Inc.
+* Copyright 2006-2007 Advanced Micro Devices, Inc.  
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -41,14 +41,14 @@
 /****************************************************/
 /* Encoder Object ID Definition                     */
 /****************************************************/
-#define ENCODER_OBJECT_ID_NONE                    0x00
+#define ENCODER_OBJECT_ID_NONE                    0x00 
 
 /* Radeon Class Display Hardware */
 #define ENCODER_OBJECT_ID_INTERNAL_LVDS           0x01
 #define ENCODER_OBJECT_ID_INTERNAL_TMDS1          0x02
 #define ENCODER_OBJECT_ID_INTERNAL_TMDS2          0x03
 #define ENCODER_OBJECT_ID_INTERNAL_DAC1           0x04
-#define ENCODER_OBJECT_ID_INTERNAL_DAC2           0x05  /* TV/CV DAC */
+#define ENCODER_OBJECT_ID_INTERNAL_DAC2           0x05     /* TV/CV DAC */
 #define ENCODER_OBJECT_ID_INTERNAL_SDVOA          0x06
 #define ENCODER_OBJECT_ID_INTERNAL_SDVOB          0x07
 
@@ -56,11 +56,11 @@
 #define ENCODER_OBJECT_ID_SI170B                  0x08
 #define ENCODER_OBJECT_ID_CH7303                  0x09
 #define ENCODER_OBJECT_ID_CH7301                  0x0A
-#define ENCODER_OBJECT_ID_INTERNAL_DVO1           0x0B  /* This belongs to Radeon Class Display Hardware */
+#define ENCODER_OBJECT_ID_INTERNAL_DVO1           0x0B    /* This belongs to Radeon Class Display Hardware */
 #define ENCODER_OBJECT_ID_EXTERNAL_SDVOA          0x0C
 #define ENCODER_OBJECT_ID_EXTERNAL_SDVOB          0x0D
 #define ENCODER_OBJECT_ID_TITFP513                0x0E
-#define ENCODER_OBJECT_ID_INTERNAL_LVTM1          0x0F  /* not used for Radeon */
+#define ENCODER_OBJECT_ID_INTERNAL_LVTM1          0x0F    /* not used for Radeon */
 #define ENCODER_OBJECT_ID_VT1623                  0x10
 #define ENCODER_OBJECT_ID_HDMI_SI1930             0x11
 #define ENCODER_OBJECT_ID_HDMI_INTERNAL           0x12
@@ -68,9 +68,9 @@
 #define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1   0x13
 #define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1    0x14
 #define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1    0x15
-#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2    0x16  /* Shared with CV/TV and CRT */
-#define ENCODER_OBJECT_ID_SI178                   0X17  /* External TMDS (dual link, no HDCP.) */
-#define ENCODER_OBJECT_ID_MVPU_FPGA               0x18  /* MVPU FPGA chip */
+#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2    0x16  /* Shared with CV/TV and CRT */
+#define ENCODER_OBJECT_ID_SI178                   0X17  /* External TMDS (dual link, no HDCP.) */
+#define ENCODER_OBJECT_ID_MVPU_FPGA               0x18  /* MVPU FPGA chip */
 #define ENCODER_OBJECT_ID_INTERNAL_DDI            0x19
 #define ENCODER_OBJECT_ID_VT1625                  0x1A
 #define ENCODER_OBJECT_ID_HDMI_SI1932             0x1B
@@ -86,7 +86,7 @@
 /****************************************************/
 /* Connector Object ID Definition                   */
 /****************************************************/
-#define CONNECTOR_OBJECT_ID_NONE                  0x00
+#define CONNECTOR_OBJECT_ID_NONE                  0x00 
 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I     0x01
 #define CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I       0x02
 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D     0x03
@@ -96,7 +96,7 @@
 #define CONNECTOR_OBJECT_ID_SVIDEO                0x07
 #define CONNECTOR_OBJECT_ID_YPbPr                 0x08
 #define CONNECTOR_OBJECT_ID_D_CONNECTOR           0x09
-#define CONNECTOR_OBJECT_ID_9PIN_DIN              0x0A  /* Supports both CV & TV */
+#define CONNECTOR_OBJECT_ID_9PIN_DIN              0x0A  /* Supports both CV & TV */
 #define CONNECTOR_OBJECT_ID_SCART                 0x0B
 #define CONNECTOR_OBJECT_ID_HDMI_TYPE_A           0x0C
 #define CONNECTOR_OBJECT_ID_HDMI_TYPE_B           0x0D
@@ -106,6 +106,8 @@
 #define CONNECTOR_OBJECT_ID_CROSSFIRE             0x11
 #define CONNECTOR_OBJECT_ID_HARDCODE_DVI          0x12
 #define CONNECTOR_OBJECT_ID_DISPLAYPORT           0x13
+#define CONNECTOR_OBJECT_ID_eDP                   0x14
+#define CONNECTOR_OBJECT_ID_MXM                   0x15
 
 /* deleted */
 
@@ -116,6 +118,14 @@
 #define ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL                              0x01
 
 /****************************************************/
+/* Generic Object ID Definition                     */
+/****************************************************/
+#define GENERIC_OBJECT_ID_NONE                    0x00
+#define GENERIC_OBJECT_ID_GLSYNC                  0x01
+#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE        0x02
+#define GENERIC_OBJECT_ID_MXM_OPM                 0x03
+
+/****************************************************/
 /* Graphics Object ENUM ID Definition               */
 /****************************************************/
 #define GRAPH_OBJECT_ENUM_ID1                     0x01
@@ -124,6 +134,7 @@
 #define GRAPH_OBJECT_ENUM_ID4                     0x04
 #define GRAPH_OBJECT_ENUM_ID5                     0x05
 #define GRAPH_OBJECT_ENUM_ID6                     0x06
+#define GRAPH_OBJECT_ENUM_ID7                     0x07
 
 /****************************************************/
 /* Graphics Object ID Bit definition                */
@@ -133,35 +144,35 @@
 #define RESERVED1_ID_MASK                         0x0800
 #define OBJECT_TYPE_MASK                          0x7000
 #define RESERVED2_ID_MASK                         0x8000
-
+                                                  
 #define OBJECT_ID_SHIFT                           0x00
 #define ENUM_ID_SHIFT                             0x08
 #define OBJECT_TYPE_SHIFT                         0x0C
 
+
 /****************************************************/
 /* Graphics Object family definition                */
 /****************************************************/
-#define CONSTRUCTOBJECTFAMILYID(GRAPHICS_OBJECT_TYPE, GRAPHICS_OBJECT_ID) \
-        (GRAPHICS_OBJECT_TYPE << OBJECT_TYPE_SHIFT | \
-         GRAPHICS_OBJECT_ID   << OBJECT_ID_SHIFT)
+#define CONSTRUCTOBJECTFAMILYID(GRAPHICS_OBJECT_TYPE, GRAPHICS_OBJECT_ID) (GRAPHICS_OBJECT_TYPE << OBJECT_TYPE_SHIFT | \
+                                                                           GRAPHICS_OBJECT_ID   << OBJECT_ID_SHIFT)
 /****************************************************/
 /* GPU Object ID definition - Shared with BIOS      */
 /****************************************************/
-#define GPU_ENUM_ID1    (GRAPH_OBJECT_TYPE_GPU << OBJECT_TYPE_SHIFT |\
-                         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT)
+#define GPU_ENUM_ID1                            ( GRAPH_OBJECT_TYPE_GPU << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT)
 
 /****************************************************/
 /* Encoder Object ID definition - Shared with BIOS  */
 /****************************************************/
 /*
-#define ENCODER_INTERNAL_LVDS_ENUM_ID1        0x2101
+#define ENCODER_INTERNAL_LVDS_ENUM_ID1        0x2101      
 #define ENCODER_INTERNAL_TMDS1_ENUM_ID1       0x2102
 #define ENCODER_INTERNAL_TMDS2_ENUM_ID1       0x2103
 #define ENCODER_INTERNAL_DAC1_ENUM_ID1        0x2104
 #define ENCODER_INTERNAL_DAC2_ENUM_ID1        0x2105
 #define ENCODER_INTERNAL_SDVOA_ENUM_ID1       0x2106
 #define ENCODER_INTERNAL_SDVOB_ENUM_ID1       0x2107
-#define ENCODER_SIL170B_ENUM_ID1              0x2108
+#define ENCODER_SIL170B_ENUM_ID1              0x2108  
 #define ENCODER_CH7303_ENUM_ID1               0x2109
 #define ENCODER_CH7301_ENUM_ID1               0x210A
 #define ENCODER_INTERNAL_DVO1_ENUM_ID1        0x210B
@@ -175,8 +186,8 @@
 #define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1   0x2113
 #define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1    0x2114
 #define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1    0x2115
-#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1    0x2116
-#define ENCODER_SI178_ENUM_ID1                   0x2117
+#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1    0x2116  
+#define ENCODER_SI178_ENUM_ID1                   0x2117 
 #define ENCODER_MVPU_FPGA_ENUM_ID1               0x2118
 #define ENCODER_INTERNAL_DDI_ENUM_ID1            0x2119
 #define ENCODER_VT1625_ENUM_ID1                  0x211A
@@ -185,205 +196,169 @@
 #define ENCODER_DP_DP501_ENUM_ID1                0x211D
 #define ENCODER_INTERNAL_UNIPHY_ENUM_ID1         0x211E
 */
-#define ENCODER_INTERNAL_LVDS_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_LVDS << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_TMDS1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_TMDS1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_TMDS2_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_TMDS2 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_DAC1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_DAC1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_DAC2_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_DAC2 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_SDVOA_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_SDVOA << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_SDVOA_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_SDVOA << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_SDVOB_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_SDVOB << OBJECT_ID_SHIFT)
-
-#define ENCODER_SIL170B_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_SI170B << OBJECT_ID_SHIFT)
-
-#define ENCODER_CH7303_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_CH7303 << OBJECT_ID_SHIFT)
-
-#define ENCODER_CH7301_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_CH7301 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_DVO1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_DVO1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_EXTERNAL_SDVOA_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_EXTERNAL_SDVOA << OBJECT_ID_SHIFT)
-
-#define ENCODER_EXTERNAL_SDVOA_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_EXTERNAL_SDVOA << OBJECT_ID_SHIFT)
-
-#define ENCODER_EXTERNAL_SDVOB_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_EXTERNAL_SDVOB << OBJECT_ID_SHIFT)
-
-#define ENCODER_TITFP513_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_TITFP513 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_LVTM1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_LVTM1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_VT1623_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_VT1623 << OBJECT_ID_SHIFT)
-
-#define ENCODER_HDMI_SI1930_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_HDMI_SI1930 << OBJECT_ID_SHIFT)
-
-#define ENCODER_HDMI_INTERNAL_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_HDMI_INTERNAL << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 << OBJECT_ID_SHIFT) /* Shared with CV/TV and CRT */
-
-#define ENCODER_SI178_ENUM_ID1  \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT)
-
-#define ENCODER_MVPU_FPGA_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_MVPU_FPGA << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_DDI_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT)
-
-#define ENCODER_VT1625_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_VT1625 << OBJECT_ID_SHIFT)
-
-#define ENCODER_HDMI_SI1932_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_HDMI_SI1932 << OBJECT_ID_SHIFT)
-
-#define ENCODER_DP_DP501_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_DP_DP501 << OBJECT_ID_SHIFT)
-
-#define ENCODER_DP_AN9801_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_DP_AN9801 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
-
-#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
-
-#define ENCODER_GENERAL_EXTERNAL_DVO_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO << OBJECT_ID_SHIFT)
+#define ENCODER_INTERNAL_LVDS_ENUM_ID1     ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_LVDS << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_TMDS1_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_TMDS1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_TMDS2_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_TMDS2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DAC1_ENUM_ID1     ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_DAC1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DAC2_ENUM_ID1     ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_DAC2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOA_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_SDVOA << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOA_ENUM_ID2    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_SDVOA << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_SDVOB_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_SDVOB << OBJECT_ID_SHIFT)
+
+#define ENCODER_SIL170B_ENUM_ID1           ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_SI170B << OBJECT_ID_SHIFT)
+
+#define ENCODER_CH7303_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_CH7303 << OBJECT_ID_SHIFT)
+
+#define ENCODER_CH7301_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_CH7301 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DVO1_ENUM_ID1     ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_DVO1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_EXTERNAL_SDVOA_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_EXTERNAL_SDVOA << OBJECT_ID_SHIFT)
+
+#define ENCODER_EXTERNAL_SDVOA_ENUM_ID2    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_EXTERNAL_SDVOA << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_EXTERNAL_SDVOB_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_EXTERNAL_SDVOB << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_TITFP513_ENUM_ID1          ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_TITFP513 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_LVTM1_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_LVTM1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_VT1623_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_VT1623 << OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_SI1930_ENUM_ID1       ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_HDMI_SI1930 << OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_INTERNAL_ENUM_ID1     ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_HDMI_INTERNAL << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1   ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID2   ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 << OBJECT_ID_SHIFT)
+
+
+#define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 << OBJECT_ID_SHIFT)  // Shared with CV/TV and CRT
+
+#define ENCODER_SI178_ENUM_ID1                    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT)  
+
+#define ENCODER_MVPU_FPGA_ENUM_ID1                ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                   GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                   ENCODER_OBJECT_ID_MVPU_FPGA << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_DDI_ENUM_ID1     (  GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT) 
+
+#define ENCODER_VT1625_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_VT1625 << OBJECT_ID_SHIFT)
+
+#define ENCODER_HDMI_SI1932_ENUM_ID1       ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_HDMI_SI1932 << OBJECT_ID_SHIFT)
+
+#define ENCODER_DP_DP501_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_DP_DP501 << OBJECT_ID_SHIFT)
+
+#define ENCODER_DP_AN9801_ENUM_ID1            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                             GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                             ENCODER_OBJECT_ID_DP_AN9801 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY_ENUM_ID2         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1   ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT)  
+
+#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID1         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY1_ENUM_ID2         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID1         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_INTERNAL_UNIPHY2_ENUM_ID2         ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
+
+#define ENCODER_GENERAL_EXTERNAL_DVO_ENUM_ID1    ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                  ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO << OBJECT_ID_SHIFT)
 
 /****************************************************/
 /* Connector Object ID definition - Shared with BIOS */
@@ -406,167 +381,253 @@
 #define CONNECTOR_7PIN_DIN_ENUM_ID1                 0x310F
 #define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1           0x3110
 */
-#define CONNECTOR_LVDS_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_VGA_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_VGA_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_COMPOSITE_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SVIDEO_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_YPbPr_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_D_CONNECTOR_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_9PIN_DIN_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_SCART_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_7PIN_DIN_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_CROSSFIRE_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_CROSSFIRE << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_CROSSFIRE_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_CROSSFIRE << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_HARDCODE_DVI_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_HARDCODE_DVI_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DISPLAYPORT_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DISPLAYPORT_ENUM_ID2 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DISPLAYPORT_ENUM_ID3 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
-
-#define CONNECTOR_DISPLAYPORT_ENUM_ID4 \
-        (GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\
-         CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+#define CONNECTOR_LVDS_ENUM_ID1                ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_LVDS_ENUM_ID2                ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_eDP_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_eDP_ENUM_ID2                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID2   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID1     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_I_ENUM_ID2     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID1   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID2   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID2     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID3     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_VGA_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_VGA_ENUM_ID2                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_COMPOSITE_ENUM_ID1           ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_COMPOSITE_ENUM_ID2           ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SVIDEO_ENUM_ID1              ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SVIDEO_ENUM_ID2              ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_YPbPr_ENUM_ID1               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_YPbPr_ENUM_ID2               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_D_CONNECTOR_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_D_CONNECTOR_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_9PIN_DIN_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_9PIN_DIN_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SCART_ENUM_ID1               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_SCART_ENUM_ID2               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID3         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_7PIN_DIN_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
+#define CONNECTOR_7PIN_DIN_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1      ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID2      ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_CROSSFIRE_ENUM_ID1           ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_CROSSFIRE << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_CROSSFIRE_ENUM_ID2           ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_CROSSFIRE << OBJECT_ID_SHIFT)
+
+
+#define CONNECTOR_HARDCODE_DVI_ENUM_ID1        ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_HARDCODE_DVI_ENUM_ID2        ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HARDCODE_DVI << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID3         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID4         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID5         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_DISPLAYPORT_ENUM_ID6         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+
+#define CONNECTOR_MXM_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_A
+
+#define CONNECTOR_MXM_ENUM_ID2                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_B
+
+#define CONNECTOR_MXM_ENUM_ID3                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_C
+
+#define CONNECTOR_MXM_ENUM_ID4                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_D
+
+#define CONNECTOR_MXM_ENUM_ID5                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_LVDS_TXxx
+
+#define CONNECTOR_MXM_ENUM_ID6                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_LVDS_UXxx
+
+#define CONNECTOR_MXM_ENUM_ID7                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID7 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DAC
 
 /****************************************************/
 /* Router Object ID definition - Shared with BIOS   */
 /****************************************************/
-#define ROUTER_I2C_EXTENDER_CNTL_ENUM_ID1 \
-        (GRAPH_OBJECT_TYPE_ROUTER << OBJECT_TYPE_SHIFT |\
-         GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
-         ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL << OBJECT_ID_SHIFT)
+#define ROUTER_I2C_EXTENDER_CNTL_ENUM_ID1      ( GRAPH_OBJECT_TYPE_ROUTER << OBJECT_TYPE_SHIFT |\
+                                                GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL << OBJECT_ID_SHIFT)
 
 /* deleted */
 
 /****************************************************/
+/* Generic Object ID definition - Shared with BIOS  */
+/****************************************************/
+#define GENERICOBJECT_GLSYNC_ENUM_ID1           (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_GLSYNC << OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID1       (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID2       (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+
+#define GENERICOBJECT_MXM_OPM_ENUM_ID1           (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_MXM_OPM << OBJECT_ID_SHIFT)
+
+/****************************************************/
 /* Object Cap definition - Shared with BIOS         */
 /****************************************************/
 #define GRAPHICS_OBJECT_CAP_I2C                 0x00000001L
 #define GRAPHICS_OBJECT_CAP_TABLE_ID            0x00000002L
 
+
 #define GRAPHICS_OBJECT_I2CCOMMAND_TABLE_ID                   0x01
 #define GRAPHICS_OBJECT_HOTPLUGDETECTIONINTERUPT_TABLE_ID     0x02
 #define GRAPHICS_OBJECT_ENCODER_OUTPUT_PROTECTION_TABLE_ID    0x03
@@ -575,4 +636,8 @@
 #pragma pack()
 #endif
 
-#endif /*GRAPHICTYPE */
+#endif  /*GRAPHICTYPE */
+
+
+
+
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 388140a7e651..e3b44562d265 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -246,6 +246,9 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
                 case ATOM_WS_ATTRIBUTES:
                         val = gctx->io_attr;
                         break;
+                case ATOM_WS_REGPTR:
+                        val = gctx->reg_block;
+                        break;
                 default:
                         val = ctx->ws[idx];
                 }
@@ -385,6 +388,32 @@ static uint32_t atom_get_src(atom_exec_context *ctx, uint8_t attr, int *ptr)
         return atom_get_src_int(ctx, attr, ptr, NULL, 1);
 }
 
+static uint32_t atom_get_src_direct(atom_exec_context *ctx, uint8_t align, int *ptr)
+{
+        uint32_t val = 0xCDCDCDCD;
+
+        switch (align) {
+        case ATOM_SRC_DWORD:
+                val = U32(*ptr);
+                (*ptr) += 4;
+                break;
+        case ATOM_SRC_WORD0:
+        case ATOM_SRC_WORD8:
+        case ATOM_SRC_WORD16:
+                val = U16(*ptr);
+                (*ptr) += 2;
+                break;
+        case ATOM_SRC_BYTE0:
+        case ATOM_SRC_BYTE8:
+        case ATOM_SRC_BYTE16:
+        case ATOM_SRC_BYTE24:
+                val = U8(*ptr);
+                (*ptr)++;
+                break;
+        }
+        return val;
+}
+
 static uint32_t atom_get_dst(atom_exec_context *ctx, int arg, uint8_t attr,
                              int *ptr, uint32_t *saved, int print)
 {
@@ -482,6 +511,9 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
                 case ATOM_WS_ATTRIBUTES:
                         gctx->io_attr = val;
                         break;
+                case ATOM_WS_REGPTR:
+                        gctx->reg_block = val;
+                        break;
                 default:
                         ctx->ws[idx] = val;
                 }
@@ -677,7 +709,7 @@ static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg)
         SDEBUG("   dst: ");
         dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
         SDEBUG("   src1: ");
-        src1 = atom_get_src(ctx, attr, ptr);
+        src1 = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr);
         SDEBUG("   src2: ");
         src2 = atom_get_src(ctx, attr, ptr);
         dst &= src1;
@@ -809,6 +841,38 @@ static void atom_op_setregblock(atom_exec_context *ctx, int *ptr, int arg)
         SDEBUG("   base: 0x%04X\n", ctx->ctx->reg_block);
 }
 
+static void atom_op_shift_left(atom_exec_context *ctx, int *ptr, int arg)
+{
+        uint8_t attr = U8((*ptr)++), shift;
+        uint32_t saved, dst;
+        int dptr = *ptr;
+        attr &= 0x38;
+        attr |= atom_def_dst[attr >> 3] << 6;
+        SDEBUG("   dst: ");
+        dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
+        shift = atom_get_src_direct(ctx, ATOM_SRC_BYTE0, ptr);
+        SDEBUG("   shift: %d\n", shift);
+        dst <<= shift;
+        SDEBUG("   dst: ");
+        atom_put_dst(ctx, arg, attr, &dptr, dst, saved);
+}
+
+static void atom_op_shift_right(atom_exec_context *ctx, int *ptr, int arg)
+{
+        uint8_t attr = U8((*ptr)++), shift;
+        uint32_t saved, dst;
+        int dptr = *ptr;
+        attr &= 0x38;
+        attr |= atom_def_dst[attr >> 3] << 6;
+        SDEBUG("   dst: ");
+        dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
+        shift = atom_get_src_direct(ctx, ATOM_SRC_BYTE0, ptr);
+        SDEBUG("   shift: %d\n", shift);
+        dst >>= shift;
+        SDEBUG("   dst: ");
+        atom_put_dst(ctx, arg, attr, &dptr, dst, saved);
+}
+
 static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg)
 {
         uint8_t attr = U8((*ptr)++), shift;
@@ -818,7 +882,7 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg)
         attr |= atom_def_dst[attr >> 3] << 6;
         SDEBUG("   dst: ");
         dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
-        shift = U8((*ptr)++);
+        shift = atom_get_src(ctx, attr, ptr);
         SDEBUG("   shift: %d\n", shift);
         dst <<= shift;
         SDEBUG("   dst: ");
@@ -834,7 +898,7 @@ static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg)
         attr |= atom_def_dst[attr >> 3] << 6;
         SDEBUG("   dst: ");
         dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
-        shift = U8((*ptr)++);
+        shift = atom_get_src(ctx, attr, ptr);
         SDEBUG("   shift: %d\n", shift);
         dst >>= shift;
         SDEBUG("   dst: ");
@@ -937,18 +1001,18 @@ static struct {
         atom_op_or, ATOM_ARG_FB}, {
         atom_op_or, ATOM_ARG_PLL}, {
         atom_op_or, ATOM_ARG_MC}, {
-        atom_op_shl, ATOM_ARG_REG}, {
-        atom_op_shl, ATOM_ARG_PS}, {
-        atom_op_shl, ATOM_ARG_WS}, {
-        atom_op_shl, ATOM_ARG_FB}, {
-        atom_op_shl, ATOM_ARG_PLL}, {
-        atom_op_shl, ATOM_ARG_MC}, {
-        atom_op_shr, ATOM_ARG_REG}, {
-        atom_op_shr, ATOM_ARG_PS}, {
-        atom_op_shr, ATOM_ARG_WS}, {
-        atom_op_shr, ATOM_ARG_FB}, {
-        atom_op_shr, ATOM_ARG_PLL}, {
-        atom_op_shr, ATOM_ARG_MC}, {
+        atom_op_shift_left, ATOM_ARG_REG}, {
+        atom_op_shift_left, ATOM_ARG_PS}, {
+        atom_op_shift_left, ATOM_ARG_WS}, {
+        atom_op_shift_left, ATOM_ARG_FB}, {
+        atom_op_shift_left, ATOM_ARG_PLL}, {
+        atom_op_shift_left, ATOM_ARG_MC}, {
+        atom_op_shift_right, ATOM_ARG_REG}, {
+        atom_op_shift_right, ATOM_ARG_PS}, {
+        atom_op_shift_right, ATOM_ARG_WS}, {
+        atom_op_shift_right, ATOM_ARG_FB}, {
+        atom_op_shift_right, ATOM_ARG_PLL}, {
+        atom_op_shift_right, ATOM_ARG_MC}, {
         atom_op_mul, ATOM_ARG_REG}, {
         atom_op_mul, ATOM_ARG_PS}, {
         atom_op_mul, ATOM_ARG_WS}, {
@@ -1058,8 +1122,6 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3
 
         SDEBUG(">> execute %04X (len %d, WS %d, PS %d)\n", base, len, ws, ps);
 
-        /* reset reg block */
-        ctx->reg_block = 0;
         ectx.ctx = ctx;
         ectx.ps_shift = ps / 4;
         ectx.start = base;
@@ -1096,6 +1158,12 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3
 void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params)
 {
         mutex_lock(&ctx->mutex);
+        /* reset reg block */
+        ctx->reg_block = 0;
+        /* reset fb window */
+        ctx->fb_base = 0;
+        /* reset io mode */
+        ctx->io_mode = ATOM_IO_MM;
         atom_execute_table_locked(ctx, index, params);
         mutex_unlock(&ctx->mutex);
 }
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
index 47fd943f6d14..bc73781423a1 100644
--- a/drivers/gpu/drm/radeon/atom.h
+++ b/drivers/gpu/drm/radeon/atom.h
@@ -91,6 +91,7 @@
 #define ATOM_WS_AND_MASK        0x45
 #define ATOM_WS_FB_WINDOW       0x46
 #define ATOM_WS_ATTRIBUTES      0x47
+#define ATOM_WS_REGPTR          0x48
 
 #define ATOM_IIO_NOP            0
 #define ATOM_IIO_START          1
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 260fcf59f00c..af464e351fbd 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -307,7 +307,6 @@ atombios_set_crtc_dtd_timing(struct drm_crtc *crtc,
         args.susModeMiscInfo.usAccess = cpu_to_le16(misc);
         args.ucCRTC = radeon_crtc->crtc_id;
 
-        printk("executing set crtc dtd timing\n");
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 
@@ -347,7 +346,6 @@ static void atombios_crtc_set_timing(struct drm_crtc *crtc,
         args.susModeMiscInfo.usAccess = cpu_to_le16(misc);
         args.ucCRTC = radeon_crtc->crtc_id;
 
-        printk("executing set crtc timing\n");
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 
@@ -409,59 +407,57 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
         }
 }
 
-void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
+union adjust_pixel_clock {
+        ADJUST_DISPLAY_PLL_PS_ALLOCATION v1;
+};
+
+static u32 atombios_adjust_pll(struct drm_crtc *crtc,
+                               struct drm_display_mode *mode,
+                               struct radeon_pll *pll)
 {
-        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
         struct drm_device *dev = crtc->dev;
         struct radeon_device *rdev = dev->dev_private;
         struct drm_encoder *encoder = NULL;
         struct radeon_encoder *radeon_encoder = NULL;
-        uint8_t frev, crev;
-        int index;
-        SET_PIXEL_CLOCK_PS_ALLOCATION args;
-        PIXEL_CLOCK_PARAMETERS *spc1_ptr;
-        PIXEL_CLOCK_PARAMETERS_V2 *spc2_ptr;
-        PIXEL_CLOCK_PARAMETERS_V3 *spc3_ptr;
-        uint32_t pll_clock = mode->clock;
-        uint32_t adjusted_clock;
-        uint32_t ref_div = 0, fb_div = 0, frac_fb_div = 0, post_div = 0;
-        struct radeon_pll *pll;
-        int pll_flags = 0;
+        u32 adjusted_clock = mode->clock;
 
-        memset(&args, 0, sizeof(args));
+        /* reset the pll flags */
+        pll->flags = 0;
 
         if (ASIC_IS_AVIVO(rdev)) {
                 if ((rdev->family == CHIP_RS600) ||
                     (rdev->family == CHIP_RS690) ||
                     (rdev->family == CHIP_RS740))
-                        pll_flags |= (RADEON_PLL_USE_FRAC_FB_DIV |
-                                      RADEON_PLL_PREFER_CLOSEST_LOWER);
+                        pll->flags |= (RADEON_PLL_USE_FRAC_FB_DIV |
+                                       RADEON_PLL_PREFER_CLOSEST_LOWER);
 
                 if (ASIC_IS_DCE32(rdev) && mode->clock > 200000)        /* range limits??? */
-                        pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
+                        pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
                 else
-                        pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
+                        pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
         } else {
-                pll_flags |= RADEON_PLL_LEGACY;
+                pll->flags |= RADEON_PLL_LEGACY;
 
                 if (mode->clock > 200000)       /* range limits??? */
-                        pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
+                        pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
                 else
-                        pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
+                        pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
 
         }
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                 if (encoder->crtc == crtc) {
-                        if (!ASIC_IS_AVIVO(rdev)) {
-                                if (encoder->encoder_type !=
-                                    DRM_MODE_ENCODER_DAC)
-                                        pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-                                if (encoder->encoder_type ==
-                                        DRM_MODE_ENCODER_LVDS)
-                                        pll_flags |= RADEON_PLL_USE_REF_DIV;
-                        }
                         radeon_encoder = to_radeon_encoder(encoder);
+                        if (ASIC_IS_AVIVO(rdev)) {
+                                /* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */
+                                if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1)
+                                        adjusted_clock = mode->clock * 2;
+                        } else {
+                                if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
+                                        pll->flags |= RADEON_PLL_NO_ODD_POST_DIV;
+                                if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS)
+                                        pll->flags |= RADEON_PLL_USE_REF_DIV;
+                        }
                         break;
                 }
         }
@@ -471,46 +467,101 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
          * special hw requirements.
          */
         if (ASIC_IS_DCE3(rdev)) {
-                ADJUST_DISPLAY_PLL_PS_ALLOCATION adjust_pll_args;
+                union adjust_pixel_clock args;
+                struct radeon_encoder_atom_dig *dig;
+                u8 frev, crev;
+                int index;
 
-                if (!encoder)
-                        return;
-
-                memset(&adjust_pll_args, 0, sizeof(adjust_pll_args));
-                adjust_pll_args.usPixelClock = cpu_to_le16(mode->clock / 10);
-                adjust_pll_args.ucTransmitterID = radeon_encoder->encoder_id;
-                adjust_pll_args.ucEncodeMode = atombios_get_encoder_mode(encoder);
+                if (!radeon_encoder->enc_priv)
+                        return adjusted_clock;
+                dig = radeon_encoder->enc_priv;
 
                 index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll);
-                atom_execute_table(rdev->mode_info.atom_context,
-                                   index, (uint32_t *)&adjust_pll_args);
-                adjusted_clock = le16_to_cpu(adjust_pll_args.usPixelClock) * 10;
-        } else {
-                /* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */
-                if (ASIC_IS_AVIVO(rdev) &&
-                    (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1))
-                        adjusted_clock = mode->clock * 2;
-                else
-                        adjusted_clock = mode->clock;
+                atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
+                                      &crev);
+
+                memset(&args, 0, sizeof(args));
+
+                switch (frev) {
+                case 1:
+                        switch (crev) {
+                        case 1:
+                        case 2:
+                                args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
+                                args.v1.ucTransmitterID = radeon_encoder->encoder_id;
+                                args.v1.ucEncodeMode = atombios_get_encoder_mode(encoder);
+
+                                atom_execute_table(rdev->mode_info.atom_context,
+                                                   index, (uint32_t *)&args);
+                                adjusted_clock = le16_to_cpu(args.v1.usPixelClock) * 10;
+                                break;
+                        default:
+                                DRM_ERROR("Unknown table version %d %d\n", frev, crev);
+                                return adjusted_clock;
+                        }
+                        break;
+                default:
+                        DRM_ERROR("Unknown table version %d %d\n", frev, crev);
+                        return adjusted_clock;
+                }
         }
+        return adjusted_clock;
+}
+
+union set_pixel_clock {
+        SET_PIXEL_CLOCK_PS_ALLOCATION base;
+        PIXEL_CLOCK_PARAMETERS v1;
+        PIXEL_CLOCK_PARAMETERS_V2 v2;
+        PIXEL_CLOCK_PARAMETERS_V3 v3;
+};
+
+void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
+{
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct drm_encoder *encoder = NULL;
+        struct radeon_encoder *radeon_encoder = NULL;
+        u8 frev, crev;
+        int index;
+        union set_pixel_clock args;
+        u32 pll_clock = mode->clock;
+        u32 ref_div = 0, fb_div = 0, frac_fb_div = 0, post_div = 0;
+        struct radeon_pll *pll;
+        u32 adjusted_clock;
+
+        memset(&args, 0, sizeof(args));
+
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                if (encoder->crtc == crtc) {
+                        radeon_encoder = to_radeon_encoder(encoder);
+                        break;
+                }
+        }
+
+        if (!radeon_encoder)
+                return;
 
         if (radeon_crtc->crtc_id == 0)
                 pll = &rdev->clock.p1pll;
         else
                 pll = &rdev->clock.p2pll;
 
+        /* adjust pixel clock as needed */
+        adjusted_clock = atombios_adjust_pll(crtc, mode, pll);
+
         if (ASIC_IS_AVIVO(rdev)) {
                 if (radeon_new_pll)
                         radeon_compute_pll_avivo(pll, adjusted_clock, &pll_clock,
                                                  &fb_div, &frac_fb_div,
-                                                 &ref_div, &post_div, pll_flags);
+                                                 &ref_div, &post_div);
                 else
                         radeon_compute_pll(pll, adjusted_clock, &pll_clock,
                                            &fb_div, &frac_fb_div,
-                                           &ref_div, &post_div, pll_flags);
+                                           &ref_div, &post_div);
         } else
                 radeon_compute_pll(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
-                                   &ref_div, &post_div, pll_flags);
+                                   &ref_div, &post_div);
 
         index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
         atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
@@ -520,45 +571,38 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
         case 1:
                 switch (crev) {
                 case 1:
-                        spc1_ptr = (PIXEL_CLOCK_PARAMETERS *) & args.sPCLKInput;
-                        spc1_ptr->usPixelClock = cpu_to_le16(mode->clock / 10);
-                        spc1_ptr->usRefDiv = cpu_to_le16(ref_div);
-                        spc1_ptr->usFbDiv = cpu_to_le16(fb_div);
-                        spc1_ptr->ucFracFbDiv = frac_fb_div;
-                        spc1_ptr->ucPostDiv = post_div;
-                        spc1_ptr->ucPpll =
+                        args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v1.usRefDiv = cpu_to_le16(ref_div);
+                        args.v1.usFbDiv = cpu_to_le16(fb_div);
+                        args.v1.ucFracFbDiv = frac_fb_div;
+                        args.v1.ucPostDiv = post_div;
+                        args.v1.ucPpll =
                             radeon_crtc->crtc_id ? ATOM_PPLL2 : ATOM_PPLL1;
-                        spc1_ptr->ucCRTC = radeon_crtc->crtc_id;
-                        spc1_ptr->ucRefDivSrc = 1;
+                        args.v1.ucCRTC = radeon_crtc->crtc_id;
+                        args.v1.ucRefDivSrc = 1;
                         break;
                 case 2:
-                        spc2_ptr =
-                            (PIXEL_CLOCK_PARAMETERS_V2 *) & args.sPCLKInput;
-                        spc2_ptr->usPixelClock = cpu_to_le16(mode->clock / 10);
-                        spc2_ptr->usRefDiv = cpu_to_le16(ref_div);
-                        spc2_ptr->usFbDiv = cpu_to_le16(fb_div);
-                        spc2_ptr->ucFracFbDiv = frac_fb_div;
-                        spc2_ptr->ucPostDiv = post_div;
-                        spc2_ptr->ucPpll =
+                        args.v2.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v2.usRefDiv = cpu_to_le16(ref_div);
+                        args.v2.usFbDiv = cpu_to_le16(fb_div);
+                        args.v2.ucFracFbDiv = frac_fb_div;
+                        args.v2.ucPostDiv = post_div;
+                        args.v2.ucPpll =
                             radeon_crtc->crtc_id ? ATOM_PPLL2 : ATOM_PPLL1;
-                        spc2_ptr->ucCRTC = radeon_crtc->crtc_id;
-                        spc2_ptr->ucRefDivSrc = 1;
+                        args.v2.ucCRTC = radeon_crtc->crtc_id;
+                        args.v2.ucRefDivSrc = 1;
                         break;
                 case 3:
-                        if (!encoder)
-                                return;
-                        spc3_ptr =
-                            (PIXEL_CLOCK_PARAMETERS_V3 *) & args.sPCLKInput;
-                        spc3_ptr->usPixelClock = cpu_to_le16(mode->clock / 10);
-                        spc3_ptr->usRefDiv = cpu_to_le16(ref_div);
-                        spc3_ptr->usFbDiv = cpu_to_le16(fb_div);
-                        spc3_ptr->ucFracFbDiv = frac_fb_div;
-                        spc3_ptr->ucPostDiv = post_div;
-                        spc3_ptr->ucPpll =
+                        args.v3.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v3.usRefDiv = cpu_to_le16(ref_div);
+                        args.v3.usFbDiv = cpu_to_le16(fb_div);
+                        args.v3.ucFracFbDiv = frac_fb_div;
+                        args.v3.ucPostDiv = post_div;
+                        args.v3.ucPpll =
                             radeon_crtc->crtc_id ? ATOM_PPLL2 : ATOM_PPLL1;
-                        spc3_ptr->ucMiscInfo = (radeon_crtc->crtc_id << 2);
-                        spc3_ptr->ucTransmitterId = radeon_encoder->encoder_id;
-                        spc3_ptr->ucEncoderMode =
+                        args.v3.ucMiscInfo = (radeon_crtc->crtc_id << 2);
+                        args.v3.ucTransmitterId = radeon_encoder->encoder_id;
+                        args.v3.ucEncoderMode =
                             atombios_get_encoder_mode(encoder);
                         break;
                 default:
@@ -571,12 +615,11 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                 return;
         }
 
-        printk("executing set pll\n");
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 
-int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
-                           struct drm_framebuffer *old_fb)
+static int avivo_crtc_set_base(struct drm_crtc *crtc, int x, int y,
+                               struct drm_framebuffer *old_fb)
 {
         struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
         struct drm_device *dev = crtc->dev;
@@ -706,6 +749,42 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
         return 0;
 }
 
+int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
+                           struct drm_framebuffer *old_fb)
+{
+        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
+
+        if (ASIC_IS_AVIVO(rdev))
+                return avivo_crtc_set_base(crtc, x, y, old_fb);
+        else
+                return radeon_crtc_set_base(crtc, x, y, old_fb);
+}
+
+/* properly set additional regs when using atombios */
+static void radeon_legacy_atom_fixup(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        u32 disp_merge_cntl;
+
+        switch (radeon_crtc->crtc_id) {
+        case 0:
+                disp_merge_cntl = RREG32(RADEON_DISP_MERGE_CNTL);
+                disp_merge_cntl &= ~RADEON_DISP_RGB_OFFSET_EN;
+                WREG32(RADEON_DISP_MERGE_CNTL, disp_merge_cntl);
+                break;
+        case 1:
+                disp_merge_cntl = RREG32(RADEON_DISP2_MERGE_CNTL);
+                disp_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN;
+                WREG32(RADEON_DISP2_MERGE_CNTL, disp_merge_cntl);
+                WREG32(RADEON_FP_H2_SYNC_STRT_WID,   RREG32(RADEON_CRTC2_H_SYNC_STRT_WID));
+                WREG32(RADEON_FP_V2_SYNC_STRT_WID,   RREG32(RADEON_CRTC2_V_SYNC_STRT_WID));
+                break;
+        }
+}
+
 int atombios_crtc_mode_set(struct drm_crtc *crtc,
                            struct drm_display_mode *mode,
                            struct drm_display_mode *adjusted_mode,
@@ -727,8 +806,8 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc,
         else {
                 if (radeon_crtc->crtc_id == 0)
                         atombios_set_crtc_dtd_timing(crtc, adjusted_mode);
-                radeon_crtc_set_base(crtc, x, y, old_fb);
-                radeon_legacy_atom_set_surface(crtc);
+                atombios_crtc_set_base(crtc, x, y, old_fb);
+                radeon_legacy_atom_fixup(crtc);
         }
         atombios_overscan_setup(crtc, mode, adjusted_mode);
         atombios_scaler_setup(crtc);
@@ -746,8 +825,8 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc,
 
 static void atombios_crtc_prepare(struct drm_crtc *crtc)
 {
-        atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
         atombios_lock_crtc(crtc, 1);
+        atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
 }
 
 static void atombios_crtc_commit(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 0d63c4436e7c..71060114d5de 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -468,7 +468,8 @@ void radeon_dp_set_link_config(struct drm_connector *connector,
         struct radeon_connector *radeon_connector;
         struct radeon_connector_atom_dig *dig_connector;
 
-        if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+        if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) &&
+            (connector->connector_type != DRM_MODE_CONNECTOR_eDP))
                 return;
 
         radeon_connector = to_radeon_connector(connector);
@@ -582,7 +583,8 @@ void dp_link_train(struct drm_encoder *encoder,
         u8 train_set[4];
         int i;
 
-        if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+        if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) &&
+            (connector->connector_type != DRM_MODE_CONNECTOR_eDP))
                 return;
 
         if (!radeon_encoder->enc_priv)
@@ -594,21 +596,14 @@ void dp_link_train(struct drm_encoder *encoder,
                 return;
         dig_connector = radeon_connector->con_priv;
 
-        if (ASIC_IS_DCE32(rdev)) {
-                if (dig->dig_block)
-                        enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER;
-                else
-                        enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER;
-                if (dig_connector->linkb)
-                        enc_id |= ATOM_DP_CONFIG_LINK_B;
-                else
-                        enc_id |= ATOM_DP_CONFIG_LINK_A;
-        } else {
-                if (dig_connector->linkb)
-                        enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER | ATOM_DP_CONFIG_LINK_B;
-                else
-                        enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER | ATOM_DP_CONFIG_LINK_A;
-        }
+        if (dig->dig_encoder)
+                enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER;
+        else
+                enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER;
+        if (dig_connector->linkb)
+                enc_id |= ATOM_DP_CONFIG_LINK_B;
+        else
+                enc_id |= ATOM_DP_CONFIG_LINK_A;
 
         memset(link_configuration, 0, DP_LINK_CONFIGURATION_SIZE);
         if (dig_connector->dp_clock == 270000)
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
index 0d79577c1576..607241c6a8a9 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
@@ -661,8 +661,10 @@ static int parser_auth(struct table *t, const char *filename)
         fseek(file, 0, SEEK_SET);
 
         /* get header */
-        if (fgets(buf, 1024, file) == NULL)
+        if (fgets(buf, 1024, file) == NULL) {
+                fclose(file);
                 return -1;
+        }
 
         /* first line will contain the last register
          * and gpu name */
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 71727460968f..11c9a3fe6810 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -131,7 +131,8 @@ void r100_hpd_init(struct radeon_device *rdev)
                         break;
                 }
         }
-        r100_irq_set(rdev);
+        if (rdev->irq.installed)
+                r100_irq_set(rdev);
 }
 
 void r100_hpd_fini(struct radeon_device *rdev)
@@ -243,6 +244,11 @@ int r100_irq_set(struct radeon_device *rdev)
 {
         uint32_t tmp = 0;
 
+        if (!rdev->irq.installed) {
+                WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n");
+                WREG32(R_000040_GEN_INT_CNTL, 0);
+                return -EINVAL;
+        }
         if (rdev->irq.sw_int) {
                 tmp |= RADEON_SW_INT_ENABLE;
         }
@@ -356,6 +362,11 @@ void r100_fence_ring_emit(struct radeon_device *rdev,
         /* Wait until IDLE & CLEAN */
         radeon_ring_write(rdev, PACKET0(0x1720, 0));
         radeon_ring_write(rdev, (1 << 16) | (1 << 17));
+        radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
+        radeon_ring_write(rdev, rdev->config.r100.hdp_cntl |
+                                RADEON_HDP_READ_BUFFER_INVALIDATE);
+        radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
+        radeon_ring_write(rdev, rdev->config.r100.hdp_cntl);
         /* Emit fence sequence & fire IRQ */
         radeon_ring_write(rdev, PACKET0(rdev->fence_drv.scratch_reg, 0));
         radeon_ring_write(rdev, fence->seq);
@@ -1493,6 +1504,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                         DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");
                         return -EINVAL;
                 }
+                track->vtx_size = r100_get_vtx_size(radeon_get_ib_value(p, idx + 0));
                 track->vap_vf_cntl = radeon_get_ib_value(p, idx + 1);
                 track->immd_dwords = pkt->count - 1;
                 r = r100_cs_track_check(p->rdev, track);
@@ -1713,14 +1725,6 @@ void r100_gpu_init(struct radeon_device *rdev)
         r100_hdp_reset(rdev);
 }
 
-void r100_hdp_flush(struct radeon_device *rdev)
-{
-        u32 tmp;
-        tmp = RREG32(RADEON_HOST_PATH_CNTL);
-        tmp |= RADEON_HDP_READ_BUFFER_INVALIDATE;
-        WREG32(RADEON_HOST_PATH_CNTL, tmp);
-}
-
 void r100_hdp_reset(struct radeon_device *rdev)
 {
         uint32_t tmp;
@@ -3313,6 +3317,7 @@ static int r100_startup(struct radeon_device *rdev)
         }
         /* Enable IRQ */
         r100_irq_set(rdev);
+        rdev->config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
@@ -3371,6 +3376,7 @@ void r100_fini(struct radeon_device *rdev)
         radeon_gem_fini(rdev);
         if (rdev->flags & RADEON_IS_PCI)
                 r100_pci_gart_fini(rdev);
+        radeon_agp_fini(rdev);
         radeon_irq_kms_fini(rdev);
         radeon_fence_driver_fini(rdev);
         radeon_bo_fini(rdev);
@@ -3394,9 +3400,7 @@ int r100_mc_init(struct radeon_device *rdev)
         if (rdev->flags & RADEON_IS_AGP) {
                 r = radeon_agp_init(rdev);
                 if (r) {
-                        printk(KERN_WARNING "[drm] Disabling AGP\n");
-                        rdev->flags &= ~RADEON_IS_AGP;
-                        rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+                        radeon_agp_disable(rdev);
                 } else {
                         rdev->mc.gtt_location = rdev->mc.agp_base;
                 }
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index 20942127c46b..ff1e0cd608bf 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -371,13 +371,16 @@ int r200_packet0_check(struct radeon_cs_parser *p,
                 case 5:
                 case 6:
                 case 7:
+                        /* 1D/2D */
                         track->textures[i].tex_coord_type = 0;
                         break;
                 case 1:
-                        track->textures[i].tex_coord_type = 1;
+                        /* CUBE */
+                        track->textures[i].tex_coord_type = 2;
                         break;
                 case 2:
-                        track->textures[i].tex_coord_type = 2;
+                        /* 3D */
+                        track->textures[i].tex_coord_type = 1;
                         break;
                 }
                 break;
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 3f2cc9e2e8d9..0051d11b907c 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -36,7 +36,15 @@
 #include "rv350d.h"
 #include "r300_reg_safe.h"
 
-/* This files gather functions specifics to: r300,r350,rv350,rv370,rv380 */
+/* This files gather functions specifics to: r300,r350,rv350,rv370,rv380
+ *
+ * GPU Errata:
+ * - HOST_PATH_CNTL: r300 family seems to dislike write to HOST_PATH_CNTL
+ *   using MMIO to flush host path read cache, this lead to HARDLOCKUP.
+ *   However, scheduling such write to the ring seems harmless, i suspect
+ *   the CP read collide with the flush somehow, or maybe the MC, hard to
+ *   tell. (Jerome Glisse)
+ */
 
 /*
  * rv370,rv380 PCIE GART
@@ -178,6 +186,11 @@ void r300_fence_ring_emit(struct radeon_device *rdev,
         /* Wait until IDLE & CLEAN */
         radeon_ring_write(rdev, PACKET0(0x1720, 0));
         radeon_ring_write(rdev, (1 << 17) | (1 << 16)  | (1 << 9));
+        radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
+        radeon_ring_write(rdev, rdev->config.r300.hdp_cntl |
+                                RADEON_HDP_READ_BUFFER_INVALIDATE);
+        radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));
+        radeon_ring_write(rdev, rdev->config.r300.hdp_cntl);
         /* Emit fence sequence & fire IRQ */
         radeon_ring_write(rdev, PACKET0(rdev->fence_drv.scratch_reg, 0));
         radeon_ring_write(rdev, fence->seq);
@@ -1258,6 +1271,7 @@ static int r300_startup(struct radeon_device *rdev)
         }
         /* Enable IRQ */
         r100_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
@@ -1322,6 +1336,7 @@ void r300_fini(struct radeon_device *rdev)
                 rv370_pcie_gart_fini(rdev);
         if (rdev->flags & RADEON_IS_PCI)
                 r100_pci_gart_fini(rdev);
+        radeon_agp_fini(rdev);
         radeon_irq_kms_fini(rdev);
         radeon_fence_driver_fini(rdev);
         radeon_bo_fini(rdev);
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index c05a7270cf0c..4526faaacca8 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -30,7 +30,15 @@
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "atom.h"
+#include "r100d.h"
 #include "r420d.h"
+#include "r420_reg_safe.h"
+
+static void r420_set_reg_safe(struct radeon_device *rdev)
+{
+        rdev->config.r300.reg_safe_bm = r420_reg_safe_bm;
+        rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(r420_reg_safe_bm);
+}
 
 int r420_mc_init(struct radeon_device *rdev)
 {
@@ -42,9 +50,7 @@ int r420_mc_init(struct radeon_device *rdev)
         if (rdev->flags & RADEON_IS_AGP) {
                 r = radeon_agp_init(rdev);
                 if (r) {
-                        printk(KERN_WARNING "[drm] Disabling AGP\n");
-                        rdev->flags &= ~RADEON_IS_AGP;
-                        rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+                        radeon_agp_disable(rdev);
                 } else {
                         rdev->mc.gtt_location = rdev->mc.agp_base;
                 }
@@ -165,6 +171,34 @@ static void r420_clock_resume(struct radeon_device *rdev)
         WREG32_PLL(R_00000D_SCLK_CNTL, sclk_cntl);
 }
 
+static void r420_cp_errata_init(struct radeon_device *rdev)
+{
+        /* RV410 and R420 can lock up if CP DMA to host memory happens
+         * while the 2D engine is busy.
+         *
+         * The proper workaround is to queue a RESYNC at the beginning
+         * of the CP init, apparently.
+         */
+        radeon_scratch_get(rdev, &rdev->config.r300.resync_scratch);
+        radeon_ring_lock(rdev, 8);
+        radeon_ring_write(rdev, PACKET0(R300_CP_RESYNC_ADDR, 1));
+        radeon_ring_write(rdev, rdev->config.r300.resync_scratch);
+        radeon_ring_write(rdev, 0xDEADBEEF);
+        radeon_ring_unlock_commit(rdev);
+}
+
+static void r420_cp_errata_fini(struct radeon_device *rdev)
+{
+        /* Catch the RESYNC we dispatched all the way back,
+         * at the very beginning of the CP init.
+         */
+        radeon_ring_lock(rdev, 8);
+        radeon_ring_write(rdev, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        radeon_ring_write(rdev, R300_RB3D_DC_FINISH);
+        radeon_ring_unlock_commit(rdev);
+        radeon_scratch_free(rdev, rdev->config.r300.resync_scratch);
+}
+
 static int r420_startup(struct radeon_device *rdev)
 {
         int r;
@@ -190,12 +224,14 @@ static int r420_startup(struct radeon_device *rdev)
         r420_pipes_init(rdev);
         /* Enable IRQ */
         r100_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
                 dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
                 return r;
         }
+        r420_cp_errata_init(rdev);
         r = r100_wb_init(rdev);
         if (r) {
                 dev_err(rdev->dev, "failled initializing WB (%d).\n", r);
@@ -238,6 +274,7 @@ int r420_resume(struct radeon_device *rdev)
 
 int r420_suspend(struct radeon_device *rdev)
 {
+        r420_cp_errata_fini(rdev);
         r100_cp_disable(rdev);
         r100_wb_disable(rdev);
         r100_irq_disable(rdev);
@@ -346,7 +383,7 @@ int r420_init(struct radeon_device *rdev)
                 if (r)
                         return r;
         }
-        r300_set_reg_safe(rdev);
+        r420_set_reg_safe(rdev);
         rdev->accel_working = true;
         r = r420_startup(rdev);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 0f3843b6dac7..9a189072f2b9 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -186,6 +186,7 @@ static int r520_startup(struct radeon_device *rdev)
         }
         /* Enable IRQ */
         rs600_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index a0ac3c134b1b..1b6d0001b20e 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -285,7 +285,8 @@ void r600_hpd_init(struct radeon_device *rdev)
                         }
                 }
         }
-        r600_irq_set(rdev);
+        if (rdev->irq.installed)
+                r600_irq_set(rdev);
 }
 
 void r600_hpd_fini(struct radeon_device *rdev)
@@ -623,7 +624,6 @@ int r600_mc_init(struct radeon_device *rdev)
         fixed20_12 a;
         u32 tmp;
         int chansize, numchan;
-        int r;
 
         /* Get VRAM informations */
         rdev->mc.vram_is_ddr = true;
@@ -666,9 +666,6 @@ int r600_mc_init(struct radeon_device *rdev)
                 rdev->mc.real_vram_size = rdev->mc.aper_size;
 
         if (rdev->flags & RADEON_IS_AGP) {
-                r = radeon_agp_init(rdev);
-                if (r)
-                        return r;
                 /* gtt_size is setup by radeon_agp_init */
                 rdev->mc.gtt_location = rdev->mc.agp_base;
                 tmp = 0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size;
@@ -726,6 +723,10 @@ int r600_mc_init(struct radeon_device *rdev)
         a.full = rfixed_const(100);
         rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
         rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
+
+        if (rdev->flags & RADEON_IS_IGP)
+                rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
+
         return 0;
 }
 
@@ -1384,11 +1385,6 @@ void r600_pciep_wreg(struct radeon_device *rdev, u32 reg, u32 v)
         (void)RREG32(PCIE_PORT_DATA);
 }
 
-void r600_hdp_flush(struct radeon_device *rdev)
-{
-        WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
-}
-
 /*
  * CP & Ring
  */
@@ -1785,28 +1781,31 @@ void r600_fence_ring_emit(struct radeon_device *rdev,
         radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));
         radeon_ring_write(rdev, ((rdev->fence_drv.scratch_reg - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));
         radeon_ring_write(rdev, fence->seq);
+        radeon_ring_write(rdev, PACKET0(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0));
+        radeon_ring_write(rdev, 1);
         /* CP_INTERRUPT packet 3 no longer exists, use packet 0 */
         radeon_ring_write(rdev, PACKET0(CP_INT_STATUS, 0));
         radeon_ring_write(rdev, RB_INT_STAT);
 }
 
-int r600_copy_dma(struct radeon_device *rdev,
-                  uint64_t src_offset,
-                  uint64_t dst_offset,
-                  unsigned num_pages,
-                  struct radeon_fence *fence)
-{
-        /* FIXME: implement */
-        return 0;
-}
-
 int r600_copy_blit(struct radeon_device *rdev,
                    uint64_t src_offset, uint64_t dst_offset,
                    unsigned num_pages, struct radeon_fence *fence)
 {
-        r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);
+        int r;
+
+        mutex_lock(&rdev->r600_blit.mutex);
+        rdev->r600_blit.vb_ib = NULL;
+        r = r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);
+        if (r) {
+                if (rdev->r600_blit.vb_ib)
+                        radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);
+                mutex_unlock(&rdev->r600_blit.mutex);
+                return r;
+        }
         r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE);
         r600_blit_done_copy(rdev, fence);
+        mutex_unlock(&rdev->r600_blit.mutex);
         return 0;
 }
 
@@ -1862,26 +1861,19 @@ int r600_startup(struct radeon_device *rdev)
                         return r;
         }
         r600_gpu_init(rdev);
-
-        if (!rdev->r600_blit.shader_obj) {
-                r = r600_blit_init(rdev);
+        /* pin copy shader into vram */
+        if (rdev->r600_blit.shader_obj) {
+                r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+                if (unlikely(r != 0))
+                        return r;
+                r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
+                                &rdev->r600_blit.shader_gpu_addr);
+                radeon_bo_unreserve(rdev->r600_blit.shader_obj);
                 if (r) {
-                        DRM_ERROR("radeon: failed blitter (%d).\n", r);
+                        dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
                         return r;
                 }
         }
-
-        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
-        if (unlikely(r != 0))
-                return r;
-        r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
-                        &rdev->r600_blit.shader_gpu_addr);
-        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
-        if (r) {
-                dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
-                return r;
-        }
-
         /* Enable IRQ */
         r = r600_irq_init(rdev);
         if (r) {
@@ -1956,14 +1948,17 @@ int r600_suspend(struct radeon_device *rdev)
         /* FIXME: we should wait for ring to be empty */
         r600_cp_stop(rdev);
         rdev->cp.ready = false;
+        r600_irq_suspend(rdev);
         r600_wb_disable(rdev);
         r600_pcie_gart_disable(rdev);
         /* unpin shaders bo */
-        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
-        if (unlikely(r != 0))
-                return r;
-        radeon_bo_unpin(rdev->r600_blit.shader_obj);
-        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+        if (rdev->r600_blit.shader_obj) {
+                r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+                if (!r) {
+                        radeon_bo_unpin(rdev->r600_blit.shader_obj);
+                        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+                }
+        }
         return 0;
 }
 
@@ -2024,6 +2019,11 @@ int r600_init(struct radeon_device *rdev)
         r = radeon_fence_driver_init(rdev);
         if (r)
                 return r;
+        if (rdev->flags & RADEON_IS_AGP) {
+                r = radeon_agp_init(rdev);
+                if (r)
+                        radeon_agp_disable(rdev);
+        }
         r = r600_mc_init(rdev);
         if (r)
                 return r;
@@ -2045,6 +2045,12 @@ int r600_init(struct radeon_device *rdev)
         r = r600_pcie_gart_init(rdev);
         if (r)
                 return r;
+        r = r600_blit_init(rdev);
+        if (r) {
+                r600_blit_fini(rdev);
+                rdev->asic->copy = NULL;
+                dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+        }
 
         rdev->accel_working = true;
         r = r600_startup(rdev);
@@ -2058,13 +2064,14 @@ int r600_init(struct radeon_device *rdev)
         if (rdev->accel_working) {
                 r = radeon_ib_pool_init(rdev);
                 if (r) {
-                        DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);
-                        rdev->accel_working = false;
-                }
-                r = r600_ib_test(rdev);
-                if (r) {
-                        DRM_ERROR("radeon: failed testing IB (%d).\n", r);
+                        dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
                         rdev->accel_working = false;
+                } else {
+                        r = r600_ib_test(rdev);
+                        if (r) {
+                                dev_err(rdev->dev, "IB test failed (%d).\n", r);
+                                rdev->accel_working = false;
+                        }
                 }
         }
 
@@ -2089,8 +2096,7 @@ void r600_fini(struct radeon_device *rdev)
         radeon_gem_fini(rdev);
         radeon_fence_driver_fini(rdev);
         radeon_clocks_fini(rdev);
-        if (rdev->flags & RADEON_IS_AGP)
-                radeon_agp_fini(rdev);
+        radeon_agp_fini(rdev);
         radeon_bo_fini(rdev);
         radeon_atombios_fini(rdev);
         kfree(rdev->bios);
@@ -2196,14 +2202,14 @@ void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size)
         rb_bufsz = drm_order(ring_size / 4);
         ring_size = (1 << rb_bufsz) * 4;
         rdev->ih.ring_size = ring_size;
-        rdev->ih.align_mask = 4 - 1;
+        rdev->ih.ptr_mask = rdev->ih.ring_size - 1;
+        rdev->ih.rptr = 0;
 }
 
-static int r600_ih_ring_alloc(struct radeon_device *rdev, unsigned ring_size)
+static int r600_ih_ring_alloc(struct radeon_device *rdev)
 {
         int r;
 
-        rdev->ih.ring_size = ring_size;
         /* Allocate ring buffer */
         if (rdev->ih.ring_obj == NULL) {
                 r = radeon_bo_create(rdev, NULL, rdev->ih.ring_size,
@@ -2233,9 +2239,6 @@ static int r600_ih_ring_alloc(struct radeon_device *rdev, unsigned ring_size)
                         return r;
                 }
         }
-        rdev->ih.ptr_mask = (rdev->cp.ring_size / 4) - 1;
-        rdev->ih.rptr = 0;
-
         return 0;
 }
 
@@ -2385,7 +2388,7 @@ int r600_irq_init(struct radeon_device *rdev)
         u32 interrupt_cntl, ih_cntl, ih_rb_cntl;
 
         /* allocate ring */
-        ret = r600_ih_ring_alloc(rdev, rdev->ih.ring_size);
+        ret = r600_ih_ring_alloc(rdev);
         if (ret)
                 return ret;
 
@@ -2448,10 +2451,15 @@ int r600_irq_init(struct radeon_device *rdev)
         return ret;
 }
 
-void r600_irq_fini(struct radeon_device *rdev)
+void r600_irq_suspend(struct radeon_device *rdev)
 {
         r600_disable_interrupts(rdev);
         r600_rlc_stop(rdev);
+}
+
+void r600_irq_fini(struct radeon_device *rdev)
+{
+        r600_irq_suspend(rdev);
         r600_ih_ring_fini(rdev);
 }
 
@@ -2461,9 +2469,17 @@ int r600_irq_set(struct radeon_device *rdev)
         u32 mode_int = 0;
         u32 hpd1, hpd2, hpd3, hpd4 = 0, hpd5 = 0, hpd6 = 0;
 
+        if (!rdev->irq.installed) {
+                WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n");
+                return -EINVAL;
+        }
         /* don't enable anything if the ih is disabled */
-        if (!rdev->ih.enabled)
+        if (!rdev->ih.enabled) {
+                r600_disable_interrupts(rdev);
+                /* force the active interrupt state to all disabled */
+                r600_disable_interrupt_state(rdev);
                 return 0;
+        }
 
         if (ASIC_IS_DCE3(rdev)) {
                 hpd1 = RREG32(DC_HPD1_INT_CONTROL) & ~DC_HPDx_INT_EN;
@@ -2633,16 +2649,18 @@ static inline u32 r600_get_ih_wptr(struct radeon_device *rdev)
         wptr = RREG32(IH_RB_WPTR);
 
         if (wptr & RB_OVERFLOW) {
-                WARN_ON(1);
-                /* XXX deal with overflow */
-                DRM_ERROR("IH RB overflow\n");
+                /* When a ring buffer overflow happen start parsing interrupt
+                 * from the last not overwritten vector (wptr + 16). Hopefully
+                 * this should allow us to catchup.
+                 */
+                dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, %d, %d)\n",
+                        wptr, rdev->ih.rptr, (wptr + 16) + rdev->ih.ptr_mask);
+                rdev->ih.rptr = (wptr + 16) & rdev->ih.ptr_mask;
                 tmp = RREG32(IH_RB_CNTL);
                 tmp |= IH_WPTR_OVERFLOW_CLEAR;
                 WREG32(IH_RB_CNTL, tmp);
         }
-        wptr = wptr & WPTR_OFFSET_MASK;
-
-        return wptr;
+        return (wptr & rdev->ih.ptr_mask);
 }
 
 /*        r600 IV Ring
@@ -2678,12 +2696,13 @@ int r600_irq_process(struct radeon_device *rdev)
         u32 wptr = r600_get_ih_wptr(rdev);
         u32 rptr = rdev->ih.rptr;
         u32 src_id, src_data;
-        u32 last_entry = rdev->ih.ring_size - 16;
         u32 ring_index, disp_int, disp_int_cont, disp_int_cont2;
         unsigned long flags;
         bool queue_hotplug = false;
 
         DRM_DEBUG("r600_irq_process start: rptr %d, wptr %d\n", rptr, wptr);
+        if (!rdev->ih.enabled)
+                return IRQ_NONE;
 
         spin_lock_irqsave(&rdev->ih.lock, flags);
 
@@ -2724,7 +2743,7 @@ restart_ih:
                                 }
                                 break;
                         default:
-                                DRM_ERROR("Unhandled interrupt: %d %d\n", src_id, src_data);
+                                DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
                                 break;
                         }
                         break;
@@ -2744,7 +2763,7 @@ restart_ih:
                                 }
                                 break;
                         default:
-                                DRM_ERROR("Unhandled interrupt: %d %d\n", src_id, src_data);
+                                DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
                                 break;
                         }
                         break;
@@ -2793,7 +2812,7 @@ restart_ih:
                                 }
                                 break;
                         default:
-                                DRM_ERROR("Unhandled interrupt: %d %d\n", src_id, src_data);
+                                DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
                                 break;
                         }
                         break;
@@ -2807,15 +2826,13 @@ restart_ih:
                         DRM_DEBUG("IH: CP EOP\n");
                         break;
                 default:
-                        DRM_ERROR("Unhandled interrupt: %d %d\n", src_id, src_data);
+                        DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
                         break;
                 }
 
                 /* wptr/rptr are in bytes! */
-                if (rptr == last_entry)
-                        rptr = 0;
-                else
-                        rptr += 16;
+                rptr += 16;
+                rptr &= rdev->ih.ptr_mask;
         }
         /* make sure wptr hasn't changed while processing */
         wptr = r600_get_ih_wptr(rdev);
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index 9aecafb51b66..af1c3ca8a4cb 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -449,6 +449,7 @@ int r600_blit_init(struct radeon_device *rdev)
         u32 packet2s[16];
         int num_packet2s = 0;
 
+        mutex_init(&rdev->r600_blit.mutex);
         rdev->r600_blit.state_offset = 0;
 
         if (rdev->family >= CHIP_RV770)
@@ -512,14 +513,16 @@ void r600_blit_fini(struct radeon_device *rdev)
 {
         int r;
 
+        if (rdev->r600_blit.shader_obj == NULL)
+                return;
+        /* If we can't reserve the bo, unref should be enough to destroy
+         * it when it becomes idle.
+         */
         r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
-        if (unlikely(r != 0)) {
-                dev_err(rdev->dev, "(%d) can't finish r600 blit\n", r);
-                goto out_unref;
+        if (!r) {
+                radeon_bo_unpin(rdev->r600_blit.shader_obj);
+                radeon_bo_unreserve(rdev->r600_blit.shader_obj);
         }
-        radeon_bo_unpin(rdev->r600_blit.shader_obj);
-        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
-out_unref:
         radeon_bo_unref(&rdev->r600_blit.shader_obj);
 }
 
@@ -555,7 +558,8 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
         int dwords_per_loop = 76, num_loops;
 
         r = r600_vb_ib_get(rdev);
-        WARN_ON(r);
+        if (r)
+                return r;
 
         /* set_render_target emits 2 extra dwords on rv6xx */
         if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770)
@@ -577,11 +581,12 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
         ring_size = num_loops * dwords_per_loop;
         /* set default  + shaders */
         ring_size += 40; /* shaders + def state */
-        ring_size += 5; /* fence emit for VB IB */
+        ring_size += 7; /* fence emit for VB IB */
         ring_size += 5; /* done copy */
-        ring_size += 5; /* fence emit for done copy */
+        ring_size += 7; /* fence emit for done copy */
         r = radeon_ring_lock(rdev, ring_size);
-        WARN_ON(r);
+        if (r)
+                return r;
 
         set_default_state(rdev); /* 14 */
         set_shaders(rdev); /* 26 */
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 44060b92d9e6..e4c45ec16507 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -36,6 +36,10 @@ static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,
 typedef int (*next_reloc_t)(struct radeon_cs_parser*, struct radeon_cs_reloc**);
 static next_reloc_t r600_cs_packet_next_reloc = &r600_cs_packet_next_reloc_mm;
 
+struct r600_cs_track {
+        u32     cb_color0_base_last;
+};
+
 /**
  * r600_cs_packet_parse() - parse cp packet and point ib index to next packet
  * @parser:     parser structure holding parsing context.
@@ -177,6 +181,28 @@ static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,
 }
 
 /**
+ * r600_cs_packet_next_is_pkt3_nop() - test if next packet is packet3 nop for reloc
+ * @parser:             parser structure holding parsing context.
+ *
+ * Check next packet is relocation packet3, do bo validation and compute
+ * GPU offset using the provided start.
+ **/
+static inline int r600_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p)
+{
+        struct radeon_cs_packet p3reloc;
+        int r;
+
+        r = r600_cs_packet_parse(p, &p3reloc, p->idx);
+        if (r) {
+                return 0;
+        }
+        if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) {
+                return 0;
+        }
+        return 1;
+}
+
+/**
  * r600_cs_packet_next_vline() - parse userspace VLINE packet
  * @parser:             parser structure holding parsing context.
  *
@@ -337,6 +363,7 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                                 struct radeon_cs_packet *pkt)
 {
         struct radeon_cs_reloc *reloc;
+        struct r600_cs_track *track;
         volatile u32 *ib;
         unsigned idx;
         unsigned i;
@@ -344,6 +371,7 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
         int r;
         u32 idx_value;
 
+        track = (struct r600_cs_track *)p->track;
         ib = p->ib->ptr;
         idx = pkt->idx + 1;
         idx_value = radeon_get_ib_value(p, idx);
@@ -503,9 +531,60 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                 for (i = 0; i < pkt->count; i++) {
                         reg = start_reg + (4 * i);
                         switch (reg) {
+                        /* This register were added late, there is userspace
+                         * which does provide relocation for those but set
+                         * 0 offset. In order to avoid breaking old userspace
+                         * we detect this and set address to point to last
+                         * CB_COLOR0_BASE, note that if userspace doesn't set
+                         * CB_COLOR0_BASE before this register we will report
+                         * error. Old userspace always set CB_COLOR0_BASE
+                         * before any of this.
+                         */
+                        case R_0280E0_CB_COLOR0_FRAG:
+                        case R_0280E4_CB_COLOR1_FRAG:
+                        case R_0280E8_CB_COLOR2_FRAG:
+                        case R_0280EC_CB_COLOR3_FRAG:
+                        case R_0280F0_CB_COLOR4_FRAG:
+                        case R_0280F4_CB_COLOR5_FRAG:
+                        case R_0280F8_CB_COLOR6_FRAG:
+                        case R_0280FC_CB_COLOR7_FRAG:
+                        case R_0280C0_CB_COLOR0_TILE:
+                        case R_0280C4_CB_COLOR1_TILE:
+                        case R_0280C8_CB_COLOR2_TILE:
+                        case R_0280CC_CB_COLOR3_TILE:
+                        case R_0280D0_CB_COLOR4_TILE:
+                        case R_0280D4_CB_COLOR5_TILE:
+                        case R_0280D8_CB_COLOR6_TILE:
+                        case R_0280DC_CB_COLOR7_TILE:
+                                if (!r600_cs_packet_next_is_pkt3_nop(p)) {
+                                        if (!track->cb_color0_base_last) {
+                                                dev_err(p->dev, "Broken old userspace ? no cb_color0_base supplied before trying to write 0x%08X\n", reg);
+                                                return -EINVAL;
+                                        }
+                                        ib[idx+1+i] = track->cb_color0_base_last;
+                                        printk_once(KERN_WARNING "radeon: You have old & broken userspace "
+                                                "please consider updating mesa & xf86-video-ati\n");
+                                } else {
+                                        r = r600_cs_packet_next_reloc(p, &reloc);
+                                        if (r) {
+                                                dev_err(p->dev, "bad SET_CONTEXT_REG 0x%04X\n", reg);
+                                                return -EINVAL;
+                                        }
+                                        ib[idx+1+i] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                                }
+                                break;
                         case DB_DEPTH_BASE:
                         case DB_HTILE_DATA_BASE:
                         case CB_COLOR0_BASE:
+                                r = r600_cs_packet_next_reloc(p, &reloc);
+                                if (r) {
+                                        DRM_ERROR("bad SET_CONTEXT_REG "
+                                                        "0x%04X\n", reg);
+                                        return -EINVAL;
+                                }
+                                ib[idx+1+i] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                                track->cb_color0_base_last = ib[idx+1+i];
+                                break;
                         case CB_COLOR1_BASE:
                         case CB_COLOR2_BASE:
                         case CB_COLOR3_BASE:
@@ -678,8 +757,11 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
 int r600_cs_parse(struct radeon_cs_parser *p)
 {
         struct radeon_cs_packet pkt;
+        struct r600_cs_track *track;
         int r;
 
+        track = kzalloc(sizeof(*track), GFP_KERNEL);
+        p->track = track;
         do {
                 r = r600_cs_packet_parse(p, &pkt, p->idx);
                 if (r) {
@@ -757,6 +839,7 @@ int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp,
         /* initialize parser */
         memset(&parser, 0, sizeof(struct radeon_cs_parser));
         parser.filp = filp;
+        parser.dev = &dev->pdev->dev;
         parser.rdev = NULL;
         parser.family = family;
         parser.ib = &fake_ib;
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index 05894edadab4..30480881aed1 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -882,4 +882,29 @@
 #define         S_000E60_SOFT_RESET_VMC(x)              (((x) & 1) << 17)
 
 #define R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL           0x5480
+
+#define R_0280E0_CB_COLOR0_FRAG                      0x0280E0
+#define   S_0280E0_BASE_256B(x)                        (((x) & 0xFFFFFFFF) << 0)
+#define   G_0280E0_BASE_256B(x)                        (((x) >> 0) & 0xFFFFFFFF)
+#define   C_0280E0_BASE_256B                           0x00000000
+#define R_0280E4_CB_COLOR1_FRAG                      0x0280E4
+#define R_0280E8_CB_COLOR2_FRAG                      0x0280E8
+#define R_0280EC_CB_COLOR3_FRAG                      0x0280EC
+#define R_0280F0_CB_COLOR4_FRAG                      0x0280F0
+#define R_0280F4_CB_COLOR5_FRAG                      0x0280F4
+#define R_0280F8_CB_COLOR6_FRAG                      0x0280F8
+#define R_0280FC_CB_COLOR7_FRAG                      0x0280FC
+#define R_0280C0_CB_COLOR0_TILE                      0x0280C0
+#define   S_0280C0_BASE_256B(x)                        (((x) & 0xFFFFFFFF) << 0)
+#define   G_0280C0_BASE_256B(x)                        (((x) >> 0) & 0xFFFFFFFF)
+#define   C_0280C0_BASE_256B                           0x00000000
+#define R_0280C4_CB_COLOR1_TILE                      0x0280C4
+#define R_0280C8_CB_COLOR2_TILE                      0x0280C8
+#define R_0280CC_CB_COLOR3_TILE                      0x0280CC
+#define R_0280D0_CB_COLOR4_TILE                      0x0280D0
+#define R_0280D4_CB_COLOR5_TILE                      0x0280D4
+#define R_0280D8_CB_COLOR6_TILE                      0x0280D8
+#define R_0280DC_CB_COLOR7_TILE                      0x0280DC
+
+
 #endif
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 53b55608102b..2d5f2bfa7201 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -319,10 +319,12 @@ struct radeon_mc {
         u64                     real_vram_size;
         int                     vram_mtrr;
         bool                    vram_is_ddr;
+        bool                    igp_sideport_enabled;
 };
 
 int radeon_mc_setup(struct radeon_device *rdev);
-
+bool radeon_combios_sideport_present(struct radeon_device *rdev);
+bool radeon_atombios_sideport_present(struct radeon_device *rdev);
 
 /*
  * GPU scratch registers structures, functions & helpers
@@ -408,13 +410,13 @@ struct r600_ih {
         unsigned                wptr_old;
         unsigned                ring_size;
         uint64_t                gpu_addr;
-        uint32_t                align_mask;
         uint32_t                ptr_mask;
         spinlock_t              lock;
         bool                    enabled;
 };
 
 struct r600_blit {
+        struct mutex            mutex;
         struct radeon_bo        *shader_obj;
         u64 shader_gpu_addr;
         u32 vs_offset, ps_offset;
@@ -463,6 +465,7 @@ struct radeon_cs_chunk {
 };
 
 struct radeon_cs_parser {
+        struct device           *dev;
         struct radeon_device    *rdev;
         struct drm_file         *filp;
         /* chunks */
@@ -654,7 +657,6 @@ struct radeon_asic {
                                uint32_t offset, uint32_t obj_size);
         int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
         void (*bandwidth_update)(struct radeon_device *rdev);
-        void (*hdp_flush)(struct radeon_device *rdev);
         void (*hpd_init)(struct radeon_device *rdev);
         void (*hpd_fini)(struct radeon_device *rdev);
         bool (*hpd_sense)(struct radeon_device *rdev, enum radeon_hpd_id hpd);
@@ -667,11 +669,14 @@ struct radeon_asic {
 struct r100_asic {
         const unsigned  *reg_safe_bm;
         unsigned        reg_safe_bm_size;
+        u32             hdp_cntl;
 };
 
 struct r300_asic {
         const unsigned  *reg_safe_bm;
         unsigned        reg_safe_bm_size;
+        u32             resync_scratch;
+        u32             hdp_cntl;
 };
 
 struct r600_asic {
@@ -843,7 +848,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev,
 
 static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
 {
-        if (reg < 0x10000)
+        if (reg < rdev->rmmio_size)
                 return readl(((void __iomem *)rdev->rmmio) + reg);
         else {
                 writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
@@ -853,7 +858,7 @@ static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
 
 static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
 {
-        if (reg < 0x10000)
+        if (reg < rdev->rmmio_size)
                 writel(v, ((void __iomem *)rdev->rmmio) + reg);
         else {
                 writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
@@ -1007,13 +1012,14 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 #define radeon_set_surface_reg(rdev, r, f, p, o, s) ((rdev)->asic->set_surface_reg((rdev), (r), (f), (p), (o), (s)))
 #define radeon_clear_surface_reg(rdev, r) ((rdev)->asic->clear_surface_reg((rdev), (r)))
 #define radeon_bandwidth_update(rdev) (rdev)->asic->bandwidth_update((rdev))
-#define radeon_hdp_flush(rdev) (rdev)->asic->hdp_flush((rdev))
 #define radeon_hpd_init(rdev) (rdev)->asic->hpd_init((rdev))
 #define radeon_hpd_fini(rdev) (rdev)->asic->hpd_fini((rdev))
 #define radeon_hpd_sense(rdev, hpd) (rdev)->asic->hpd_sense((rdev), (hpd))
 #define radeon_hpd_set_polarity(rdev, hpd) (rdev)->asic->hpd_set_polarity((rdev), (hpd))
 
 /* Common functions */
+/* AGP */
+extern void radeon_agp_disable(struct radeon_device *rdev);
 extern int radeon_gart_table_vram_pin(struct radeon_device *rdev);
 extern int radeon_modeset_init(struct radeon_device *rdev);
 extern void radeon_modeset_fini(struct radeon_device *rdev);
@@ -1157,7 +1163,8 @@ extern int r600_irq_init(struct radeon_device *rdev);
 extern void r600_irq_fini(struct radeon_device *rdev);
 extern void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size);
 extern int r600_irq_set(struct radeon_device *rdev);
-
+extern void r600_irq_suspend(struct radeon_device *rdev);
+/* r600 audio */
 extern int r600_audio_init(struct radeon_device *rdev);
 extern int r600_audio_tmds_index(struct drm_encoder *encoder);
 extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock);
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index 54bf49a6d676..c0681a5556dc 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -144,9 +144,19 @@ int radeon_agp_init(struct radeon_device *rdev)
 
         ret = drm_agp_info(rdev->ddev, &info);
         if (ret) {
+                drm_agp_release(rdev->ddev);
                 DRM_ERROR("Unable to get AGP info: %d\n", ret);
                 return ret;
         }
+
+        if (rdev->ddev->agp->agp_info.aper_size < 32) {
+                drm_agp_release(rdev->ddev);
+                dev_warn(rdev->dev, "AGP aperture too small (%zuM) "
+                        "need at least 32M, disabling AGP\n",
+                        rdev->ddev->agp->agp_info.aper_size);
+                return -EINVAL;
+        }
+
         mode.mode = info.mode;
         agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;
         is_v3 = !!(agp_status & RADEON_AGPv3_MODE);
@@ -221,6 +231,7 @@ int radeon_agp_init(struct radeon_device *rdev)
         ret = drm_agp_enable(rdev->ddev, mode);
         if (ret) {
                 DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode);
+                drm_agp_release(rdev->ddev);
                 return ret;
         }
 
@@ -252,10 +263,8 @@ void radeon_agp_resume(struct radeon_device *rdev)
 void radeon_agp_fini(struct radeon_device *rdev)
 {
 #if __OS_HAS_AGP
-        if (rdev->flags & RADEON_IS_AGP) {
-                if (rdev->ddev->agp && rdev->ddev->agp->acquired) {
-                        drm_agp_release(rdev->ddev);
-                }
+        if (rdev->ddev->agp && rdev->ddev->agp->acquired) {
+                drm_agp_release(rdev->ddev);
         }
 #endif
 }
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index eb29217bbf1d..f2fbd2e4e9df 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -77,7 +77,6 @@ int r100_clear_surface_reg(struct radeon_device *rdev, int reg);
 void r100_bandwidth_update(struct radeon_device *rdev);
 void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
 int r100_ring_test(struct radeon_device *rdev);
-void r100_hdp_flush(struct radeon_device *rdev);
 void r100_hpd_init(struct radeon_device *rdev);
 void r100_hpd_fini(struct radeon_device *rdev);
 bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);
@@ -114,7 +113,6 @@ static struct radeon_asic r100_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &r100_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &r100_hpd_init,
         .hpd_fini = &r100_hpd_fini,
         .hpd_sense = &r100_hpd_sense,
@@ -174,7 +172,6 @@ static struct radeon_asic r300_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &r100_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &r100_hpd_init,
         .hpd_fini = &r100_hpd_fini,
         .hpd_sense = &r100_hpd_sense,
@@ -218,7 +215,6 @@ static struct radeon_asic r420_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &r100_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &r100_hpd_init,
         .hpd_fini = &r100_hpd_fini,
         .hpd_sense = &r100_hpd_sense,
@@ -267,7 +263,6 @@ static struct radeon_asic rs400_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &r100_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &r100_hpd_init,
         .hpd_fini = &r100_hpd_fini,
         .hpd_sense = &r100_hpd_sense,
@@ -324,7 +319,6 @@ static struct radeon_asic rs600_asic = {
         .set_pcie_lanes = NULL,
         .set_clock_gating = &radeon_atom_set_clock_gating,
         .bandwidth_update = &rs600_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &rs600_hpd_init,
         .hpd_fini = &rs600_hpd_fini,
         .hpd_sense = &rs600_hpd_sense,
@@ -372,7 +366,6 @@ static struct radeon_asic rs690_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &rs690_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &rs600_hpd_init,
         .hpd_fini = &rs600_hpd_fini,
         .hpd_sense = &rs600_hpd_sense,
@@ -424,7 +417,6 @@ static struct radeon_asic rv515_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &rv515_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &rs600_hpd_init,
         .hpd_fini = &rs600_hpd_fini,
         .hpd_sense = &rs600_hpd_sense,
@@ -467,7 +459,6 @@ static struct radeon_asic r520_asic = {
         .set_surface_reg = r100_set_surface_reg,
         .clear_surface_reg = r100_clear_surface_reg,
         .bandwidth_update = &rv515_bandwidth_update,
-        .hdp_flush = &r100_hdp_flush,
         .hpd_init = &rs600_hpd_init,
         .hpd_fini = &rs600_hpd_fini,
         .hpd_sense = &rs600_hpd_sense,
@@ -508,7 +499,6 @@ int r600_ring_test(struct radeon_device *rdev);
 int r600_copy_blit(struct radeon_device *rdev,
                    uint64_t src_offset, uint64_t dst_offset,
                    unsigned num_pages, struct radeon_fence *fence);
-void r600_hdp_flush(struct radeon_device *rdev);
 void r600_hpd_init(struct radeon_device *rdev);
 void r600_hpd_fini(struct radeon_device *rdev);
 bool r600_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);
@@ -544,7 +534,6 @@ static struct radeon_asic r600_asic = {
         .set_surface_reg = r600_set_surface_reg,
         .clear_surface_reg = r600_clear_surface_reg,
         .bandwidth_update = &rv515_bandwidth_update,
-        .hdp_flush = &r600_hdp_flush,
         .hpd_init = &r600_hpd_init,
         .hpd_fini = &r600_hpd_fini,
         .hpd_sense = &r600_hpd_sense,
@@ -589,7 +578,6 @@ static struct radeon_asic rv770_asic = {
         .set_surface_reg = r600_set_surface_reg,
         .clear_surface_reg = r600_clear_surface_reg,
         .bandwidth_update = &rv515_bandwidth_update,
-        .hdp_flush = &r600_hdp_flush,
         .hpd_init = &r600_hpd_init,
         .hpd_fini = &r600_hpd_fini,
         .hpd_sense = &r600_hpd_sense,
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 321044bef71c..fa82ca74324e 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -114,6 +114,7 @@ static inline struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio(struct radeon_dev
                         i2c.i2c_id = gpio->sucI2cId.ucAccess;
 
                         i2c.valid = true;
+                        break;
                 }
         }
 
@@ -345,7 +346,9 @@ const int object_connector_convert[] = {
         DRM_MODE_CONNECTOR_Unknown,
         DRM_MODE_CONNECTOR_Unknown,
         DRM_MODE_CONNECTOR_Unknown,
-        DRM_MODE_CONNECTOR_DisplayPort
+        DRM_MODE_CONNECTOR_DisplayPort,
+        DRM_MODE_CONNECTOR_eDP,
+        DRM_MODE_CONNECTOR_Unknown
 };
 
 bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
@@ -935,6 +938,43 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
         return false;
 }
 
+union igp_info {
+        struct _ATOM_INTEGRATED_SYSTEM_INFO info;
+        struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 info_2;
+};
+
+bool radeon_atombios_sideport_present(struct radeon_device *rdev)
+{
+        struct radeon_mode_info *mode_info = &rdev->mode_info;
+        int index = GetIndexIntoMasterTable(DATA, IntegratedSystemInfo);
+        union igp_info *igp_info;
+        u8 frev, crev;
+        u16 data_offset;
+
+        atom_parse_data_header(mode_info->atom_context, index, NULL, &frev,
+                               &crev, &data_offset);
+
+        igp_info = (union igp_info *)(mode_info->atom_context->bios +
+                                      data_offset);
+
+        if (igp_info) {
+                switch (crev) {
+                case 1:
+                        if (igp_info->info.ucMemoryType & 0xf0)
+                                return true;
+                        break;
+                case 2:
+                        if (igp_info->info_2.ucMemoryType & 0x0f)
+                                return true;
+                        break;
+                default:
+                        DRM_ERROR("Unsupported IGP table: %d %d\n", frev, crev);
+                        break;
+                }
+        }
+        return false;
+}
+
 bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
                                    struct radeon_encoder_int_tmds *tmds)
 {
@@ -1026,6 +1066,7 @@ static struct radeon_atom_ss *radeon_atombios_get_ss_info(struct
                                 ss->delay = ss_info->asSS_Info[i].ucSS_Delay;
                                 ss->range = ss_info->asSS_Info[i].ucSS_Range;
                                 ss->refdiv = ss_info->asSS_Info[i].ucRecommendedRef_Div;
+                                break;
                         }
                 }
         }
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c
index 812f24dbc2a8..73c4405bf42f 100644
--- a/drivers/gpu/drm/radeon/radeon_clocks.c
+++ b/drivers/gpu/drm/radeon/radeon_clocks.c
@@ -56,7 +56,7 @@ uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev)
         else if (post_div == 3)
                 sclk >>= 2;
         else if (post_div == 4)
-                sclk >>= 4;
+                sclk >>= 3;
 
         return sclk;
 }
@@ -86,7 +86,7 @@ uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev)
         else if (post_div == 3)
                 mclk >>= 2;
         else if (post_div == 4)
-                mclk >>= 4;
+                mclk >>= 3;
 
         return mclk;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index fd94dbca33ac..579c8920e081 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -595,6 +595,48 @@ bool radeon_combios_get_clock_info(struct drm_device *dev)
         return false;
 }
 
+bool radeon_combios_sideport_present(struct radeon_device *rdev)
+{
+        struct drm_device *dev = rdev->ddev;
+        u16 igp_info;
+
+        igp_info = combios_get_table_offset(dev, COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE);
+
+        if (igp_info) {
+                if (RBIOS16(igp_info + 0x4))
+                        return true;
+        }
+        return false;
+}
+
+static const uint32_t default_primarydac_adj[CHIP_LAST] = {
+        0x00000808,             /* r100  */
+        0x00000808,             /* rv100 */
+        0x00000808,             /* rs100 */
+        0x00000808,             /* rv200 */
+        0x00000808,             /* rs200 */
+        0x00000808,             /* r200  */
+        0x00000808,             /* rv250 */
+        0x00000000,             /* rs300 */
+        0x00000808,             /* rv280 */
+        0x00000808,             /* r300  */
+        0x00000808,             /* r350  */
+        0x00000808,             /* rv350 */
+        0x00000808,             /* rv380 */
+        0x00000808,             /* r420  */
+        0x00000808,             /* r423  */
+        0x00000808,             /* rv410 */
+        0x00000000,             /* rs400 */
+        0x00000000,             /* rs480 */
+};
+
+static void radeon_legacy_get_primary_dac_info_from_table(struct radeon_device *rdev,
+                                                          struct radeon_encoder_primary_dac *p_dac)
+{
+        p_dac->ps2_pdac_adj = default_primarydac_adj[rdev->family];
+        return;
+}
+
 struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
                                                                        radeon_encoder
                                                                        *encoder)
@@ -604,20 +646,20 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
         uint16_t dac_info;
         uint8_t rev, bg, dac;
         struct radeon_encoder_primary_dac *p_dac = NULL;
+        int found = 0;
 
-        if (rdev->bios == NULL)
+        p_dac = kzalloc(sizeof(struct radeon_encoder_primary_dac),
+                        GFP_KERNEL);
+
+        if (!p_dac)
                 return NULL;
 
+        if (rdev->bios == NULL)
+                goto out;
+
         /* check CRT table */
         dac_info = combios_get_table_offset(dev, COMBIOS_CRT_INFO_TABLE);
         if (dac_info) {
-                p_dac =
-                    kzalloc(sizeof(struct radeon_encoder_primary_dac),
-                            GFP_KERNEL);
-
-                if (!p_dac)
-                        return NULL;
-
                 rev = RBIOS8(dac_info) & 0x3;
                 if (rev < 2) {
                         bg = RBIOS8(dac_info + 0x2) & 0xf;
@@ -628,9 +670,13 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
                         dac = RBIOS8(dac_info + 0x3) & 0xf;
                         p_dac->ps2_pdac_adj = (bg << 8) | (dac);
                 }
-
+                found = 1;
         }
 
+out:
+        if (!found) /* fallback to defaults */
+                radeon_legacy_get_primary_dac_info_from_table(rdev, p_dac);
+
         return p_dac;
 }
 
@@ -641,6 +687,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev)
         uint16_t tv_info;
         enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+        if (rdev->bios == NULL)
+                return tv_std;
+
         tv_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE);
         if (tv_info) {
                 if (RBIOS8(tv_info + 6) == 'T') {
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 20161567dbff..55266416fa47 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -49,8 +49,10 @@ void radeon_connector_hotplug(struct drm_connector *connector)
         if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
                 radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
 
-        if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
-                if (radeon_dp_getsinktype(radeon_connector) == CONNECTOR_OBJECT_ID_DISPLAYPORT) {
+        if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
+            (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
+                if ((radeon_dp_getsinktype(radeon_connector) == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+                    (radeon_dp_getsinktype(radeon_connector) == CONNECTOR_OBJECT_ID_eDP)) {
                         if (radeon_dp_needs_link_train(radeon_connector)) {
                                 if (connector->encoder)
                                         dp_link_train(connector->encoder, connector);
@@ -615,7 +617,7 @@ static enum drm_connector_status radeon_vga_detect(struct drm_connector *connect
                                 ret = connector_status_connected;
                 }
         } else {
-                if (radeon_connector->dac_load_detect) {
+                if (radeon_connector->dac_load_detect && encoder) {
                         encoder_funcs = encoder->helper_private;
                         ret = encoder_funcs->detect(encoder, connector);
                 }
@@ -898,10 +900,18 @@ static void radeon_dvi_force(struct drm_connector *connector)
 static int radeon_dvi_mode_valid(struct drm_connector *connector,
                                   struct drm_display_mode *mode)
 {
+        struct drm_device *dev = connector->dev;
+        struct radeon_device *rdev = dev->dev_private;
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 
         /* XXX check mode bandwidth */
 
+        /* clocks over 135 MHz have heat issues with DVI on RV100 */
+        if (radeon_connector->use_digital &&
+            (rdev->family == CHIP_RV100) &&
+            (mode->clock > 135000))
+                return MODE_CLOCK_HIGH;
+
         if (radeon_connector->use_digital && (mode->clock > 165000)) {
                 if ((radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I) ||
                     (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) ||
@@ -967,7 +977,8 @@ static enum drm_connector_status radeon_dp_detect(struct drm_connector *connecto
         }
 
         sink_type = radeon_dp_getsinktype(radeon_connector);
-        if (sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {
+        if ((sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+            (sink_type == CONNECTOR_OBJECT_ID_eDP)) {
                 if (radeon_dp_getdpcd(radeon_connector)) {
                         radeon_dig_connector->dp_sink_type = sink_type;
                         ret = connector_status_connected;
@@ -992,7 +1003,8 @@ static int radeon_dp_mode_valid(struct drm_connector *connector,
 
         /* XXX check mode bandwidth */
 
-        if (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)
+        if ((radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+            (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
                 return radeon_dp_mode_valid_helper(radeon_connector, mode);
         else
                 return MODE_OK;
@@ -1145,6 +1157,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
         case DRM_MODE_CONNECTOR_DisplayPort:
+        case DRM_MODE_CONNECTOR_eDP:
                 radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);
                 if (!radeon_dig_connector)
                         goto failed;
@@ -1157,10 +1170,16 @@ radeon_add_atom_connector(struct drm_device *dev,
                         goto failed;
                 if (i2c_bus->valid) {
                         /* add DP i2c bus */
-                        radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");
+                        if (connector_type == DRM_MODE_CONNECTOR_eDP)
+                                radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "eDP-auxch");
+                        else
+                                radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");
                         if (!radeon_dig_connector->dp_i2c_bus)
                                 goto failed;
-                        radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP");
+                        if (connector_type == DRM_MODE_CONNECTOR_eDP)
+                                radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "eDP");
+                        else
+                                radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP");
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 0b2f9c2ad2c1..06123ba31d31 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -2145,6 +2145,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master)
                          &master_priv->sarea);
         if (ret) {
                 DRM_ERROR("SAREA setup failed\n");
+                kfree(master_priv);
                 return ret;
         }
         master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 65590a0f1d93..1190148cf5e6 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -189,7 +189,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error)
 {
         unsigned i;
 
-        if (error) {
+        if (error && parser->ib) {
                 radeon_bo_list_unvalidate(&parser->validated,
                                                 parser->ib->fence);
         } else {
@@ -231,6 +231,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
         memset(&parser, 0, sizeof(struct radeon_cs_parser));
         parser.filp = filp;
         parser.rdev = rdev;
+        parser.dev = rdev->dev;
         r = radeon_cs_parser_init(&parser, data);
         if (r) {
                 DRM_ERROR("Failed to initialize parser !\n");
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 7c6848096bcd..768b1509fa03 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -544,6 +544,7 @@ void radeon_agp_disable(struct radeon_device *rdev)
                 rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
                 rdev->asic->gart_set_page = &r100_pci_gart_set_page;
         }
+        rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
 }
 
 void radeon_check_arguments(struct radeon_device *rdev)
@@ -733,16 +734,18 @@ void radeon_device_fini(struct radeon_device *rdev)
  */
 int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
 {
-        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_device *rdev;
         struct drm_crtc *crtc;
         int r;
 
-        if (dev == NULL || rdev == NULL) {
+        if (dev == NULL || dev->dev_private == NULL) {
                 return -ENODEV;
         }
         if (state.event == PM_EVENT_PRETHAW) {
                 return 0;
         }
+        rdev = dev->dev_private;
+
         /* unpin the front buffers */
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 struct radeon_framebuffer *rfb = to_radeon_framebuffer(crtc->fb);
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 91d72b70abc9..6a92f994cc26 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -234,7 +234,7 @@ static const char *encoder_names[34] = {
         "INTERNAL_UNIPHY2",
 };
 
-static const char *connector_names[13] = {
+static const char *connector_names[15] = {
         "Unknown",
         "VGA",
         "DVI-I",
@@ -248,6 +248,8 @@ static const char *connector_names[13] = {
         "DisplayPort",
         "HDMI-A",
         "HDMI-B",
+        "TV",
+        "eDP",
 };
 
 static const char *hpd_names[7] = {
@@ -329,8 +331,11 @@ static bool radeon_setup_enc_conn(struct drm_device *dev)
                                 ret = radeon_get_atom_connector_info_from_object_table(dev);
                         else
                                 ret = radeon_get_atom_connector_info_from_supported_devices_table(dev);
-                } else
+                } else {
                         ret = radeon_get_legacy_connector_info_from_bios(dev);
+                        if (ret == false)
+                                ret = radeon_get_legacy_connector_info_from_table(dev);
+                }
         } else {
                 if (!ASIC_IS_AVIVO(rdev))
                         ret = radeon_get_legacy_connector_info_from_table(dev);
@@ -349,9 +354,11 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
 {
         int ret = 0;
 
-        if (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+        if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
+            (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) {
                 struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
-                if (dig->dp_i2c_bus)
+                if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||
+                     dig->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) && dig->dp_i2c_bus)
                         radeon_connector->edid = drm_get_edid(&radeon_connector->base, &dig->dp_i2c_bus->adapter);
         }
         if (!radeon_connector->ddc_bus)
@@ -404,11 +411,12 @@ void radeon_compute_pll(struct radeon_pll *pll,
                         uint32_t *fb_div_p,
                         uint32_t *frac_fb_div_p,
                         uint32_t *ref_div_p,
-                        uint32_t *post_div_p,
-                        int flags)
+                        uint32_t *post_div_p)
 {
         uint32_t min_ref_div = pll->min_ref_div;
         uint32_t max_ref_div = pll->max_ref_div;
+        uint32_t min_post_div = pll->min_post_div;
+        uint32_t max_post_div = pll->max_post_div;
         uint32_t min_fractional_feed_div = 0;
         uint32_t max_fractional_feed_div = 0;
         uint32_t best_vco = pll->best_vco;
@@ -424,7 +432,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
         DRM_DEBUG("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
         freq = freq * 1000;
 
-        if (flags & RADEON_PLL_USE_REF_DIV)
+        if (pll->flags & RADEON_PLL_USE_REF_DIV)
                 min_ref_div = max_ref_div = pll->reference_div;
         else {
                 while (min_ref_div < max_ref_div-1) {
@@ -439,19 +447,22 @@ void radeon_compute_pll(struct radeon_pll *pll,
                 }
         }
 
-        if (flags & RADEON_PLL_USE_FRAC_FB_DIV) {
+        if (pll->flags & RADEON_PLL_USE_POST_DIV)
+                min_post_div = max_post_div = pll->post_div;
+
+        if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
                 min_fractional_feed_div = pll->min_frac_feedback_div;
                 max_fractional_feed_div = pll->max_frac_feedback_div;
         }
 
-        for (post_div = pll->min_post_div; post_div <= pll->max_post_div; ++post_div) {
+        for (post_div = min_post_div; post_div <= max_post_div; ++post_div) {
                 uint32_t ref_div;
 
-                if ((flags & RADEON_PLL_NO_ODD_POST_DIV) && (post_div & 1))
+                if ((pll->flags & RADEON_PLL_NO_ODD_POST_DIV) && (post_div & 1))
                         continue;
 
                 /* legacy radeons only have a few post_divs */
-                if (flags & RADEON_PLL_LEGACY) {
+                if (pll->flags & RADEON_PLL_LEGACY) {
                         if ((post_div == 5) ||
                             (post_div == 7) ||
                             (post_div == 9) ||
@@ -498,7 +509,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
                                         tmp += (uint64_t)pll->reference_freq * 1000 * frac_feedback_div;
                                         current_freq = radeon_div(tmp, ref_div * post_div);
 
-                                        if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
+                                        if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
                                                 error = freq - current_freq;
                                                 error = error < 0 ? 0xffffffff : error;
                                         } else
@@ -525,12 +536,12 @@ void radeon_compute_pll(struct radeon_pll *pll,
                                                         best_freq = current_freq;
                                                         best_error = error;
                                                         best_vco_diff = vco_diff;
-                                                } else if (((flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) ||
-                                                           ((flags & RADEON_PLL_PREFER_HIGH_REF_DIV) && (ref_div > best_ref_div)) ||
-                                                           ((flags & RADEON_PLL_PREFER_LOW_FB_DIV) && (feedback_div < best_feedback_div)) ||
-                                                           ((flags & RADEON_PLL_PREFER_HIGH_FB_DIV) && (feedback_div > best_feedback_div)) ||
-                                                           ((flags & RADEON_PLL_PREFER_LOW_POST_DIV) && (post_div < best_post_div)) ||
-                                                           ((flags & RADEON_PLL_PREFER_HIGH_POST_DIV) && (post_div > best_post_div))) {
+                                                } else if (((pll->flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_REF_DIV) && (ref_div > best_ref_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_LOW_FB_DIV) && (feedback_div < best_feedback_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_FB_DIV) && (feedback_div > best_feedback_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_LOW_POST_DIV) && (post_div < best_post_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_POST_DIV) && (post_div > best_post_div))) {
                                                         best_post_div = post_div;
                                                         best_ref_div = ref_div;
                                                         best_feedback_div = feedback_div;
@@ -566,8 +577,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
                               uint32_t *fb_div_p,
                               uint32_t *frac_fb_div_p,
                               uint32_t *ref_div_p,
-                              uint32_t *post_div_p,
-                              int flags)
+                              uint32_t *post_div_p)
 {
         fixed20_12 m, n, frac_n, p, f_vco, f_pclk, best_freq;
         fixed20_12 pll_out_max, pll_out_min;
@@ -661,7 +671,6 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
                 radeonfb_remove(dev, fb);
 
         if (radeon_fb->obj) {
-                radeon_gem_object_unpin(radeon_fb->obj);
                 mutex_lock(&dev->struct_mutex);
                 drm_gem_object_unreference(radeon_fb->obj);
                 mutex_unlock(&dev->struct_mutex);
@@ -709,7 +718,11 @@ radeon_user_framebuffer_create(struct drm_device *dev,
         struct drm_gem_object *obj;
 
         obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
-
+        if (obj ==  NULL) {
+                dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
+                        "can't create framebuffer\n", mode_cmd->handle);
+                return NULL;
+        }
         return radeon_framebuffer_create(dev, mode_cmd, obj);
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index ccba95f83d11..3c91724457ca 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -156,6 +156,26 @@ radeon_get_encoder_id(struct drm_device *dev, uint32_t supported_device, uint8_t
         return ret;
 }
 
+static inline bool radeon_encoder_is_digital(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;
+        default:
+                return false;
+        }
+}
 void
 radeon_link_encoder_connector(struct drm_device *dev)
 {
@@ -202,7 +222,7 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder)
 
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 radeon_connector = to_radeon_connector(connector);
-                if (radeon_encoder->devices & radeon_connector->devices)
+                if (radeon_encoder->active_device & radeon_connector->devices)
                         return connector;
         }
         return NULL;
@@ -596,21 +616,23 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                 return ATOM_ENCODER_MODE_LVDS;
                 break;
         case DRM_MODE_CONNECTOR_DisplayPort:
+        case DRM_MODE_CONNECTOR_eDP:
                 radeon_dig_connector = radeon_connector->con_priv;
-                if (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)
+                if ((radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+                    (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
                         return ATOM_ENCODER_MODE_DP;
                 else if (drm_detect_hdmi_monitor(radeon_connector->edid))
                         return ATOM_ENCODER_MODE_HDMI;
                 else
                         return ATOM_ENCODER_MODE_DVI;
                 break;
-        case CONNECTOR_DVI_A:
-        case CONNECTOR_VGA:
+        case DRM_MODE_CONNECTOR_DVIA:
+        case DRM_MODE_CONNECTOR_VGA:
                 return ATOM_ENCODER_MODE_CRT;
                 break;
-        case CONNECTOR_STV:
-        case CONNECTOR_CTV:
-        case CONNECTOR_DIN:
+        case DRM_MODE_CONNECTOR_Composite:
+        case DRM_MODE_CONNECTOR_SVIDEO:
+        case DRM_MODE_CONNECTOR_9PinDIN:
                 /* fix me */
                 return ATOM_ENCODER_MODE_TV;
                 /*return ATOM_ENCODER_MODE_CV;*/
@@ -674,31 +696,11 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action)
 
         memset(&args, 0, sizeof(args));
 
-        if (ASIC_IS_DCE32(rdev)) {
-                if (dig->dig_block)
-                        index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
-                else
-                        index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
-                num = dig->dig_block + 1;
-        } else {
-                switch (radeon_encoder->encoder_id) {
-                case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-                        /* XXX doesn't really matter which dig encoder we pick as long as it's
-                         * not already in use
-                         */
-                        if (dig_connector->linkb)
-                                index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
-                        else
-                                index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
-                        num = 1;
-                        break;
-                case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-                        /* Only dig2 encoder can drive LVTMA */
-                        index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
-                        num = 2;
-                        break;
-                }
-        }
+        if (dig->dig_encoder)
+                index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
+        else
+                index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
+        num = dig->dig_encoder + 1;
 
         atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev);
 
@@ -820,7 +822,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                         args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
         }
         if (ASIC_IS_DCE32(rdev)) {
-                if (dig->dig_block)
+                if (dig->dig_encoder == 1)
                         args.v2.acConfig.ucEncoderSel = 1;
                 if (dig_connector->linkb)
                         args.v2.acConfig.ucLinkSel = 1;
@@ -847,17 +849,16 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 args.v2.acConfig.fCoherentMode = 1;
                 }
         } else {
+
                 args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL;
 
+                if (dig->dig_encoder)
+                        args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
+                else
+                        args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
+
                 switch (radeon_encoder->encoder_id) {
                 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-                        /* XXX doesn't really matter which dig encoder we pick as long as it's
-                         * not already in use
-                         */
-                        if (dig_connector->linkb)
-                                args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
-                        else
-                                args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
                         if (rdev->flags & RADEON_IS_IGP) {
                                 if (radeon_encoder->pixel_clock > 165000) {
                                         if (dig_connector->igp_lane_info & 0x3)
@@ -876,10 +877,6 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 }
                         }
                         break;
-                case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-                        /* Only dig2 encoder can drive LVTMA */
-                        args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
-                        break;
                 }
 
                 if (radeon_encoder->pixel_clock > 165000)
@@ -1044,6 +1041,7 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
         union crtc_sourc_param args;
         int index = GetIndexIntoMasterTable(COMMAND, SelectCRTC_Source);
         uint8_t frev, crev;
+        struct radeon_encoder_atom_dig *dig;
 
         memset(&args, 0, sizeof(args));
 
@@ -1107,40 +1105,16 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
                         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
                         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
                         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
-                                if (ASIC_IS_DCE32(rdev)) {
-                                        if (radeon_crtc->crtc_id)
-                                                args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
-                                        else
-                                                args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
-                                } else {
-                                        struct drm_connector *connector;
-                                        struct radeon_connector *radeon_connector;
-                                        struct radeon_connector_atom_dig *dig_connector;
-
-                                        connector = radeon_get_connector_for_encoder(encoder);
-                                        if (!connector)
-                                                return;
-                                        radeon_connector = to_radeon_connector(connector);
-                                        if (!radeon_connector->con_priv)
-                                                return;
-                                        dig_connector = radeon_connector->con_priv;
-
-                                        /* XXX doesn't really matter which dig encoder we pick as long as it's
-                                         * not already in use
-                                         */
-                                        if (dig_connector->linkb)
-                                                args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
-                                        else
-                                                args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
-                                }
+                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+                                dig = radeon_encoder->enc_priv;
+                                if (dig->dig_encoder)
+                                        args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
+                                else
+                                        args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
                                 break;
                         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
                                 args.v2.ucEncoderID = ASIC_INT_DVO_ENCODER_ID;
                                 break;
-                        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-                                /* Only dig2 encoder can drive LVTMA */
-                                args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
-                                break;
                         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
                                 if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                         args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
@@ -1200,6 +1174,47 @@ atombios_apply_encoder_quirks(struct drm_encoder *encoder,
         }
 }
 
+static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        struct drm_encoder *test_encoder;
+        struct radeon_encoder_atom_dig *dig;
+        uint32_t dig_enc_in_use = 0;
+        /* on DCE32 and encoder can driver any block so just crtc id */
+        if (ASIC_IS_DCE32(rdev)) {
+                return radeon_crtc->crtc_id;
+        }
+
+        /* on DCE3 - LVTMA can only be driven by DIGB */
+        list_for_each_entry(test_encoder, &dev->mode_config.encoder_list, head) {
+                struct radeon_encoder *radeon_test_encoder;
+
+                if (encoder == test_encoder)
+                        continue;
+
+                if (!radeon_encoder_is_digital(test_encoder))
+                        continue;
+
+                radeon_test_encoder = to_radeon_encoder(test_encoder);
+                dig = radeon_test_encoder->enc_priv;
+
+                if (dig->dig_encoder >= 0)
+                        dig_enc_in_use |= (1 << dig->dig_encoder);
+        }
+
+        if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA) {
+                if (dig_enc_in_use & 0x2)
+                        DRM_ERROR("LVDS required digital encoder 2 but it was in use - stealing\n");
+                return 1;
+        }
+        if (!(dig_enc_in_use & 1))
+                return 0;
+        return 1;
+}
+
 static void
 radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
                              struct drm_display_mode *mode,
@@ -1212,12 +1227,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 
         if (radeon_encoder->active_device &
             (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) {
-                if (radeon_encoder->enc_priv) {
-                        struct radeon_encoder_atom_dig *dig;
-
-                        dig = radeon_encoder->enc_priv;
-                        dig->dig_block = radeon_crtc->crtc_id;
-                }
+                struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
+                if (dig)
+                        dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder);
         }
         radeon_encoder->pixel_clock = adjusted_mode->clock;
 
@@ -1377,7 +1389,13 @@ static void radeon_atom_encoder_commit(struct drm_encoder *encoder)
 static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
 {
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        struct radeon_encoder_atom_dig *dig;
         radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+
+        if (radeon_encoder_is_digital(encoder)) {
+                dig = radeon_encoder->enc_priv;
+                dig->dig_encoder = -1;
+        }
         radeon_encoder->active_device = 0;
 }
 
@@ -1434,6 +1452,7 @@ radeon_atombios_set_dig_info(struct radeon_encoder *radeon_encoder)
 
         /* coherent mode by default */
         dig->coherent_mode = true;
+        dig->dig_encoder = -1;
 
         return dig;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 4cdd8b4f7549..8495d4e32e18 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -140,16 +140,15 @@ int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence)
 
 bool radeon_fence_signaled(struct radeon_fence *fence)
 {
-        struct radeon_device *rdev = fence->rdev;
         unsigned long irq_flags;
         bool signaled = false;
 
-        if (rdev->gpu_lockup) {
+        if (!fence)
                 return true;
-        }
-        if (fence == NULL) {
+
+        if (fence->rdev->gpu_lockup)
                 return true;
-        }
+
         write_lock_irqsave(&fence->rdev->fence_drv.lock, irq_flags);
         signaled = fence->signaled;
         /* if we are shuting down report all fence as signaled */
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 60df2d7e7e4c..0e1325e18534 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -131,7 +131,6 @@ int radeon_gem_set_domain(struct drm_gem_object *gobj,
                         printk(KERN_ERR "Failed to wait for object !\n");
                         return r;
                 }
-                radeon_hdp_flush(robj->rdev);
         }
         return 0;
 }
@@ -312,7 +311,6 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         mutex_lock(&dev->struct_mutex);
         drm_gem_object_unreference(gobj);
         mutex_unlock(&dev->struct_mutex);
-        radeon_hdp_flush(robj->rdev);
         return r;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index b79ecc4a7cc4..2f349a300195 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
@@ -289,16 +289,16 @@ int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_pr
         drm_radeon_irq_emit_t *emit = data;
         int result;
 
-        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
-                return -EINVAL;
-
-        LOCK_TEST_WITH_RETURN(dev, file_priv);
-
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
+        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+                return -EINVAL;
+
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
+
         result = radeon_emit_irq(dev);
 
         if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 9223296fe37b..3cfd60fd0083 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -97,6 +97,7 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
         rdev->irq.sw_int = false;
         for (i = 0; i < 2; i++) {
                 rdev->irq.crtc_vblank_int[i] = false;
+                rdev->irq.hpd[i] = false;
         }
         radeon_irq_set(rdev);
 }
@@ -128,17 +129,22 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
                         DRM_INFO("radeon: using MSI.\n");
                 }
         }
-        drm_irq_install(rdev->ddev);
         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) {
-                rdev->irq.installed = false;
                 drm_irq_uninstall(rdev->ddev);
+                rdev->irq.installed = false;
                 if (rdev->msi_enabled)
                         pci_disable_msi(rdev->pdev);
         }
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index cc27485a07ad..b6d8081e1246 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -339,69 +339,6 @@ void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)
         }
 }
 
-/* properly set crtc bpp when using atombios */
-void radeon_legacy_atom_set_surface(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct radeon_device *rdev = dev->dev_private;
-        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-        int format;
-        uint32_t crtc_gen_cntl;
-        uint32_t disp_merge_cntl;
-        uint32_t crtc_pitch;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                format = 2;
-                break;
-        case 15:      /*  555 */
-                format = 3;
-                break;
-        case 16:      /*  565 */
-                format = 4;
-                break;
-        case 24:      /*  RGB */
-                format = 5;
-                break;
-        case 32:      /* xRGB */
-                format = 6;
-                break;
-        default:
-                return;
-        }
-
-        crtc_pitch  = ((((crtc->fb->pitch / (crtc->fb->bits_per_pixel / 8)) * crtc->fb->bits_per_pixel) +
-                        ((crtc->fb->bits_per_pixel * 8) - 1)) /
-                       (crtc->fb->bits_per_pixel * 8));
-        crtc_pitch |= crtc_pitch << 16;
-
-        WREG32(RADEON_CRTC_PITCH + radeon_crtc->crtc_offset, crtc_pitch);
-
-        switch (radeon_crtc->crtc_id) {
-        case 0:
-                disp_merge_cntl = RREG32(RADEON_DISP_MERGE_CNTL);
-                disp_merge_cntl &= ~RADEON_DISP_RGB_OFFSET_EN;
-                WREG32(RADEON_DISP_MERGE_CNTL, disp_merge_cntl);
-
-                crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL) & 0xfffff0ff;
-                crtc_gen_cntl |= (format << 8);
-                crtc_gen_cntl |= RADEON_CRTC_EXT_DISP_EN;
-                WREG32(RADEON_CRTC_GEN_CNTL, crtc_gen_cntl);
-                break;
-        case 1:
-                disp_merge_cntl = RREG32(RADEON_DISP2_MERGE_CNTL);
-                disp_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN;
-                WREG32(RADEON_DISP2_MERGE_CNTL, disp_merge_cntl);
-
-                crtc_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL) & 0xfffff0ff;
-                crtc_gen_cntl |= (format << 8);
-                WREG32(RADEON_CRTC2_GEN_CNTL, crtc_gen_cntl);
-                WREG32(RADEON_FP_H2_SYNC_STRT_WID,   RREG32(RADEON_CRTC2_H_SYNC_STRT_WID));
-                WREG32(RADEON_FP_V2_SYNC_STRT_WID,   RREG32(RADEON_CRTC2_V_SYNC_STRT_WID));
-                break;
-        }
-}
-
 int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                          struct drm_framebuffer *old_fb)
 {
@@ -755,7 +692,6 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
         uint32_t post_divider = 0;
         uint32_t freq = 0;
         uint8_t pll_gain;
-        int pll_flags = RADEON_PLL_LEGACY;
         bool use_bios_divs = false;
         /* PLL registers */
         uint32_t pll_ref_div = 0;
@@ -789,10 +725,12 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
         else
                 pll = &rdev->clock.p1pll;
 
+        pll->flags = RADEON_PLL_LEGACY;
+
         if (mode->clock > 200000) /* range limits??? */
-                pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
+                pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
         else
-                pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
+                pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                 if (encoder->crtc == crtc) {
@@ -804,7 +742,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                         }
 
                         if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
-                                pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
+                                pll->flags |= RADEON_PLL_NO_ODD_POST_DIV;
                         if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) {
                                 if (!rdev->is_atom_bios) {
                                         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@@ -819,7 +757,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                                                 }
                                         }
                                 }
-                                pll_flags |= RADEON_PLL_USE_REF_DIV;
+                                pll->flags |= RADEON_PLL_USE_REF_DIV;
                         }
                 }
         }
@@ -829,8 +767,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
         if (!use_bios_divs) {
                 radeon_compute_pll(pll, mode->clock,
                                    &freq, &feedback_div, &frac_fb_div,
-                                   &reference_div, &post_divider,
-                                   pll_flags);
+                                   &reference_div, &post_divider);
 
                 for (post_div = &post_divs[0]; post_div->divider; ++post_div) {
                         if (post_div->divider == post_divider)
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 981508ff7037..38e45e231ef5 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -46,6 +46,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man;
         int panel_pwr_delay = 2000;
+        bool is_mac = false;
         DRM_DEBUG("\n");
 
         if (radeon_encoder->enc_priv) {
@@ -58,6 +59,15 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
                 }
         }
 
+        /* macs (and possibly some x86 oem systems?) wire up LVDS strangely
+         * Taken from radeonfb.
+         */
+        if ((rdev->mode_info.connector_table == CT_IBOOK) ||
+            (rdev->mode_info.connector_table == CT_POWERBOOK_EXTERNAL) ||
+            (rdev->mode_info.connector_table == CT_POWERBOOK_INTERNAL) ||
+            (rdev->mode_info.connector_table == CT_POWERBOOK_VGA))
+                is_mac = true;
+
         switch (mode) {
         case DRM_MODE_DPMS_ON:
                 disp_pwr_man = RREG32(RADEON_DISP_PWR_MAN);
@@ -74,6 +84,8 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
 
                 lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
                 lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | RADEON_LVDS_DIGON | RADEON_LVDS_BLON);
+                if (is_mac)
+                        lvds_gen_cntl |= RADEON_LVDS_BL_MOD_EN;
                 lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS);
                 udelay(panel_pwr_delay * 1000);
                 WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
@@ -85,7 +97,14 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
                 WREG32_PLL_P(RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb);
                 lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
                 lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;
-                lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON | RADEON_LVDS_EN | RADEON_LVDS_DIGON);
+                if (is_mac) {
+                        lvds_gen_cntl &= ~RADEON_LVDS_BL_MOD_EN;
+                        WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
+                        lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_EN);
+                } else {
+                        WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
+                        lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON | RADEON_LVDS_EN | RADEON_LVDS_DIGON);
+                }
                 udelay(panel_pwr_delay * 1000);
                 WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
                 WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
index 3a12bb0c0563..417684daef4c 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
@@ -77,7 +77,7 @@ struct radeon_tv_mode_constants {
         unsigned pix_to_tv;
 };
 
-static const uint16_t hor_timing_NTSC[] = {
+static const uint16_t hor_timing_NTSC[MAX_H_CODE_TIMING_LEN] = {
         0x0007,
         0x003f,
         0x0263,
@@ -98,7 +98,7 @@ static const uint16_t hor_timing_NTSC[] = {
         0
 };
 
-static const uint16_t vert_timing_NTSC[] = {
+static const uint16_t vert_timing_NTSC[MAX_V_CODE_TIMING_LEN] = {
         0x2001,
         0x200d,
         0x1006,
@@ -115,7 +115,7 @@ static const uint16_t vert_timing_NTSC[] = {
         0
 };
 
-static const uint16_t hor_timing_PAL[] = {
+static const uint16_t hor_timing_PAL[MAX_H_CODE_TIMING_LEN] = {
         0x0007,
         0x0058,
         0x027c,
@@ -136,7 +136,7 @@ static const uint16_t hor_timing_PAL[] = {
         0
 };
 
-static const uint16_t vert_timing_PAL[] =       {
+static const uint16_t vert_timing_PAL[MAX_V_CODE_TIMING_LEN] = {
         0x2001,
         0x200c,
         0x1005,
@@ -623,9 +623,9 @@ void radeon_legacy_tv_mode_set(struct drm_encoder *encoder,
         }
         flicker_removal = (tmp + 500) / 1000;
 
-        if (flicker_removal < 3)
-                flicker_removal = 3;
-        for (i = 0; i < 6; ++i) {
+        if (flicker_removal < 2)
+                flicker_removal = 2;
+        for (i = 0; i < ARRAY_SIZE(SLOPE_limit); ++i) {
                 if (flicker_removal == SLOPE_limit[i])
                         break;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 402369db5ba0..e81b2aeb6a8f 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -46,32 +46,6 @@ struct radeon_device;
 #define to_radeon_encoder(x) container_of(x, struct radeon_encoder, base)
 #define to_radeon_framebuffer(x) container_of(x, struct radeon_framebuffer, base)
 
-enum radeon_connector_type {
-        CONNECTOR_NONE,
-        CONNECTOR_VGA,
-        CONNECTOR_DVI_I,
-        CONNECTOR_DVI_D,
-        CONNECTOR_DVI_A,
-        CONNECTOR_STV,
-        CONNECTOR_CTV,
-        CONNECTOR_LVDS,
-        CONNECTOR_DIGITAL,
-        CONNECTOR_SCART,
-        CONNECTOR_HDMI_TYPE_A,
-        CONNECTOR_HDMI_TYPE_B,
-        CONNECTOR_0XC,
-        CONNECTOR_0XD,
-        CONNECTOR_DIN,
-        CONNECTOR_DISPLAY_PORT,
-        CONNECTOR_UNSUPPORTED
-};
-
-enum radeon_dvi_type {
-        DVI_AUTO,
-        DVI_DIGITAL,
-        DVI_ANALOG
-};
-
 enum radeon_rmx_type {
         RMX_OFF,
         RMX_FULL,
@@ -151,16 +125,24 @@ struct radeon_tmds_pll {
 #define RADEON_PLL_PREFER_HIGH_POST_DIV (1 << 9)
 #define RADEON_PLL_USE_FRAC_FB_DIV      (1 << 10)
 #define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 11)
+#define RADEON_PLL_USE_POST_DIV         (1 << 12)
 
 struct radeon_pll {
-        uint16_t reference_freq;
-        uint16_t reference_div;
+        /* reference frequency */
+        uint32_t reference_freq;
+
+        /* fixed dividers */
+        uint32_t reference_div;
+        uint32_t post_div;
+
+        /* pll in/out limits */
         uint32_t pll_in_min;
         uint32_t pll_in_max;
         uint32_t pll_out_min;
         uint32_t pll_out_max;
-        uint16_t xclk;
+        uint32_t best_vco;
 
+        /* divider limits */
         uint32_t min_ref_div;
         uint32_t max_ref_div;
         uint32_t min_post_div;
@@ -169,7 +151,12 @@ struct radeon_pll {
         uint32_t max_feedback_div;
         uint32_t min_frac_feedback_div;
         uint32_t max_frac_feedback_div;
-        uint32_t best_vco;
+
+        /* flags for the current clock */
+        uint32_t flags;
+
+        /* pll id */
+        uint32_t id;
 };
 
 struct radeon_i2c_chan {
@@ -312,7 +299,7 @@ struct radeon_atom_ss {
 struct radeon_encoder_atom_dig {
         /* atom dig */
         bool coherent_mode;
-        int dig_block;
+        int dig_encoder; /* -1 disabled, 0 DIGA, 1 DIGB */
         /* atom lvds */
         uint32_t lvds_misc;
         uint16_t panel_pwr_delay;
@@ -443,8 +430,7 @@ extern void radeon_compute_pll(struct radeon_pll *pll,
                                uint32_t *fb_div_p,
                                uint32_t *frac_fb_div_p,
                                uint32_t *ref_div_p,
-                               uint32_t *post_div_p,
-                               int flags);
+                               uint32_t *post_div_p);
 
 extern void radeon_compute_pll_avivo(struct radeon_pll *pll,
                                      uint64_t freq,
@@ -452,8 +438,7 @@ extern void radeon_compute_pll_avivo(struct radeon_pll *pll,
                                      uint32_t *fb_div_p,
                                      uint32_t *frac_fb_div_p,
                                      uint32_t *ref_div_p,
-                                     uint32_t *post_div_p,
-                                     int flags);
+                                     uint32_t *post_div_p);
 
 extern void radeon_setup_encoder_clones(struct drm_device *dev);
 
@@ -479,7 +464,6 @@ extern void atombios_crtc_dpms(struct drm_crtc *crtc, int mode);
 
 extern int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                                  struct drm_framebuffer *old_fb);
-extern void radeon_legacy_atom_set_surface(struct drm_crtc *crtc);
 
 extern int radeon_crtc_cursor_set(struct drm_crtc *crtc,
                                   struct drm_file *file_priv,
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index d9ffe1f56e8f..d72a71bff218 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -220,9 +220,11 @@ int radeon_bo_unpin(struct radeon_bo *bo)
 
 int radeon_bo_evict_vram(struct radeon_device *rdev)
 {
-        if (rdev->flags & RADEON_IS_IGP) {
-                /* Useless to evict on IGP chips */
-                return 0;
+        /* late 2.6.33 fix IGP hibernate - we need pm ops to do this correct */
+        if (0 && (rdev->flags & RADEON_IS_IGP)) {
+                if (rdev->mc.igp_sideport_enabled == false)
+                        /* Useless to evict on IGP chips */
+                        return 0;
         }
         return ttm_bo_evict_mm(&rdev->mman.bdev, TTM_PL_VRAM);
 }
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 3b0c07b444a2..58b5adf974ca 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -215,7 +215,10 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
         rbo = container_of(bo, struct radeon_bo, tbo);
         switch (bo->mem.mem_type) {
         case TTM_PL_VRAM:
-                radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
+                if (rbo->rdev->cp.ready == false)
+                        radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU);
+                else
+                        radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
                 break;
         case TTM_PL_TT:
         default:
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r200 b/drivers/gpu/drm/radeon/reg_srcs/r200
index 6021c8849a16..c29ac434ac9c 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r200
+++ b/drivers/gpu/drm/radeon/reg_srcs/r200
@@ -91,6 +91,8 @@ r200 0x3294
 0x22b8 SE_TCL_TEX_CYL_WRAP_CTL
 0x22c0 SE_TCL_UCP_VERT_BLEND_CNTL
 0x22c4 SE_TCL_POINT_SPRITE_CNTL
+0x22d0 SE_PVS_CNTL
+0x22d4 SE_PVS_CONST_CNTL
 0x2648 RE_POINTSIZE
 0x26c0 RE_TOP_LEFT
 0x26c4 RE_MISC
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r420 b/drivers/gpu/drm/radeon/reg_srcs/r420
new file mode 100644
index 000000000000..989f7a020832
--- /dev/null
+++ b/drivers/gpu/drm/radeon/reg_srcs/r420
@@ -0,0 +1,795 @@
+r420 0x4f60
+0x1434 SRC_Y_X
+0x1438 DST_Y_X
+0x143C DST_HEIGHT_WIDTH
+0x146C DP_GUI_MASTER_CNTL
+0x1474 BRUSH_Y_X
+0x1478 DP_BRUSH_BKGD_CLR
+0x147C DP_BRUSH_FRGD_CLR
+0x1480 BRUSH_DATA0
+0x1484 BRUSH_DATA1
+0x1598 DST_WIDTH_HEIGHT
+0x15C0 CLR_CMP_CNTL
+0x15C4 CLR_CMP_CLR_SRC
+0x15C8 CLR_CMP_CLR_DST
+0x15CC CLR_CMP_MSK
+0x15D8 DP_SRC_FRGD_CLR
+0x15DC DP_SRC_BKGD_CLR
+0x1600 DST_LINE_START
+0x1604 DST_LINE_END
+0x1608 DST_LINE_PATCOUNT
+0x16C0 DP_CNTL
+0x16CC DP_WRITE_MSK
+0x16D0 DP_CNTL_XDIR_YDIR_YMAJOR
+0x16E8 DEFAULT_SC_BOTTOM_RIGHT
+0x16EC SC_TOP_LEFT
+0x16F0 SC_BOTTOM_RIGHT
+0x16F4 SRC_SC_BOTTOM_RIGHT
+0x1714 DSTCACHE_CTLSTAT
+0x1720 WAIT_UNTIL
+0x172C RBBM_GUICNTL
+0x1D98 VAP_VPORT_XSCALE
+0x1D9C VAP_VPORT_XOFFSET
+0x1DA0 VAP_VPORT_YSCALE
+0x1DA4 VAP_VPORT_YOFFSET
+0x1DA8 VAP_VPORT_ZSCALE
+0x1DAC VAP_VPORT_ZOFFSET
+0x2080 VAP_CNTL
+0x2090 VAP_OUT_VTX_FMT_0
+0x2094 VAP_OUT_VTX_FMT_1
+0x20B0 VAP_VTE_CNTL
+0x2138 VAP_VF_MIN_VTX_INDX
+0x2140 VAP_CNTL_STATUS
+0x2150 VAP_PROG_STREAM_CNTL_0
+0x2154 VAP_PROG_STREAM_CNTL_1
+0x2158 VAP_PROG_STREAM_CNTL_2
+0x215C VAP_PROG_STREAM_CNTL_3
+0x2160 VAP_PROG_STREAM_CNTL_4
+0x2164 VAP_PROG_STREAM_CNTL_5
+0x2168 VAP_PROG_STREAM_CNTL_6
+0x216C VAP_PROG_STREAM_CNTL_7
+0x2180 VAP_VTX_STATE_CNTL
+0x2184 VAP_VSM_VTX_ASSM
+0x2188 VAP_VTX_STATE_IND_REG_0
+0x218C VAP_VTX_STATE_IND_REG_1
+0x2190 VAP_VTX_STATE_IND_REG_2
+0x2194 VAP_VTX_STATE_IND_REG_3
+0x2198 VAP_VTX_STATE_IND_REG_4
+0x219C VAP_VTX_STATE_IND_REG_5
+0x21A0 VAP_VTX_STATE_IND_REG_6
+0x21A4 VAP_VTX_STATE_IND_REG_7
+0x21A8 VAP_VTX_STATE_IND_REG_8
+0x21AC VAP_VTX_STATE_IND_REG_9
+0x21B0 VAP_VTX_STATE_IND_REG_10
+0x21B4 VAP_VTX_STATE_IND_REG_11
+0x21B8 VAP_VTX_STATE_IND_REG_12
+0x21BC VAP_VTX_STATE_IND_REG_13
+0x21C0 VAP_VTX_STATE_IND_REG_14
+0x21C4 VAP_VTX_STATE_IND_REG_15
+0x21DC VAP_PSC_SGN_NORM_CNTL
+0x21E0 VAP_PROG_STREAM_CNTL_EXT_0
+0x21E4 VAP_PROG_STREAM_CNTL_EXT_1
+0x21E8 VAP_PROG_STREAM_CNTL_EXT_2
+0x21EC VAP_PROG_STREAM_CNTL_EXT_3
+0x21F0 VAP_PROG_STREAM_CNTL_EXT_4
+0x21F4 VAP_PROG_STREAM_CNTL_EXT_5
+0x21F8 VAP_PROG_STREAM_CNTL_EXT_6
+0x21FC VAP_PROG_STREAM_CNTL_EXT_7
+0x2200 VAP_PVS_VECTOR_INDX_REG
+0x2204 VAP_PVS_VECTOR_DATA_REG
+0x2208 VAP_PVS_VECTOR_DATA_REG_128
+0x221C VAP_CLIP_CNTL
+0x2220 VAP_GB_VERT_CLIP_ADJ
+0x2224 VAP_GB_VERT_DISC_ADJ
+0x2228 VAP_GB_HORZ_CLIP_ADJ
+0x222C VAP_GB_HORZ_DISC_ADJ
+0x2230 VAP_PVS_FLOW_CNTL_ADDRS_0
+0x2234 VAP_PVS_FLOW_CNTL_ADDRS_1
+0x2238 VAP_PVS_FLOW_CNTL_ADDRS_2
+0x223C VAP_PVS_FLOW_CNTL_ADDRS_3
+0x2240 VAP_PVS_FLOW_CNTL_ADDRS_4
+0x2244 VAP_PVS_FLOW_CNTL_ADDRS_5
+0x2248 VAP_PVS_FLOW_CNTL_ADDRS_6
+0x224C VAP_PVS_FLOW_CNTL_ADDRS_7
+0x2250 VAP_PVS_FLOW_CNTL_ADDRS_8
+0x2254 VAP_PVS_FLOW_CNTL_ADDRS_9
+0x2258 VAP_PVS_FLOW_CNTL_ADDRS_10
+0x225C VAP_PVS_FLOW_CNTL_ADDRS_11
+0x2260 VAP_PVS_FLOW_CNTL_ADDRS_12
+0x2264 VAP_PVS_FLOW_CNTL_ADDRS_13
+0x2268 VAP_PVS_FLOW_CNTL_ADDRS_14
+0x226C VAP_PVS_FLOW_CNTL_ADDRS_15
+0x2284 VAP_PVS_STATE_FLUSH_REG
+0x2288 VAP_PVS_VTX_TIMEOUT_REG
+0x2290 VAP_PVS_FLOW_CNTL_LOOP_INDEX_0
+0x2294 VAP_PVS_FLOW_CNTL_LOOP_INDEX_1
+0x2298 VAP_PVS_FLOW_CNTL_LOOP_INDEX_2
+0x229C VAP_PVS_FLOW_CNTL_LOOP_INDEX_3
+0x22A0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_4
+0x22A4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_5
+0x22A8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_6
+0x22AC VAP_PVS_FLOW_CNTL_LOOP_INDEX_7
+0x22B0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_8
+0x22B4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_9
+0x22B8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_10
+0x22BC VAP_PVS_FLOW_CNTL_LOOP_INDEX_11
+0x22C0 VAP_PVS_FLOW_CNTL_LOOP_INDEX_12
+0x22C4 VAP_PVS_FLOW_CNTL_LOOP_INDEX_13
+0x22C8 VAP_PVS_FLOW_CNTL_LOOP_INDEX_14
+0x22CC VAP_PVS_FLOW_CNTL_LOOP_INDEX_15
+0x22D0 VAP_PVS_CODE_CNTL_0
+0x22D4 VAP_PVS_CONST_CNTL
+0x22D8 VAP_PVS_CODE_CNTL_1
+0x22DC VAP_PVS_FLOW_CNTL_OPC
+0x342C RB2D_DSTCACHE_CTLSTAT
+0x4000 GB_VAP_RASTER_VTX_FMT_0
+0x4004 GB_VAP_RASTER_VTX_FMT_1
+0x4008 GB_ENABLE
+0x401C GB_SELECT
+0x4020 GB_AA_CONFIG
+0x4024 GB_FIFO_SIZE
+0x4100 TX_INVALTAGS
+0x4200 GA_POINT_S0
+0x4204 GA_POINT_T0
+0x4208 GA_POINT_S1
+0x420C GA_POINT_T1
+0x4214 GA_TRIANGLE_STIPPLE
+0x421C GA_POINT_SIZE
+0x4230 GA_POINT_MINMAX
+0x4234 GA_LINE_CNTL
+0x4238 GA_LINE_STIPPLE_CONFIG
+0x4260 GA_LINE_STIPPLE_VALUE
+0x4264 GA_LINE_S0
+0x4268 GA_LINE_S1
+0x4278 GA_COLOR_CONTROL
+0x427C GA_SOLID_RG
+0x4280 GA_SOLID_BA
+0x4288 GA_POLY_MODE
+0x428C GA_ROUND_MODE
+0x4290 GA_OFFSET
+0x4294 GA_FOG_SCALE
+0x4298 GA_FOG_OFFSET
+0x42A0 SU_TEX_WRAP
+0x42A4 SU_POLY_OFFSET_FRONT_SCALE
+0x42A8 SU_POLY_OFFSET_FRONT_OFFSET
+0x42AC SU_POLY_OFFSET_BACK_SCALE
+0x42B0 SU_POLY_OFFSET_BACK_OFFSET
+0x42B4 SU_POLY_OFFSET_ENABLE
+0x42B8 SU_CULL_MODE
+0x42C0 SU_DEPTH_SCALE
+0x42C4 SU_DEPTH_OFFSET
+0x42C8 SU_REG_DEST
+0x4300 RS_COUNT
+0x4304 RS_INST_COUNT
+0x4310 RS_IP_0
+0x4314 RS_IP_1
+0x4318 RS_IP_2
+0x431C RS_IP_3
+0x4320 RS_IP_4
+0x4324 RS_IP_5
+0x4328 RS_IP_6
+0x432C RS_IP_7
+0x4330 RS_INST_0
+0x4334 RS_INST_1
+0x4338 RS_INST_2
+0x433C RS_INST_3
+0x4340 RS_INST_4
+0x4344 RS_INST_5
+0x4348 RS_INST_6
+0x434C RS_INST_7
+0x4350 RS_INST_8
+0x4354 RS_INST_9
+0x4358 RS_INST_10
+0x435C RS_INST_11
+0x4360 RS_INST_12
+0x4364 RS_INST_13
+0x4368 RS_INST_14
+0x436C RS_INST_15
+0x43A4 SC_HYPERZ_EN
+0x43A8 SC_EDGERULE
+0x43B0 SC_CLIP_0_A
+0x43B4 SC_CLIP_0_B
+0x43B8 SC_CLIP_1_A
+0x43BC SC_CLIP_1_B
+0x43C0 SC_CLIP_2_A
+0x43C4 SC_CLIP_2_B
+0x43C8 SC_CLIP_3_A
+0x43CC SC_CLIP_3_B
+0x43D0 SC_CLIP_RULE
+0x43E0 SC_SCISSOR0
+0x43E8 SC_SCREENDOOR
+0x4440 TX_FILTER1_0
+0x4444 TX_FILTER1_1
+0x4448 TX_FILTER1_2
+0x444C TX_FILTER1_3
+0x4450 TX_FILTER1_4
+0x4454 TX_FILTER1_5
+0x4458 TX_FILTER1_6
+0x445C TX_FILTER1_7
+0x4460 TX_FILTER1_8
+0x4464 TX_FILTER1_9
+0x4468 TX_FILTER1_10
+0x446C TX_FILTER1_11
+0x4470 TX_FILTER1_12
+0x4474 TX_FILTER1_13
+0x4478 TX_FILTER1_14
+0x447C TX_FILTER1_15
+0x4580 TX_CHROMA_KEY_0
+0x4584 TX_CHROMA_KEY_1
+0x4588 TX_CHROMA_KEY_2
+0x458C TX_CHROMA_KEY_3
+0x4590 TX_CHROMA_KEY_4
+0x4594 TX_CHROMA_KEY_5
+0x4598 TX_CHROMA_KEY_6
+0x459C TX_CHROMA_KEY_7
+0x45A0 TX_CHROMA_KEY_8
+0x45A4 TX_CHROMA_KEY_9
+0x45A8 TX_CHROMA_KEY_10
+0x45AC TX_CHROMA_KEY_11
+0x45B0 TX_CHROMA_KEY_12
+0x45B4 TX_CHROMA_KEY_13
+0x45B8 TX_CHROMA_KEY_14
+0x45BC TX_CHROMA_KEY_15
+0x45C0 TX_BORDER_COLOR_0
+0x45C4 TX_BORDER_COLOR_1
+0x45C8 TX_BORDER_COLOR_2
+0x45CC TX_BORDER_COLOR_3
+0x45D0 TX_BORDER_COLOR_4
+0x45D4 TX_BORDER_COLOR_5
+0x45D8 TX_BORDER_COLOR_6
+0x45DC TX_BORDER_COLOR_7
+0x45E0 TX_BORDER_COLOR_8
+0x45E4 TX_BORDER_COLOR_9
+0x45E8 TX_BORDER_COLOR_10
+0x45EC TX_BORDER_COLOR_11
+0x45F0 TX_BORDER_COLOR_12
+0x45F4 TX_BORDER_COLOR_13
+0x45F8 TX_BORDER_COLOR_14
+0x45FC TX_BORDER_COLOR_15
+0x4600 US_CONFIG
+0x4604 US_PIXSIZE
+0x4608 US_CODE_OFFSET
+0x460C US_RESET
+0x4610 US_CODE_ADDR_0
+0x4614 US_CODE_ADDR_1
+0x4618 US_CODE_ADDR_2
+0x461C US_CODE_ADDR_3
+0x4620 US_TEX_INST_0
+0x4624 US_TEX_INST_1
+0x4628 US_TEX_INST_2
+0x462C US_TEX_INST_3
+0x4630 US_TEX_INST_4
+0x4634 US_TEX_INST_5
+0x4638 US_TEX_INST_6
+0x463C US_TEX_INST_7
+0x4640 US_TEX_INST_8
+0x4644 US_TEX_INST_9
+0x4648 US_TEX_INST_10
+0x464C US_TEX_INST_11
+0x4650 US_TEX_INST_12
+0x4654 US_TEX_INST_13
+0x4658 US_TEX_INST_14
+0x465C US_TEX_INST_15
+0x4660 US_TEX_INST_16
+0x4664 US_TEX_INST_17
+0x4668 US_TEX_INST_18
+0x466C US_TEX_INST_19
+0x4670 US_TEX_INST_20
+0x4674 US_TEX_INST_21
+0x4678 US_TEX_INST_22
+0x467C US_TEX_INST_23
+0x4680 US_TEX_INST_24
+0x4684 US_TEX_INST_25
+0x4688 US_TEX_INST_26
+0x468C US_TEX_INST_27
+0x4690 US_TEX_INST_28
+0x4694 US_TEX_INST_29
+0x4698 US_TEX_INST_30
+0x469C US_TEX_INST_31
+0x46A4 US_OUT_FMT_0
+0x46A8 US_OUT_FMT_1
+0x46AC US_OUT_FMT_2
+0x46B0 US_OUT_FMT_3
+0x46B4 US_W_FMT
+0x46B8 US_CODE_BANK
+0x46BC US_CODE_EXT
+0x46C0 US_ALU_RGB_ADDR_0
+0x46C4 US_ALU_RGB_ADDR_1
+0x46C8 US_ALU_RGB_ADDR_2
+0x46CC US_ALU_RGB_ADDR_3
+0x46D0 US_ALU_RGB_ADDR_4
+0x46D4 US_ALU_RGB_ADDR_5
+0x46D8 US_ALU_RGB_ADDR_6
+0x46DC US_ALU_RGB_ADDR_7
+0x46E0 US_ALU_RGB_ADDR_8
+0x46E4 US_ALU_RGB_ADDR_9
+0x46E8 US_ALU_RGB_ADDR_10
+0x46EC US_ALU_RGB_ADDR_11
+0x46F0 US_ALU_RGB_ADDR_12
+0x46F4 US_ALU_RGB_ADDR_13
+0x46F8 US_ALU_RGB_ADDR_14
+0x46FC US_ALU_RGB_ADDR_15
+0x4700 US_ALU_RGB_ADDR_16
+0x4704 US_ALU_RGB_ADDR_17
+0x4708 US_ALU_RGB_ADDR_18
+0x470C US_ALU_RGB_ADDR_19
+0x4710 US_ALU_RGB_ADDR_20
+0x4714 US_ALU_RGB_ADDR_21
+0x4718 US_ALU_RGB_ADDR_22
+0x471C US_ALU_RGB_ADDR_23
+0x4720 US_ALU_RGB_ADDR_24
+0x4724 US_ALU_RGB_ADDR_25
+0x4728 US_ALU_RGB_ADDR_26
+0x472C US_ALU_RGB_ADDR_27
+0x4730 US_ALU_RGB_ADDR_28
+0x4734 US_ALU_RGB_ADDR_29
+0x4738 US_ALU_RGB_ADDR_30
+0x473C US_ALU_RGB_ADDR_31
+0x4740 US_ALU_RGB_ADDR_32
+0x4744 US_ALU_RGB_ADDR_33
+0x4748 US_ALU_RGB_ADDR_34
+0x474C US_ALU_RGB_ADDR_35
+0x4750 US_ALU_RGB_ADDR_36
+0x4754 US_ALU_RGB_ADDR_37
+0x4758 US_ALU_RGB_ADDR_38
+0x475C US_ALU_RGB_ADDR_39
+0x4760 US_ALU_RGB_ADDR_40
+0x4764 US_ALU_RGB_ADDR_41
+0x4768 US_ALU_RGB_ADDR_42
+0x476C US_ALU_RGB_ADDR_43
+0x4770 US_ALU_RGB_ADDR_44
+0x4774 US_ALU_RGB_ADDR_45
+0x4778 US_ALU_RGB_ADDR_46
+0x477C US_ALU_RGB_ADDR_47
+0x4780 US_ALU_RGB_ADDR_48
+0x4784 US_ALU_RGB_ADDR_49
+0x4788 US_ALU_RGB_ADDR_50
+0x478C US_ALU_RGB_ADDR_51
+0x4790 US_ALU_RGB_ADDR_52
+0x4794 US_ALU_RGB_ADDR_53
+0x4798 US_ALU_RGB_ADDR_54
+0x479C US_ALU_RGB_ADDR_55
+0x47A0 US_ALU_RGB_ADDR_56
+0x47A4 US_ALU_RGB_ADDR_57
+0x47A8 US_ALU_RGB_ADDR_58
+0x47AC US_ALU_RGB_ADDR_59
+0x47B0 US_ALU_RGB_ADDR_60
+0x47B4 US_ALU_RGB_ADDR_61
+0x47B8 US_ALU_RGB_ADDR_62
+0x47BC US_ALU_RGB_ADDR_63
+0x47C0 US_ALU_ALPHA_ADDR_0
+0x47C4 US_ALU_ALPHA_ADDR_1
+0x47C8 US_ALU_ALPHA_ADDR_2
+0x47CC US_ALU_ALPHA_ADDR_3
+0x47D0 US_ALU_ALPHA_ADDR_4
+0x47D4 US_ALU_ALPHA_ADDR_5
+0x47D8 US_ALU_ALPHA_ADDR_6
+0x47DC US_ALU_ALPHA_ADDR_7
+0x47E0 US_ALU_ALPHA_ADDR_8
+0x47E4 US_ALU_ALPHA_ADDR_9
+0x47E8 US_ALU_ALPHA_ADDR_10
+0x47EC US_ALU_ALPHA_ADDR_11
+0x47F0 US_ALU_ALPHA_ADDR_12
+0x47F4 US_ALU_ALPHA_ADDR_13
+0x47F8 US_ALU_ALPHA_ADDR_14
+0x47FC US_ALU_ALPHA_ADDR_15
+0x4800 US_ALU_ALPHA_ADDR_16
+0x4804 US_ALU_ALPHA_ADDR_17
+0x4808 US_ALU_ALPHA_ADDR_18
+0x480C US_ALU_ALPHA_ADDR_19
+0x4810 US_ALU_ALPHA_ADDR_20
+0x4814 US_ALU_ALPHA_ADDR_21
+0x4818 US_ALU_ALPHA_ADDR_22
+0x481C US_ALU_ALPHA_ADDR_23
+0x4820 US_ALU_ALPHA_ADDR_24
+0x4824 US_ALU_ALPHA_ADDR_25
+0x4828 US_ALU_ALPHA_ADDR_26
+0x482C US_ALU_ALPHA_ADDR_27
+0x4830 US_ALU_ALPHA_ADDR_28
+0x4834 US_ALU_ALPHA_ADDR_29
+0x4838 US_ALU_ALPHA_ADDR_30
+0x483C US_ALU_ALPHA_ADDR_31
+0x4840 US_ALU_ALPHA_ADDR_32
+0x4844 US_ALU_ALPHA_ADDR_33
+0x4848 US_ALU_ALPHA_ADDR_34
+0x484C US_ALU_ALPHA_ADDR_35
+0x4850 US_ALU_ALPHA_ADDR_36
+0x4854 US_ALU_ALPHA_ADDR_37
+0x4858 US_ALU_ALPHA_ADDR_38
+0x485C US_ALU_ALPHA_ADDR_39
+0x4860 US_ALU_ALPHA_ADDR_40
+0x4864 US_ALU_ALPHA_ADDR_41
+0x4868 US_ALU_ALPHA_ADDR_42
+0x486C US_ALU_ALPHA_ADDR_43
+0x4870 US_ALU_ALPHA_ADDR_44
+0x4874 US_ALU_ALPHA_ADDR_45
+0x4878 US_ALU_ALPHA_ADDR_46
+0x487C US_ALU_ALPHA_ADDR_47
+0x4880 US_ALU_ALPHA_ADDR_48
+0x4884 US_ALU_ALPHA_ADDR_49
+0x4888 US_ALU_ALPHA_ADDR_50
+0x488C US_ALU_ALPHA_ADDR_51
+0x4890 US_ALU_ALPHA_ADDR_52
+0x4894 US_ALU_ALPHA_ADDR_53
+0x4898 US_ALU_ALPHA_ADDR_54
+0x489C US_ALU_ALPHA_ADDR_55
+0x48A0 US_ALU_ALPHA_ADDR_56
+0x48A4 US_ALU_ALPHA_ADDR_57
+0x48A8 US_ALU_ALPHA_ADDR_58
+0x48AC US_ALU_ALPHA_ADDR_59
+0x48B0 US_ALU_ALPHA_ADDR_60
+0x48B4 US_ALU_ALPHA_ADDR_61
+0x48B8 US_ALU_ALPHA_ADDR_62
+0x48BC US_ALU_ALPHA_ADDR_63
+0x48C0 US_ALU_RGB_INST_0
+0x48C4 US_ALU_RGB_INST_1
+0x48C8 US_ALU_RGB_INST_2
+0x48CC US_ALU_RGB_INST_3
+0x48D0 US_ALU_RGB_INST_4
+0x48D4 US_ALU_RGB_INST_5
+0x48D8 US_ALU_RGB_INST_6
+0x48DC US_ALU_RGB_INST_7
+0x48E0 US_ALU_RGB_INST_8
+0x48E4 US_ALU_RGB_INST_9
+0x48E8 US_ALU_RGB_INST_10
+0x48EC US_ALU_RGB_INST_11
+0x48F0 US_ALU_RGB_INST_12
+0x48F4 US_ALU_RGB_INST_13
+0x48F8 US_ALU_RGB_INST_14
+0x48FC US_ALU_RGB_INST_15
+0x4900 US_ALU_RGB_INST_16
+0x4904 US_ALU_RGB_INST_17
+0x4908 US_ALU_RGB_INST_18
+0x490C US_ALU_RGB_INST_19
+0x4910 US_ALU_RGB_INST_20
+0x4914 US_ALU_RGB_INST_21
+0x4918 US_ALU_RGB_INST_22
+0x491C US_ALU_RGB_INST_23
+0x4920 US_ALU_RGB_INST_24
+0x4924 US_ALU_RGB_INST_25
+0x4928 US_ALU_RGB_INST_26
+0x492C US_ALU_RGB_INST_27
+0x4930 US_ALU_RGB_INST_28
+0x4934 US_ALU_RGB_INST_29
+0x4938 US_ALU_RGB_INST_30
+0x493C US_ALU_RGB_INST_31
+0x4940 US_ALU_RGB_INST_32
+0x4944 US_ALU_RGB_INST_33
+0x4948 US_ALU_RGB_INST_34
+0x494C US_ALU_RGB_INST_35
+0x4950 US_ALU_RGB_INST_36
+0x4954 US_ALU_RGB_INST_37
+0x4958 US_ALU_RGB_INST_38
+0x495C US_ALU_RGB_INST_39
+0x4960 US_ALU_RGB_INST_40
+0x4964 US_ALU_RGB_INST_41
+0x4968 US_ALU_RGB_INST_42
+0x496C US_ALU_RGB_INST_43
+0x4970 US_ALU_RGB_INST_44
+0x4974 US_ALU_RGB_INST_45
+0x4978 US_ALU_RGB_INST_46
+0x497C US_ALU_RGB_INST_47
+0x4980 US_ALU_RGB_INST_48
+0x4984 US_ALU_RGB_INST_49
+0x4988 US_ALU_RGB_INST_50
+0x498C US_ALU_RGB_INST_51
+0x4990 US_ALU_RGB_INST_52
+0x4994 US_ALU_RGB_INST_53
+0x4998 US_ALU_RGB_INST_54
+0x499C US_ALU_RGB_INST_55
+0x49A0 US_ALU_RGB_INST_56
+0x49A4 US_ALU_RGB_INST_57
+0x49A8 US_ALU_RGB_INST_58
+0x49AC US_ALU_RGB_INST_59
+0x49B0 US_ALU_RGB_INST_60
+0x49B4 US_ALU_RGB_INST_61
+0x49B8 US_ALU_RGB_INST_62
+0x49BC US_ALU_RGB_INST_63
+0x49C0 US_ALU_ALPHA_INST_0
+0x49C4 US_ALU_ALPHA_INST_1
+0x49C8 US_ALU_ALPHA_INST_2
+0x49CC US_ALU_ALPHA_INST_3
+0x49D0 US_ALU_ALPHA_INST_4
+0x49D4 US_ALU_ALPHA_INST_5
+0x49D8 US_ALU_ALPHA_INST_6
+0x49DC US_ALU_ALPHA_INST_7
+0x49E0 US_ALU_ALPHA_INST_8
+0x49E4 US_ALU_ALPHA_INST_9
+0x49E8 US_ALU_ALPHA_INST_10
+0x49EC US_ALU_ALPHA_INST_11
+0x49F0 US_ALU_ALPHA_INST_12
+0x49F4 US_ALU_ALPHA_INST_13
+0x49F8 US_ALU_ALPHA_INST_14
+0x49FC US_ALU_ALPHA_INST_15
+0x4A00 US_ALU_ALPHA_INST_16
+0x4A04 US_ALU_ALPHA_INST_17
+0x4A08 US_ALU_ALPHA_INST_18
+0x4A0C US_ALU_ALPHA_INST_19
+0x4A10 US_ALU_ALPHA_INST_20
+0x4A14 US_ALU_ALPHA_INST_21
+0x4A18 US_ALU_ALPHA_INST_22
+0x4A1C US_ALU_ALPHA_INST_23
+0x4A20 US_ALU_ALPHA_INST_24
+0x4A24 US_ALU_ALPHA_INST_25
+0x4A28 US_ALU_ALPHA_INST_26
+0x4A2C US_ALU_ALPHA_INST_27
+0x4A30 US_ALU_ALPHA_INST_28
+0x4A34 US_ALU_ALPHA_INST_29
+0x4A38 US_ALU_ALPHA_INST_30
+0x4A3C US_ALU_ALPHA_INST_31
+0x4A40 US_ALU_ALPHA_INST_32
+0x4A44 US_ALU_ALPHA_INST_33
+0x4A48 US_ALU_ALPHA_INST_34
+0x4A4C US_ALU_ALPHA_INST_35
+0x4A50 US_ALU_ALPHA_INST_36
+0x4A54 US_ALU_ALPHA_INST_37
+0x4A58 US_ALU_ALPHA_INST_38
+0x4A5C US_ALU_ALPHA_INST_39
+0x4A60 US_ALU_ALPHA_INST_40
+0x4A64 US_ALU_ALPHA_INST_41
+0x4A68 US_ALU_ALPHA_INST_42
+0x4A6C US_ALU_ALPHA_INST_43
+0x4A70 US_ALU_ALPHA_INST_44
+0x4A74 US_ALU_ALPHA_INST_45
+0x4A78 US_ALU_ALPHA_INST_46
+0x4A7C US_ALU_ALPHA_INST_47
+0x4A80 US_ALU_ALPHA_INST_48
+0x4A84 US_ALU_ALPHA_INST_49
+0x4A88 US_ALU_ALPHA_INST_50
+0x4A8C US_ALU_ALPHA_INST_51
+0x4A90 US_ALU_ALPHA_INST_52
+0x4A94 US_ALU_ALPHA_INST_53
+0x4A98 US_ALU_ALPHA_INST_54
+0x4A9C US_ALU_ALPHA_INST_55
+0x4AA0 US_ALU_ALPHA_INST_56
+0x4AA4 US_ALU_ALPHA_INST_57
+0x4AA8 US_ALU_ALPHA_INST_58
+0x4AAC US_ALU_ALPHA_INST_59
+0x4AB0 US_ALU_ALPHA_INST_60
+0x4AB4 US_ALU_ALPHA_INST_61
+0x4AB8 US_ALU_ALPHA_INST_62
+0x4ABC US_ALU_ALPHA_INST_63
+0x4AC0 US_ALU_EXT_ADDR_0
+0x4AC4 US_ALU_EXT_ADDR_1
+0x4AC8 US_ALU_EXT_ADDR_2
+0x4ACC US_ALU_EXT_ADDR_3
+0x4AD0 US_ALU_EXT_ADDR_4
+0x4AD4 US_ALU_EXT_ADDR_5
+0x4AD8 US_ALU_EXT_ADDR_6
+0x4ADC US_ALU_EXT_ADDR_7
+0x4AE0 US_ALU_EXT_ADDR_8
+0x4AE4 US_ALU_EXT_ADDR_9
+0x4AE8 US_ALU_EXT_ADDR_10
+0x4AEC US_ALU_EXT_ADDR_11
+0x4AF0 US_ALU_EXT_ADDR_12
+0x4AF4 US_ALU_EXT_ADDR_13
+0x4AF8 US_ALU_EXT_ADDR_14
+0x4AFC US_ALU_EXT_ADDR_15
+0x4B00 US_ALU_EXT_ADDR_16
+0x4B04 US_ALU_EXT_ADDR_17
+0x4B08 US_ALU_EXT_ADDR_18
+0x4B0C US_ALU_EXT_ADDR_19
+0x4B10 US_ALU_EXT_ADDR_20
+0x4B14 US_ALU_EXT_ADDR_21
+0x4B18 US_ALU_EXT_ADDR_22
+0x4B1C US_ALU_EXT_ADDR_23
+0x4B20 US_ALU_EXT_ADDR_24
+0x4B24 US_ALU_EXT_ADDR_25
+0x4B28 US_ALU_EXT_ADDR_26
+0x4B2C US_ALU_EXT_ADDR_27
+0x4B30 US_ALU_EXT_ADDR_28
+0x4B34 US_ALU_EXT_ADDR_29
+0x4B38 US_ALU_EXT_ADDR_30
+0x4B3C US_ALU_EXT_ADDR_31
+0x4B40 US_ALU_EXT_ADDR_32
+0x4B44 US_ALU_EXT_ADDR_33
+0x4B48 US_ALU_EXT_ADDR_34
+0x4B4C US_ALU_EXT_ADDR_35
+0x4B50 US_ALU_EXT_ADDR_36
+0x4B54 US_ALU_EXT_ADDR_37
+0x4B58 US_ALU_EXT_ADDR_38
+0x4B5C US_ALU_EXT_ADDR_39
+0x4B60 US_ALU_EXT_ADDR_40
+0x4B64 US_ALU_EXT_ADDR_41
+0x4B68 US_ALU_EXT_ADDR_42
+0x4B6C US_ALU_EXT_ADDR_43
+0x4B70 US_ALU_EXT_ADDR_44
+0x4B74 US_ALU_EXT_ADDR_45
+0x4B78 US_ALU_EXT_ADDR_46
+0x4B7C US_ALU_EXT_ADDR_47
+0x4B80 US_ALU_EXT_ADDR_48
+0x4B84 US_ALU_EXT_ADDR_49
+0x4B88 US_ALU_EXT_ADDR_50
+0x4B8C US_ALU_EXT_ADDR_51
+0x4B90 US_ALU_EXT_ADDR_52
+0x4B94 US_ALU_EXT_ADDR_53
+0x4B98 US_ALU_EXT_ADDR_54
+0x4B9C US_ALU_EXT_ADDR_55
+0x4BA0 US_ALU_EXT_ADDR_56
+0x4BA4 US_ALU_EXT_ADDR_57
+0x4BA8 US_ALU_EXT_ADDR_58
+0x4BAC US_ALU_EXT_ADDR_59
+0x4BB0 US_ALU_EXT_ADDR_60
+0x4BB4 US_ALU_EXT_ADDR_61
+0x4BB8 US_ALU_EXT_ADDR_62
+0x4BBC US_ALU_EXT_ADDR_63
+0x4BC0 FG_FOG_BLEND
+0x4BC4 FG_FOG_FACTOR
+0x4BC8 FG_FOG_COLOR_R
+0x4BCC FG_FOG_COLOR_G
+0x4BD0 FG_FOG_COLOR_B
+0x4BD4 FG_ALPHA_FUNC
+0x4BD8 FG_DEPTH_SRC
+0x4C00 US_ALU_CONST_R_0
+0x4C04 US_ALU_CONST_G_0
+0x4C08 US_ALU_CONST_B_0
+0x4C0C US_ALU_CONST_A_0
+0x4C10 US_ALU_CONST_R_1
+0x4C14 US_ALU_CONST_G_1
+0x4C18 US_ALU_CONST_B_1
+0x4C1C US_ALU_CONST_A_1
+0x4C20 US_ALU_CONST_R_2
+0x4C24 US_ALU_CONST_G_2
+0x4C28 US_ALU_CONST_B_2
+0x4C2C US_ALU_CONST_A_2
+0x4C30 US_ALU_CONST_R_3
+0x4C34 US_ALU_CONST_G_3
+0x4C38 US_ALU_CONST_B_3
+0x4C3C US_ALU_CONST_A_3
+0x4C40 US_ALU_CONST_R_4
+0x4C44 US_ALU_CONST_G_4
+0x4C48 US_ALU_CONST_B_4
+0x4C4C US_ALU_CONST_A_4
+0x4C50 US_ALU_CONST_R_5
+0x4C54 US_ALU_CONST_G_5
+0x4C58 US_ALU_CONST_B_5
+0x4C5C US_ALU_CONST_A_5
+0x4C60 US_ALU_CONST_R_6
+0x4C64 US_ALU_CONST_G_6
+0x4C68 US_ALU_CONST_B_6
+0x4C6C US_ALU_CONST_A_6
+0x4C70 US_ALU_CONST_R_7
+0x4C74 US_ALU_CONST_G_7
+0x4C78 US_ALU_CONST_B_7
+0x4C7C US_ALU_CONST_A_7
+0x4C80 US_ALU_CONST_R_8
+0x4C84 US_ALU_CONST_G_8
+0x4C88 US_ALU_CONST_B_8
+0x4C8C US_ALU_CONST_A_8
+0x4C90 US_ALU_CONST_R_9
+0x4C94 US_ALU_CONST_G_9
+0x4C98 US_ALU_CONST_B_9
+0x4C9C US_ALU_CONST_A_9
+0x4CA0 US_ALU_CONST_R_10
+0x4CA4 US_ALU_CONST_G_10
+0x4CA8 US_ALU_CONST_B_10
+0x4CAC US_ALU_CONST_A_10
+0x4CB0 US_ALU_CONST_R_11
+0x4CB4 US_ALU_CONST_G_11
+0x4CB8 US_ALU_CONST_B_11
+0x4CBC US_ALU_CONST_A_11
+0x4CC0 US_ALU_CONST_R_12
+0x4CC4 US_ALU_CONST_G_12
+0x4CC8 US_ALU_CONST_B_12
+0x4CCC US_ALU_CONST_A_12
+0x4CD0 US_ALU_CONST_R_13
+0x4CD4 US_ALU_CONST_G_13
+0x4CD8 US_ALU_CONST_B_13
+0x4CDC US_ALU_CONST_A_13
+0x4CE0 US_ALU_CONST_R_14
+0x4CE4 US_ALU_CONST_G_14
+0x4CE8 US_ALU_CONST_B_14
+0x4CEC US_ALU_CONST_A_14
+0x4CF0 US_ALU_CONST_R_15
+0x4CF4 US_ALU_CONST_G_15
+0x4CF8 US_ALU_CONST_B_15
+0x4CFC US_ALU_CONST_A_15
+0x4D00 US_ALU_CONST_R_16
+0x4D04 US_ALU_CONST_G_16
+0x4D08 US_ALU_CONST_B_16
+0x4D0C US_ALU_CONST_A_16
+0x4D10 US_ALU_CONST_R_17
+0x4D14 US_ALU_CONST_G_17
+0x4D18 US_ALU_CONST_B_17
+0x4D1C US_ALU_CONST_A_17
+0x4D20 US_ALU_CONST_R_18
+0x4D24 US_ALU_CONST_G_18
+0x4D28 US_ALU_CONST_B_18
+0x4D2C US_ALU_CONST_A_18
+0x4D30 US_ALU_CONST_R_19
+0x4D34 US_ALU_CONST_G_19
+0x4D38 US_ALU_CONST_B_19
+0x4D3C US_ALU_CONST_A_19
+0x4D40 US_ALU_CONST_R_20
+0x4D44 US_ALU_CONST_G_20
+0x4D48 US_ALU_CONST_B_20
+0x4D4C US_ALU_CONST_A_20
+0x4D50 US_ALU_CONST_R_21
+0x4D54 US_ALU_CONST_G_21
+0x4D58 US_ALU_CONST_B_21
+0x4D5C US_ALU_CONST_A_21
+0x4D60 US_ALU_CONST_R_22
+0x4D64 US_ALU_CONST_G_22
+0x4D68 US_ALU_CONST_B_22
+0x4D6C US_ALU_CONST_A_22
+0x4D70 US_ALU_CONST_R_23
+0x4D74 US_ALU_CONST_G_23
+0x4D78 US_ALU_CONST_B_23
+0x4D7C US_ALU_CONST_A_23
+0x4D80 US_ALU_CONST_R_24
+0x4D84 US_ALU_CONST_G_24
+0x4D88 US_ALU_CONST_B_24
+0x4D8C US_ALU_CONST_A_24
+0x4D90 US_ALU_CONST_R_25
+0x4D94 US_ALU_CONST_G_25
+0x4D98 US_ALU_CONST_B_25
+0x4D9C US_ALU_CONST_A_25
+0x4DA0 US_ALU_CONST_R_26
+0x4DA4 US_ALU_CONST_G_26
+0x4DA8 US_ALU_CONST_B_26
+0x4DAC US_ALU_CONST_A_26
+0x4DB0 US_ALU_CONST_R_27
+0x4DB4 US_ALU_CONST_G_27
+0x4DB8 US_ALU_CONST_B_27
+0x4DBC US_ALU_CONST_A_27
+0x4DC0 US_ALU_CONST_R_28
+0x4DC4 US_ALU_CONST_G_28
+0x4DC8 US_ALU_CONST_B_28
+0x4DCC US_ALU_CONST_A_28
+0x4DD0 US_ALU_CONST_R_29
+0x4DD4 US_ALU_CONST_G_29
+0x4DD8 US_ALU_CONST_B_29
+0x4DDC US_ALU_CONST_A_29
+0x4DE0 US_ALU_CONST_R_30
+0x4DE4 US_ALU_CONST_G_30
+0x4DE8 US_ALU_CONST_B_30
+0x4DEC US_ALU_CONST_A_30
+0x4DF0 US_ALU_CONST_R_31
+0x4DF4 US_ALU_CONST_G_31
+0x4DF8 US_ALU_CONST_B_31
+0x4DFC US_ALU_CONST_A_31
+0x4E04 RB3D_BLENDCNTL_R3
+0x4E08 RB3D_ABLENDCNTL_R3
+0x4E0C RB3D_COLOR_CHANNEL_MASK
+0x4E10 RB3D_CONSTANT_COLOR
+0x4E14 RB3D_COLOR_CLEAR_VALUE
+0x4E18 RB3D_ROPCNTL_R3
+0x4E1C RB3D_CLRCMP_FLIPE_R3
+0x4E20 RB3D_CLRCMP_CLR_R3
+0x4E24 RB3D_CLRCMP_MSK_R3
+0x4E48 RB3D_DEBUG_CTL
+0x4E4C RB3D_DSTCACHE_CTLSTAT_R3
+0x4E50 RB3D_DITHER_CTL
+0x4E54 RB3D_CMASK_OFFSET0
+0x4E58 RB3D_CMASK_OFFSET1
+0x4E5C RB3D_CMASK_OFFSET2
+0x4E60 RB3D_CMASK_OFFSET3
+0x4E64 RB3D_CMASK_PITCH0
+0x4E68 RB3D_CMASK_PITCH1
+0x4E6C RB3D_CMASK_PITCH2
+0x4E70 RB3D_CMASK_PITCH3
+0x4E74 RB3D_CMASK_WRINDEX
+0x4E78 RB3D_CMASK_DWORD
+0x4E7C RB3D_CMASK_RDINDEX
+0x4E80 RB3D_AARESOLVE_OFFSET
+0x4E84 RB3D_AARESOLVE_PITCH
+0x4E88 RB3D_AARESOLVE_CTL
+0x4EA0 RB3D_DISCARD_SRC_PIXEL_LTE_THRESHOLD
+0x4EA4 RB3D_DISCARD_SRC_PIXEL_GTE_THRESHOLD
+0x4F04 ZB_ZSTENCILCNTL
+0x4F08 ZB_STENCILREFMASK
+0x4F14 ZB_ZTOP
+0x4F18 ZB_ZCACHE_CTLSTAT
+0x4F1C ZB_BW_CNTL
+0x4F28 ZB_DEPTHCLEARVALUE
+0x4F30 ZB_ZMASK_OFFSET
+0x4F34 ZB_ZMASK_PITCH
+0x4F38 ZB_ZMASK_WRINDEX
+0x4F3C ZB_ZMASK_DWORD
+0x4F40 ZB_ZMASK_RDINDEX
+0x4F44 ZB_HIZ_OFFSET
+0x4F48 ZB_HIZ_WRINDEX
+0x4F4C ZB_HIZ_DWORD
+0x4F50 ZB_HIZ_RDINDEX
+0x4F54 ZB_HIZ_PITCH
+0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rs600 b/drivers/gpu/drm/radeon/reg_srcs/rs600
index 8e3c0b807add..6801b865d1c4 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/rs600
+++ b/drivers/gpu/drm/radeon/reg_srcs/rs600
@@ -153,7 +153,7 @@ rs600 0x6d40
 0x42A4 SU_POLY_OFFSET_FRONT_SCALE
 0x42A8 SU_POLY_OFFSET_FRONT_OFFSET
 0x42AC SU_POLY_OFFSET_BACK_SCALE
-0x42B0 SU_POLY_OFFSET_BACK_OFFSET 
+0x42B0 SU_POLY_OFFSET_BACK_OFFSET
 0x42B4 SU_POLY_OFFSET_ENABLE
 0x42B8 SU_CULL_MODE
 0x42C0 SU_DEPTH_SCALE
@@ -291,6 +291,8 @@ rs600 0x6d40
 0x46AC US_OUT_FMT_2
 0x46B0 US_OUT_FMT_3
 0x46B4 US_W_FMT
+0x46B8 US_CODE_BANK
+0x46BC US_CODE_EXT
 0x46C0 US_ALU_RGB_ADDR_0
 0x46C4 US_ALU_RGB_ADDR_1
 0x46C8 US_ALU_RGB_ADDR_2
@@ -547,6 +549,70 @@ rs600 0x6d40
 0x4AB4 US_ALU_ALPHA_INST_61
 0x4AB8 US_ALU_ALPHA_INST_62
 0x4ABC US_ALU_ALPHA_INST_63
+0x4AC0 US_ALU_EXT_ADDR_0
+0x4AC4 US_ALU_EXT_ADDR_1
+0x4AC8 US_ALU_EXT_ADDR_2
+0x4ACC US_ALU_EXT_ADDR_3
+0x4AD0 US_ALU_EXT_ADDR_4
+0x4AD4 US_ALU_EXT_ADDR_5
+0x4AD8 US_ALU_EXT_ADDR_6
+0x4ADC US_ALU_EXT_ADDR_7
+0x4AE0 US_ALU_EXT_ADDR_8
+0x4AE4 US_ALU_EXT_ADDR_9
+0x4AE8 US_ALU_EXT_ADDR_10
+0x4AEC US_ALU_EXT_ADDR_11
+0x4AF0 US_ALU_EXT_ADDR_12
+0x4AF4 US_ALU_EXT_ADDR_13
+0x4AF8 US_ALU_EXT_ADDR_14
+0x4AFC US_ALU_EXT_ADDR_15
+0x4B00 US_ALU_EXT_ADDR_16
+0x4B04 US_ALU_EXT_ADDR_17
+0x4B08 US_ALU_EXT_ADDR_18
+0x4B0C US_ALU_EXT_ADDR_19
+0x4B10 US_ALU_EXT_ADDR_20
+0x4B14 US_ALU_EXT_ADDR_21
+0x4B18 US_ALU_EXT_ADDR_22
+0x4B1C US_ALU_EXT_ADDR_23
+0x4B20 US_ALU_EXT_ADDR_24
+0x4B24 US_ALU_EXT_ADDR_25
+0x4B28 US_ALU_EXT_ADDR_26
+0x4B2C US_ALU_EXT_ADDR_27
+0x4B30 US_ALU_EXT_ADDR_28
+0x4B34 US_ALU_EXT_ADDR_29
+0x4B38 US_ALU_EXT_ADDR_30
+0x4B3C US_ALU_EXT_ADDR_31
+0x4B40 US_ALU_EXT_ADDR_32
+0x4B44 US_ALU_EXT_ADDR_33
+0x4B48 US_ALU_EXT_ADDR_34
+0x4B4C US_ALU_EXT_ADDR_35
+0x4B50 US_ALU_EXT_ADDR_36
+0x4B54 US_ALU_EXT_ADDR_37
+0x4B58 US_ALU_EXT_ADDR_38
+0x4B5C US_ALU_EXT_ADDR_39
+0x4B60 US_ALU_EXT_ADDR_40
+0x4B64 US_ALU_EXT_ADDR_41
+0x4B68 US_ALU_EXT_ADDR_42
+0x4B6C US_ALU_EXT_ADDR_43
+0x4B70 US_ALU_EXT_ADDR_44
+0x4B74 US_ALU_EXT_ADDR_45
+0x4B78 US_ALU_EXT_ADDR_46
+0x4B7C US_ALU_EXT_ADDR_47
+0x4B80 US_ALU_EXT_ADDR_48
+0x4B84 US_ALU_EXT_ADDR_49
+0x4B88 US_ALU_EXT_ADDR_50
+0x4B8C US_ALU_EXT_ADDR_51
+0x4B90 US_ALU_EXT_ADDR_52
+0x4B94 US_ALU_EXT_ADDR_53
+0x4B98 US_ALU_EXT_ADDR_54
+0x4B9C US_ALU_EXT_ADDR_55
+0x4BA0 US_ALU_EXT_ADDR_56
+0x4BA4 US_ALU_EXT_ADDR_57
+0x4BA8 US_ALU_EXT_ADDR_58
+0x4BAC US_ALU_EXT_ADDR_59
+0x4BB0 US_ALU_EXT_ADDR_60
+0x4BB4 US_ALU_EXT_ADDR_61
+0x4BB8 US_ALU_EXT_ADDR_62
+0x4BBC US_ALU_EXT_ADDR_63
 0x4BC0 FG_FOG_BLEND
 0x4BC4 FG_FOG_FACTOR
 0x4BC8 FG_FOG_COLOR_R
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515
index 0102a0d5735c..38abf63bf2cd 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/rv515
+++ b/drivers/gpu/drm/radeon/reg_srcs/rv515
@@ -161,7 +161,12 @@ rv515 0x6d40
 0x401C GB_SELECT
 0x4020 GB_AA_CONFIG
 0x4024 GB_FIFO_SIZE
+0x4028 GB_Z_PEQ_CONFIG
 0x4100 TX_INVALTAGS
+0x4114 SU_TEX_WRAP_PS3
+0x4118 PS3_ENABLE
+0x411c PS3_VTX_FMT
+0x4120 PS3_TEX_SOURCE
 0x4200 GA_POINT_S0
 0x4204 GA_POINT_T0
 0x4208 GA_POINT_S1
@@ -171,6 +176,7 @@ rv515 0x6d40
 0x4230 GA_POINT_MINMAX
 0x4234 GA_LINE_CNTL
 0x4238 GA_LINE_STIPPLE_CONFIG
+0x4258 GA_COLOR_CONTROL_PS3
 0x4260 GA_LINE_STIPPLE_VALUE
 0x4264 GA_LINE_S0
 0x4268 GA_LINE_S1
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 368415df5f3a..9f5418983e2a 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -356,6 +356,7 @@ static int rs400_mc_init(struct radeon_device *rdev)
         rdev->mc.vram_location = G_00015C_MC_FB_START(tmp) << 16;
         rdev->mc.gtt_location = 0xFFFFFFFFUL;
         r = radeon_mc_setup(rdev);
+        rdev->mc.igp_sideport_enabled = radeon_combios_sideport_present(rdev);
         if (r)
                 return r;
         return 0;
@@ -395,6 +396,7 @@ static int rs400_startup(struct radeon_device *rdev)
                 return r;
         /* Enable IRQ */
         r100_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 4f8ea4260572..d5255751e7b3 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -56,6 +56,7 @@ int rs600_mc_init(struct radeon_device *rdev)
         rdev->mc.vram_location = G_000004_MC_FB_START(tmp) << 16;
         rdev->mc.gtt_location = 0xffffffffUL;
         r = radeon_mc_setup(rdev);
+        rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
         if (r)
                 return r;
         return 0;
@@ -134,7 +135,8 @@ void rs600_hpd_init(struct radeon_device *rdev)
                         break;
                 }
         }
-        rs600_irq_set(rdev);
+        if (rdev->irq.installed)
+                rs600_irq_set(rdev);
 }
 
 void rs600_hpd_fini(struct radeon_device *rdev)
@@ -315,6 +317,11 @@ int rs600_irq_set(struct radeon_device *rdev)
         u32 hpd2 = RREG32(R_007D18_DC_HOT_PLUG_DETECT2_INT_CONTROL) &
                 ~S_007D18_DC_HOT_PLUG_DETECT2_INT_EN(1);
 
+        if (!rdev->irq.installed) {
+                WARN(1, "Can't enable IRQ/MSI because no handler is installed.\n");
+                WREG32(R_000040_GEN_INT_CNTL, 0);
+                return -EINVAL;
+        }
         if (rdev->irq.sw_int) {
                 tmp |= S_000040_SW_INT_EN(1);
         }
@@ -396,7 +403,7 @@ int rs600_irq_process(struct radeon_device *rdev)
         }
         while (status || r500_disp_int) {
                 /* SW interrupt */
-                if (G_000040_SW_INT_EN(status))
+                if (G_000044_SW_INT(status))
                         radeon_fence_process(rdev);
                 /* Vertical blank interrupts */
                 if (G_007EDC_LB_D1_VBLANK_INTERRUPT(r500_disp_int))
@@ -553,6 +560,7 @@ static int rs600_startup(struct radeon_device *rdev)
                 return r;
         /* Enable IRQ */
         rs600_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 1e22f52d6039..cd31da913771 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -172,6 +172,7 @@ static int rs690_mc_init(struct radeon_device *rdev)
         rdev->mc.vram_location = G_000100_MC_FB_START(tmp) << 16;
         rdev->mc.gtt_location = 0xFFFFFFFFUL;
         r = radeon_mc_setup(rdev);
+        rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
         if (r)
                 return r;
         return 0;
@@ -625,6 +626,7 @@ static int rs690_startup(struct radeon_device *rdev)
                 return r;
         /* Enable IRQ */
         rs600_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 59632a506b46..62756717b044 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -479,6 +479,7 @@ static int rv515_startup(struct radeon_device *rdev)
         }
         /* Enable IRQ */
         rs600_irq_set(rdev);
+        rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 3bcb66e52786..afd9e8213c29 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -779,7 +779,6 @@ int rv770_mc_init(struct radeon_device *rdev)
         fixed20_12 a;
         u32 tmp;
         int chansize, numchan;
-        int r;
 
         /* Get VRAM informations */
         rdev->mc.vram_is_ddr = true;
@@ -822,9 +821,6 @@ int rv770_mc_init(struct radeon_device *rdev)
                 rdev->mc.real_vram_size = rdev->mc.aper_size;
 
         if (rdev->flags & RADEON_IS_AGP) {
-                r = radeon_agp_init(rdev);
-                if (r)
-                        return r;
                 /* gtt_size is setup by radeon_agp_init */
                 rdev->mc.gtt_location = rdev->mc.agp_base;
                 tmp = 0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size;
@@ -891,26 +887,19 @@ static int rv770_startup(struct radeon_device *rdev)
                         return r;
         }
         rv770_gpu_init(rdev);
-
-        if (!rdev->r600_blit.shader_obj) {
-                r = r600_blit_init(rdev);
+        /* pin copy shader into vram */
+        if (rdev->r600_blit.shader_obj) {
+                r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+                if (unlikely(r != 0))
+                        return r;
+                r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
+                                &rdev->r600_blit.shader_gpu_addr);
+                radeon_bo_unreserve(rdev->r600_blit.shader_obj);
                 if (r) {
-                        DRM_ERROR("radeon: failed blitter (%d).\n", r);
+                        DRM_ERROR("failed to pin blit object %d\n", r);
                         return r;
                 }
         }
-
-        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
-        if (unlikely(r != 0))
-                return r;
-        r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
-                        &rdev->r600_blit.shader_gpu_addr);
-        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
-        if (r) {
-                DRM_ERROR("failed to pin blit object %d\n", r);
-                return r;
-        }
-
         /* Enable IRQ */
         r = r600_irq_init(rdev);
         if (r) {
@@ -972,13 +961,16 @@ int rv770_suspend(struct radeon_device *rdev)
         /* FIXME: we should wait for ring to be empty */
         r700_cp_stop(rdev);
         rdev->cp.ready = false;
+        r600_irq_suspend(rdev);
         r600_wb_disable(rdev);
         rv770_pcie_gart_disable(rdev);
         /* unpin shaders bo */
-        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
-        if (likely(r == 0)) {
-                radeon_bo_unpin(rdev->r600_blit.shader_obj);
-                radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+        if (rdev->r600_blit.shader_obj) {
+                r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+                if (likely(r == 0)) {
+                        radeon_bo_unpin(rdev->r600_blit.shader_obj);
+                        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+                }
         }
         return 0;
 }
@@ -1037,6 +1029,11 @@ int rv770_init(struct radeon_device *rdev)
         r = radeon_fence_driver_init(rdev);
         if (r)
                 return r;
+        if (rdev->flags & RADEON_IS_AGP) {
+                r = radeon_agp_init(rdev);
+                if (r)
+                        radeon_agp_disable(rdev);
+        }
         r = rv770_mc_init(rdev);
         if (r)
                 return r;
@@ -1058,6 +1055,12 @@ int rv770_init(struct radeon_device *rdev)
         r = r600_pcie_gart_init(rdev);
         if (r)
                 return r;
+        r = r600_blit_init(rdev);
+        if (r) {
+                r600_blit_fini(rdev);
+                rdev->asic->copy = NULL;
+                dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+        }
 
         rdev->accel_working = true;
         r = rv770_startup(rdev);
@@ -1071,13 +1074,14 @@ int rv770_init(struct radeon_device *rdev)
         if (rdev->accel_working) {
                 r = radeon_ib_pool_init(rdev);
                 if (r) {
-                        DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);
-                        rdev->accel_working = false;
-                }
-                r = r600_ib_test(rdev);
-                if (r) {
-                        DRM_ERROR("radeon: failed testing IB (%d).\n", r);
+                        dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
                         rdev->accel_working = false;
+                } else {
+                        r = r600_ib_test(rdev);
+                        if (r) {
+                                dev_err(rdev->dev, "IB test failed (%d).\n", r);
+                                rdev->accel_working = false;
+                        }
                 }
         }
         return 0;
@@ -1096,8 +1100,7 @@ void rv770_fini(struct radeon_device *rdev)
         radeon_gem_fini(rdev);
         radeon_fence_driver_fini(rdev);
         radeon_clocks_fini(rdev);
-        if (rdev->flags & RADEON_IS_AGP)
-                radeon_agp_fini(rdev);
+        radeon_agp_fini(rdev);
         radeon_bo_fini(rdev);
         radeon_atombios_fini(rdev);
         kfree(rdev->bios);
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 2920f9a279e1..1a3e909b7bba 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -426,7 +426,8 @@ moved:
                     bdev->man[bo->mem.mem_type].gpu_offset;
                 bo->cur_placement = bo->mem.placement;
                 spin_unlock(&bo->lock);
-        }
+        } else
+                bo->offset = 0;
 
         return 0;
 
@@ -523,52 +524,44 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
 static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
 {
         struct ttm_bo_global *glob = bdev->glob;
-        struct ttm_buffer_object *entry, *nentry;
-        struct list_head *list, *next;
-        int ret;
+        struct ttm_buffer_object *entry = NULL;
+        int ret = 0;
 
         spin_lock(&glob->lru_lock);
-        list_for_each_safe(list, next, &bdev->ddestroy) {
-                entry = list_entry(list, struct ttm_buffer_object, ddestroy);
-                nentry = NULL;
+        if (list_empty(&bdev->ddestroy))
+                goto out_unlock;
 
-                /*
-                 * Protect the next list entry from destruction while we
-                 * unlock the lru_lock.
-                 */
+        entry = list_first_entry(&bdev->ddestroy,
+                struct ttm_buffer_object, ddestroy);
+        kref_get(&entry->list_kref);
 
-                if (next != &bdev->ddestroy) {
-                        nentry = list_entry(next, struct ttm_buffer_object,
-                                            ddestroy);
+        for (;;) {
+                struct ttm_buffer_object *nentry = NULL;
+
+                if (entry->ddestroy.next != &bdev->ddestroy) {
+                        nentry = list_first_entry(&entry->ddestroy,
+                                struct ttm_buffer_object, ddestroy);
                         kref_get(&nentry->list_kref);
                 }
-                kref_get(&entry->list_kref);
 
                 spin_unlock(&glob->lru_lock);
                 ret = ttm_bo_cleanup_refs(entry, remove_all);
                 kref_put(&entry->list_kref, ttm_bo_release_list);
+                entry = nentry;
+
+                if (ret || !entry)
+                        goto out;
 
                 spin_lock(&glob->lru_lock);
-                if (nentry) {
-                        bool next_onlist = !list_empty(next);
-                        spin_unlock(&glob->lru_lock);
-                        kref_put(&nentry->list_kref, ttm_bo_release_list);
-                        spin_lock(&glob->lru_lock);
-                        /*
-                         * Someone might have raced us and removed the
-                         * next entry from the list. We don't bother restarting
-                         * list traversal.
-                         */
-
-                        if (!next_onlist)
-                                break;
-                }
-                if (ret)
+                if (list_empty(&entry->ddestroy))
                         break;
         }
-        ret = !list_empty(&bdev->ddestroy);
-        spin_unlock(&glob->lru_lock);
 
+out_unlock:
+        spin_unlock(&glob->lru_lock);
+out:
+        if (entry)
+                kref_put(&entry->list_kref, ttm_bo_release_list);
         return ret;
 }
 
@@ -950,6 +943,14 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                 ttm_flag_masked(&cur_flags, placement->busy_placement[i],
                                 ~TTM_PL_MASK_MEMTYPE);
 
+
+                if (mem_type == TTM_PL_SYSTEM) {
+                        mem->mem_type = mem_type;
+                        mem->placement = cur_flags;
+                        mem->mm_node = NULL;
+                        return 0;
+                }
+
                 ret = ttm_bo_mem_force_space(bo, mem_type, placement, mem,
                                                 interruptible, no_wait);
                 if (ret == 0 && mem->mm_node) {
@@ -1844,6 +1845,9 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
          * anyone tries to access a ttm page.
          */
 
+        if (bo->bdev->driver->swap_notify)
+                bo->bdev->driver->swap_notify(bo);
+
         ret = ttm_tt_swapout(bo->ttm, bo->persistant_swap_storage);
 out:
 
@@ -1864,3 +1868,4 @@ void ttm_bo_swapout_all(struct ttm_bo_device *bdev)
         while (ttm_bo_swapout(&bdev->glob->shrink) == 0)
                 ;
 }
+EXPORT_SYMBOL(ttm_bo_swapout_all);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 2ecf7d0c64f6..5ca37a58a98c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -53,7 +53,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
 {
         struct ttm_tt *ttm = bo->ttm;
         struct ttm_mem_reg *old_mem = &bo->mem;
-        uint32_t save_flags = old_mem->placement;
         int ret;
 
         if (old_mem->mem_type != TTM_PL_SYSTEM) {
@@ -62,7 +61,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
                 ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM,
                                 TTM_PL_MASK_MEM);
                 old_mem->mem_type = TTM_PL_SYSTEM;
-                save_flags = old_mem->placement;
         }
 
         ret = ttm_tt_set_placement_caching(ttm, new_mem->placement);
@@ -77,7 +75,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
 
         *old_mem = *new_mem;
         new_mem->mm_node = NULL;
-        ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);
+
         return 0;
 }
 EXPORT_SYMBOL(ttm_bo_move_ttm);
@@ -219,7 +217,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
         void *old_iomap;
         void *new_iomap;
         int ret;
-        uint32_t save_flags = old_mem->placement;
         unsigned long i;
         unsigned long page;
         unsigned long add = 0;
@@ -270,7 +267,6 @@ out2:
 
         *old_mem = *new_mem;
         new_mem->mm_node = NULL;
-        ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);
 
         if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) && (ttm != NULL)) {
                 ttm_tt_unbind(ttm);
@@ -537,7 +533,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
         struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
         struct ttm_mem_reg *old_mem = &bo->mem;
         int ret;
-        uint32_t save_flags = old_mem->placement;
         struct ttm_buffer_object *ghost_obj;
         void *tmp_obj = NULL;
 
@@ -598,7 +593,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 
         *old_mem = *new_mem;
         new_mem->mm_node = NULL;
-        ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE);
+
         return 0;
 }
 EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);
diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c
index f619ebcaa4ec..3d172ef04ee1 100644
--- a/drivers/gpu/drm/ttm/ttm_lock.c
+++ b/drivers/gpu/drm/ttm/ttm_lock.c
@@ -288,6 +288,7 @@ void ttm_suspend_unlock(struct ttm_lock *lock)
         wake_up_all(&lock->queue);
         spin_unlock(&lock->lock);
 }
+EXPORT_SYMBOL(ttm_suspend_unlock);
 
 static bool __ttm_suspend_lock(struct ttm_lock *lock)
 {
@@ -309,3 +310,4 @@ void ttm_suspend_lock(struct ttm_lock *lock)
 {
         wait_event(lock->queue, __ttm_suspend_lock(lock));
 }
+EXPORT_SYMBOL(ttm_suspend_lock);
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c
index 1099abac824b..75e9d6f86ba4 100644
--- a/drivers/gpu/drm/ttm/ttm_object.c
+++ b/drivers/gpu/drm/ttm/ttm_object.c
@@ -109,8 +109,8 @@ struct ttm_ref_object {
         struct drm_hash_item hash;
         struct list_head head;
         struct kref kref;
-        struct ttm_base_object *obj;
         enum ttm_ref_type ref_type;
+        struct ttm_base_object *obj;
         struct ttm_object_file *tfile;
 };
 
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 9c2b1cc5dba5..e2123af7775a 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -198,17 +198,26 @@ EXPORT_SYMBOL(ttm_tt_populate);
 static inline int ttm_tt_set_page_caching(struct page *p,
                                           enum ttm_caching_state c_state)
 {
+        int ret = 0;
+
         if (PageHighMem(p))
                 return 0;
 
-        switch (c_state) {
-        case tt_cached:
-                return set_pages_wb(p, 1);
-        case tt_wc:
-            return set_memory_wc((unsigned long) page_address(p), 1);
-        default:
-                return set_pages_uc(p, 1);
+        if (get_page_memtype(p) != -1) {
+                /* p isn't in the default caching state, set it to
+                 * writeback first to free its current memtype. */
+
+                ret = set_pages_wb(p, 1);
+                if (ret)
+                        return ret;
         }
+
+        if (c_state == tt_wc)
+                ret = set_memory_wc((unsigned long) page_address(p), 1);
+        else if (c_state == tt_uncached)
+                ret = set_pages_uc(p, 1);
+
+        return ret;
 }
 #else /* CONFIG_X86 */
 static inline int ttm_tt_set_page_caching(struct page *p,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index d6f2d2b882e9..825ebe3d89d5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
@@ -48,6 +48,15 @@ struct ttm_placement vmw_vram_placement = {
         .busy_placement = &vram_placement_flags
 };
 
+struct ttm_placement vmw_vram_sys_placement = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .num_placement = 1,
+        .placement = &vram_placement_flags,
+        .num_busy_placement = 1,
+        .busy_placement = &sys_placement_flags
+};
+
 struct ttm_placement vmw_vram_ne_placement = {
         .fpfn = 0,
         .lpfn = 0,
@@ -172,6 +181,18 @@ static int vmw_verify_access(struct ttm_buffer_object *bo, struct file *filp)
         return 0;
 }
 
+static void vmw_move_notify(struct ttm_buffer_object *bo,
+                     struct ttm_mem_reg *new_mem)
+{
+        if (new_mem->mem_type != TTM_PL_SYSTEM)
+                vmw_dmabuf_gmr_unbind(bo);
+}
+
+static void vmw_swap_notify(struct ttm_buffer_object *bo)
+{
+        vmw_dmabuf_gmr_unbind(bo);
+}
+
 /**
  * FIXME: We're using the old vmware polling method to sync.
  * Do this with fences instead.
@@ -225,5 +246,7 @@ struct ttm_bo_driver vmw_bo_driver = {
         .sync_obj_wait = vmw_sync_obj_wait,
         .sync_obj_flush = vmw_sync_obj_flush,
         .sync_obj_unref = vmw_sync_obj_unref,
-        .sync_obj_ref = vmw_sync_obj_ref
+        .sync_obj_ref = vmw_sync_obj_ref,
+        .move_notify = vmw_move_notify,
+        .swap_notify = vmw_swap_notify
 };
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 1db1ef30be2b..a6e8f687fa64 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -147,6 +147,8 @@ static char *vmw_devname = "vmwgfx";
 
 static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
 static void vmw_master_init(struct vmw_master *);
+static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
+                              void *ptr);
 
 static void vmw_print_capabilities(uint32_t capabilities)
 {
@@ -207,6 +209,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
         struct vmw_private *dev_priv;
         int ret;
+        uint32_t svga_id;
 
         dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
         if (unlikely(dev_priv == NULL)) {
@@ -217,6 +220,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 
         dev_priv->dev = dev;
         dev_priv->vmw_chipset = chipset;
+        dev_priv->last_read_sequence = (uint32_t) -100;
         mutex_init(&dev_priv->hw_mutex);
         mutex_init(&dev_priv->cmdbuf_mutex);
         rwlock_init(&dev_priv->resource_lock);
@@ -236,6 +240,16 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         dev_priv->mmio_start = pci_resource_start(dev->pdev, 2);
 
         mutex_lock(&dev_priv->hw_mutex);
+
+        vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2);
+        svga_id = vmw_read(dev_priv, SVGA_REG_ID);
+        if (svga_id != SVGA_ID_2) {
+                ret = -ENOSYS;
+                DRM_ERROR("Unsuported SVGA ID 0x%x\n", svga_id);
+                mutex_unlock(&dev_priv->hw_mutex);
+                goto out_err0;
+        }
+
         dev_priv->capabilities = vmw_read(dev_priv, SVGA_REG_CAPABILITIES);
 
         if (dev_priv->capabilities & SVGA_CAP_GMR) {
@@ -351,6 +365,11 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
                 vmw_fb_init(dev_priv);
         }
 
+        dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier;
+        register_pm_notifier(&dev_priv->pm_nb);
+
+        DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ? "Have 3D\n" : "No 3D\n");
+
         return 0;
 
 out_no_device:
@@ -385,6 +404,8 @@ static int vmw_driver_unload(struct drm_device *dev)
 
         DRM_INFO(VMWGFX_DRIVER_NAME " unload.\n");
 
+        unregister_pm_notifier(&dev_priv->pm_nb);
+
         if (!dev_priv->stealth) {
                 vmw_fb_close(dev_priv);
                 vmw_kms_close(dev_priv);
@@ -650,6 +671,57 @@ static void vmw_remove(struct pci_dev *pdev)
         drm_put_dev(dev);
 }
 
+static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
+                              void *ptr)
+{
+        struct vmw_private *dev_priv =
+                container_of(nb, struct vmw_private, pm_nb);
+        struct vmw_master *vmaster = dev_priv->active_master;
+
+        switch (val) {
+        case PM_HIBERNATION_PREPARE:
+        case PM_SUSPEND_PREPARE:
+                ttm_suspend_lock(&vmaster->lock);
+
+                /**
+                 * This empties VRAM and unbinds all GMR bindings.
+                 * Buffer contents is moved to swappable memory.
+                 */
+                ttm_bo_swapout_all(&dev_priv->bdev);
+                break;
+        case PM_POST_HIBERNATION:
+        case PM_POST_SUSPEND:
+                ttm_suspend_unlock(&vmaster->lock);
+                break;
+        case PM_RESTORE_PREPARE:
+                break;
+        case PM_POST_RESTORE:
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+
+/**
+ * These might not be needed with the virtual SVGA device.
+ */
+
+int vmw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
+        return 0;
+}
+
+int vmw_pci_resume(struct pci_dev *pdev)
+{
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        return pci_enable_device(pdev);
+}
+
 static struct drm_driver driver = {
         .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
         DRIVER_MODESET,
@@ -689,7 +761,9 @@ static struct drm_driver driver = {
                        .name = VMWGFX_DRIVER_NAME,
                        .id_table = vmw_pci_id_list,
                        .probe = vmw_probe,
-                       .remove = vmw_remove
+                       .remove = vmw_remove,
+                       .suspend = vmw_pci_suspend,
+                       .resume = vmw_pci_resume
                        },
         .name = VMWGFX_DRIVER_NAME,
         .desc = VMWGFX_DRIVER_DESC,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index e61bd85b6975..135be9688c90 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -32,6 +32,7 @@
 #include "drmP.h"
 #include "vmwgfx_drm.h"
 #include "drm_hashtab.h"
+#include "linux/suspend.h"
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_object.h"
 #include "ttm/ttm_lock.h"
@@ -95,6 +96,8 @@ struct vmw_surface {
         struct drm_vmw_size *sizes;
         uint32_t num_sizes;
 
+        bool scanout;
+
         /* TODO so far just a extra pointer */
         struct vmw_cursor_snooper snooper;
 };
@@ -258,6 +261,7 @@ struct vmw_private {
 
         struct vmw_master *active_master;
         struct vmw_master fbdev_master;
+        struct notifier_block pm_nb;
 };
 
 static inline struct vmw_private *vmw_priv(struct drm_device *dev)
@@ -353,6 +357,7 @@ extern int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv,
                                        struct vmw_dma_buffer *bo);
 extern int vmw_dmabuf_from_vram(struct vmw_private *vmw_priv,
                                 struct vmw_dma_buffer *bo);
+extern void vmw_dmabuf_gmr_unbind(struct ttm_buffer_object *bo);
 extern int vmw_stream_claim_ioctl(struct drm_device *dev, void *data,
                                   struct drm_file *file_priv);
 extern int vmw_stream_unref_ioctl(struct drm_device *dev, void *data,
@@ -386,6 +391,7 @@ extern int vmw_fifo_send_fence(struct vmw_private *dev_priv,
                                uint32_t *sequence);
 extern void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason);
 extern int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma);
+extern bool vmw_fifo_have_3d(struct vmw_private *dev_priv);
 
 /**
  * TTM glue - vmwgfx_ttm_glue.c
@@ -401,6 +407,7 @@ extern int vmw_mmap(struct file *filp, struct vm_area_struct *vma);
 
 extern struct ttm_placement vmw_vram_placement;
 extern struct ttm_placement vmw_vram_ne_placement;
+extern struct ttm_placement vmw_vram_sys_placement;
 extern struct ttm_placement vmw_sys_placement;
 extern struct ttm_bo_driver vmw_bo_driver;
 extern int vmw_dma_quiescent(struct drm_device *dev);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 2e92da567403..d69caf92ffe7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -490,10 +490,29 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv,
         if (vmw_dmabuf_gmr(bo) != SVGA_GMR_NULL)
                 return 0;
 
+        /**
+         * Put BO in VRAM, only if there is space.
+         */
+
+        ret = ttm_bo_validate(bo, &vmw_vram_sys_placement, true, false);
+        if (unlikely(ret == -ERESTARTSYS))
+                return ret;
+
+        /**
+         * Otherwise, set it up as GMR.
+         */
+
+        if (vmw_dmabuf_gmr(bo) != SVGA_GMR_NULL)
+                return 0;
+
         ret = vmw_gmr_bind(dev_priv, bo);
         if (likely(ret == 0 || ret == -ERESTARTSYS))
                 return ret;
 
+        /**
+         * If that failed, try VRAM again, this time evicting
+         * previous contents.
+         */
 
         ret = ttm_bo_validate(bo, &vmw_vram_placement, true, false);
         return ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 641dde76ada1..4f4f6432be8b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -649,14 +649,6 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv,
         if (unlikely(ret != 0))
                 goto err_unlock;
 
-        if (vmw_bo->gmr_bound) {
-                vmw_gmr_unbind(vmw_priv, vmw_bo->gmr_id);
-                spin_lock(&bo->glob->lru_lock);
-                ida_remove(&vmw_priv->gmr_ida, vmw_bo->gmr_id);
-                spin_unlock(&bo->glob->lru_lock);
-                vmw_bo->gmr_bound = NULL;
-        }
-
         ret = ttm_bo_validate(bo, &ne_placement, false, false);
         ttm_bo_unreserve(bo);
 err_unlock:
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 01feb48af333..4157547cc6e4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -29,6 +29,25 @@
 #include "drmP.h"
 #include "ttm/ttm_placement.h"
 
+bool vmw_fifo_have_3d(struct vmw_private *dev_priv)
+{
+        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        uint32_t fifo_min, hwversion;
+
+        fifo_min = ioread32(fifo_mem  + SVGA_FIFO_MIN);
+        if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int))
+                return false;
+
+        hwversion = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);
+        if (hwversion == 0)
+                return false;
+
+        if (hwversion < SVGA3D_HWVERSION_WS65_B1)
+                return false;
+
+        return true;
+}
+
 int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 {
         __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
@@ -98,8 +117,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
                  (unsigned int) min,
                  (unsigned int) fifo->capabilities);
 
-        dev_priv->fence_seq = (uint32_t) -100;
-        dev_priv->last_read_sequence = (uint32_t) -100;
+        dev_priv->fence_seq = dev_priv->last_read_sequence;
         iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE);
 
         return vmw_fifo_send_fence(dev_priv, &dummy);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 5fa6a4ed238a..778851f9f1d6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -43,7 +43,7 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data,
                 param->value = vmw_overlay_num_free_overlays(dev_priv);
                 break;
         case DRM_VMW_PARAM_3D:
-                param->value = dev_priv->capabilities & SVGA_CAP_3D ? 1 : 0;
+                param->value = vmw_fifo_have_3d(dev_priv) ? 1 : 0;
                 break;
         case DRM_VMW_PARAM_FIFO_OFFSET:
                 param->value = dev_priv->mmio_start;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index b1af76e371c3..eeba6d1d06e4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -553,9 +553,7 @@ int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
         } *cmd;
         int i, increment = 1;
 
-        if (!num_clips ||
-            !(dev_priv->fifo.capabilities &
-              SVGA_FIFO_CAP_SCREEN_OBJECT)) {
+        if (!num_clips) {
                 num_clips = 1;
                 clips = &norect;
                 norect.x1 = norect.y1 = 0;
@@ -574,10 +572,10 @@ int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
 
         for (i = 0; i < num_clips; i++, clips += increment) {
                 cmd[i].header = cpu_to_le32(SVGA_CMD_UPDATE);
-                cmd[i].body.x = cpu_to_le32(clips[i].x1);
-                cmd[i].body.y = cpu_to_le32(clips[i].y1);
-                cmd[i].body.width = cpu_to_le32(clips[i].x2 - clips[i].x1);
-                cmd[i].body.height = cpu_to_le32(clips[i].y2 - clips[i].y1);
+                cmd[i].body.x = cpu_to_le32(clips->x1);
+                cmd[i].body.y = cpu_to_le32(clips->y1);
+                cmd[i].body.width = cpu_to_le32(clips->x2 - clips->x1);
+                cmd[i].body.height = cpu_to_le32(clips->y2 - clips->y1);
         }
 
         vmw_fifo_commit(dev_priv, sizeof(*cmd) * num_clips);
@@ -709,6 +707,9 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,
         if (ret)
                 goto try_dmabuf;
 
+        if (!surface->scanout)
+                goto err_not_scanout;
+
         ret = vmw_kms_new_framebuffer_surface(dev_priv, surface, &vfb,
                                               mode_cmd->width, mode_cmd->height);
 
@@ -742,6 +743,13 @@ try_dmabuf:
         }
 
         return &vfb->base;
+
+err_not_scanout:
+        DRM_ERROR("surface not marked as scanout\n");
+        /* vmw_user_surface_lookup takes one ref */
+        vmw_surface_unreference(&surface);
+
+        return NULL;
 }
 
 static int vmw_kms_fb_changed(struct drm_device *dev)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index bb6e6a096d25..5b6eabeb7f51 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
@@ -104,7 +104,6 @@ static int vmw_dmabuf_pin_in_vram(struct vmw_private *dev_priv,
                                   bool pin, bool interruptible)
 {
         struct ttm_buffer_object *bo = &buf->base;
-        struct ttm_bo_global *glob = bo->glob;
         struct ttm_placement *overlay_placement = &vmw_vram_placement;
         int ret;
 
@@ -116,14 +115,6 @@ static int vmw_dmabuf_pin_in_vram(struct vmw_private *dev_priv,
         if (unlikely(ret != 0))
                 goto err;
 
-        if (buf->gmr_bound) {
-                vmw_gmr_unbind(dev_priv, buf->gmr_id);
-                spin_lock(&glob->lru_lock);
-                ida_remove(&dev_priv->gmr_ida, buf->gmr_id);
-                spin_unlock(&glob->lru_lock);
-                buf->gmr_bound = NULL;
-        }
-
         if (pin)
                 overlay_placement = &vmw_vram_ne_placement;
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index c012d5927f65..c7efbd47ab84 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -35,6 +35,11 @@
 #define VMW_RES_SURFACE ttm_driver_type1
 #define VMW_RES_STREAM ttm_driver_type2
 
+/* XXX: This isn't a real hardware flag, but just a hack for kernel to
+ * know about primary surfaces. Find a better way to accomplish this.
+ */
+#define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9)
+
 struct vmw_user_context {
         struct ttm_base_object base;
         struct vmw_resource res;
@@ -599,6 +604,36 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
         if (unlikely(ret != 0))
                 goto out_err1;
 
+        if (srf->flags & SVGA3D_SURFACE_HINT_SCANOUT) {
+                /* we should not send this flag down to hardware since
+                 * its not a official one
+                 */
+                srf->flags &= ~SVGA3D_SURFACE_HINT_SCANOUT;
+                srf->scanout = true;
+        } else {
+                srf->scanout = false;
+        }
+
+        if (srf->scanout &&
+            srf->num_sizes == 1 &&
+            srf->sizes[0].width == 64 &&
+            srf->sizes[0].height == 64 &&
+            srf->format == SVGA3D_A8R8G8B8) {
+
+                srf->snooper.image = kmalloc(64 * 64 * 4, GFP_KERNEL);
+                /* clear the image */
+                if (srf->snooper.image) {
+                        memset(srf->snooper.image, 0x00, 64 * 64 * 4);
+                } else {
+                        DRM_ERROR("Failed to allocate cursor_image\n");
+                        ret = -ENOMEM;
+                        goto out_err1;
+                }
+        } else {
+                srf->snooper.image = NULL;
+        }
+        srf->snooper.crtc = NULL;
+
         user_srf->base.shareable = false;
         user_srf->base.tfile = NULL;
 
@@ -622,24 +657,6 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
                 return ret;
         }
 
-        if (srf->flags & (1 << 9) &&
-            srf->num_sizes == 1 &&
-            srf->sizes[0].width == 64 &&
-            srf->sizes[0].height == 64 &&
-            srf->format == SVGA3D_A8R8G8B8) {
-
-                srf->snooper.image = kmalloc(64 * 64 * 4, GFP_KERNEL);
-                /* clear the image */
-                if (srf->snooper.image)
-                        memset(srf->snooper.image, 0x00, 64 * 64 * 4);
-                else
-                        DRM_ERROR("Failed to allocate cursor_image\n");
-
-        } else {
-                srf->snooper.image = NULL;
-        }
-        srf->snooper.crtc = NULL;
-
         rep->sid = user_srf->base.hash.key;
         if (rep->sid == SVGA3D_INVALID_ID)
                 DRM_ERROR("Created bad Surface ID.\n");
@@ -754,20 +771,29 @@ static size_t vmw_dmabuf_acc_size(struct ttm_bo_global *glob,
         return bo_user_size + page_array_size;
 }
 
-void vmw_dmabuf_bo_free(struct ttm_buffer_object *bo)
+void vmw_dmabuf_gmr_unbind(struct ttm_buffer_object *bo)
 {
         struct vmw_dma_buffer *vmw_bo = vmw_dma_buffer(bo);
         struct ttm_bo_global *glob = bo->glob;
         struct vmw_private *dev_priv =
                 container_of(bo->bdev, struct vmw_private, bdev);
 
-        ttm_mem_global_free(glob->mem_glob, bo->acc_size);
         if (vmw_bo->gmr_bound) {
                 vmw_gmr_unbind(dev_priv, vmw_bo->gmr_id);
                 spin_lock(&glob->lru_lock);
                 ida_remove(&dev_priv->gmr_ida, vmw_bo->gmr_id);
                 spin_unlock(&glob->lru_lock);
+                vmw_bo->gmr_bound = false;
         }
+}
+
+void vmw_dmabuf_bo_free(struct ttm_buffer_object *bo)
+{
+        struct vmw_dma_buffer *vmw_bo = vmw_dma_buffer(bo);
+        struct ttm_bo_global *glob = bo->glob;
+
+        vmw_dmabuf_gmr_unbind(bo);
+        ttm_mem_global_free(glob->mem_glob, bo->acc_size);
         kfree(vmw_bo);
 }
 
@@ -813,18 +839,10 @@ int vmw_dmabuf_init(struct vmw_private *dev_priv,
 static void vmw_user_dmabuf_destroy(struct ttm_buffer_object *bo)
 {
         struct vmw_user_dma_buffer *vmw_user_bo = vmw_user_dma_buffer(bo);
-        struct vmw_dma_buffer *vmw_bo = &vmw_user_bo->dma;
         struct ttm_bo_global *glob = bo->glob;
-        struct vmw_private *dev_priv =
-                container_of(bo->bdev, struct vmw_private, bdev);
 
+        vmw_dmabuf_gmr_unbind(bo);
         ttm_mem_global_free(glob->mem_glob, bo->acc_size);
-        if (vmw_bo->gmr_bound) {
-                vmw_gmr_unbind(dev_priv, vmw_bo->gmr_id);
-                spin_lock(&glob->lru_lock);
-                ida_remove(&dev_priv->gmr_ida, vmw_bo->gmr_id);
-                spin_unlock(&glob->lru_lock);
-        }
         kfree(vmw_user_bo);
 }
 
@@ -868,7 +886,7 @@ int vmw_dmabuf_alloc_ioctl(struct drm_device *dev, void *data,
         }
 
         ret = vmw_dmabuf_init(dev_priv, &vmw_user_bo->dma, req->size,
-                              &vmw_vram_placement, true,
+                              &vmw_vram_sys_placement, true,
                               &vmw_user_dmabuf_destroy);
         if (unlikely(ret != 0))
                 return ret;
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 4b96e7a898cf..5b4d66dc1a05 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_devices[] = {
                 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
                 .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_ISO_KEYBOARD },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 80792d38d25c..eabe5f87c6c1 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1285,6 +1285,9 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
@@ -1553,6 +1556,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 3839340e293a..010368e649ed 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -88,6 +88,9 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI    0x0236
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO     0x0237
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS     0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
 #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL       0x8241
@@ -166,6 +169,9 @@
 #define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
 #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
 
+#define USB_VENDOR_ID_ETT               0x0664
+#define USB_DEVICE_ID_TC5UH             0x0309
+
 #define USB_VENDOR_ID_EZKEY             0x0518
 #define USB_DEVICE_ID_BTC_8193          0x0002
 
diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c
index 5b222eed0692..510dd1340597 100644
--- a/drivers/hid/hid-samsung.c
+++ b/drivers/hid/hid-samsung.c
@@ -39,7 +39,17 @@
  *
  * 3. 135 byte report descriptor
  * Report #4 has an array field with logical range 0..17 instead of 1..14.
+ *
+ * 4. 171 byte report descriptor
+ * Report #3 has an array field with logical range 0..1 instead of 1..3.
  */
+static inline void samsung_dev_trace(struct hid_device *hdev,
+                unsigned int rsize)
+{
+        dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "
+                        "descriptor\n", rsize);
+}
+
 static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                 unsigned int rsize)
 {
@@ -47,8 +57,7 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                         rdesc[177] == 0x75 && rdesc[178] == 0x30 &&
                         rdesc[179] == 0x95 && rdesc[180] == 0x01 &&
                         rdesc[182] == 0x40) {
-                dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "
-                                "descriptor\n", 184);
+                samsung_dev_trace(hdev, 184);
                 rdesc[176] = 0xff;
                 rdesc[178] = 0x08;
                 rdesc[180] = 0x06;
@@ -56,17 +65,21 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
         } else
         if (rsize == 203 && rdesc[192] == 0x15 && rdesc[193] == 0x0 &&
                         rdesc[194] == 0x25 && rdesc[195] == 0x12) {
-                dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "
-                                "descriptor\n", 203);
+                samsung_dev_trace(hdev, 203);
                 rdesc[193] = 0x1;
                 rdesc[195] = 0xf;
         } else
         if (rsize == 135 && rdesc[124] == 0x15 && rdesc[125] == 0x0 &&
                         rdesc[126] == 0x25 && rdesc[127] == 0x11) {
-                dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "
-                                "descriptor\n", 135);
+                samsung_dev_trace(hdev, 135);
                 rdesc[125] = 0x1;
                 rdesc[127] = 0xe;
+        } else
+        if (rsize == 171 && rdesc[160] == 0x15 && rdesc[161] == 0x0 &&
+                        rdesc[162] == 0x25 && rdesc[163] == 0x01) {
+                samsung_dev_trace(hdev, 171);
+                rdesc[161] = 0x1;
+                rdesc[163] = 0x3;
         }
 }
 
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 747542172242..12dcda529201 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -142,6 +142,7 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,
                 wdata->butstate = rw;
                 input_report_key(input, BTN_0, rw & 0x02);
                 input_report_key(input, BTN_1, rw & 0x01);
+                input_report_key(input, BTN_TOOL_FINGER, 0xf0);
                 input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
                 input_sync(input);
         }
@@ -196,6 +197,9 @@ static int wacom_probe(struct hid_device *hdev,
         /* Pad */
         input->evbit[0] |= BIT(EV_MSC);
         input->mscbit[0] |= BIT(MSC_SERIAL);
+        set_bit(BTN_0, input->keybit);
+        set_bit(BTN_1, input->keybit);
+        set_bit(BTN_TOOL_FINGER, input->keybit);
 
         /* Distance, rubber and mouse */
         input->absbit[0] |= BIT(ABS_DISTANCE);
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 46c3c566307e..68cf87749a42 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -392,7 +392,7 @@ config SENSORS_GL520SM
 
 config SENSORS_CORETEMP
         tristate "Intel Core/Core2/Atom temperature sensor"
-        depends on X86 && EXPERIMENTAL
+        depends on X86 && PCI && EXPERIMENTAL
         help
           If you say yes here you get support for the temperature
           sensor inside your CPU. Most of the family 6 CPUs
@@ -792,6 +792,16 @@ config SENSORS_ADS7828
           This driver can also be built as a module.  If so, the module
           will be called ads7828.
 
+config SENSORS_AMC6821
+        tristate "Texas Instruments AMC6821"
+        depends on I2C  && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Texas Instruments
+          AMC6821 hardware monitoring chips.
+
+          This driver can also be build as a module.  If so, the module
+          will be called amc6821.
+
 config SENSORS_THMC50
         tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
         depends on I2C && EXPERIMENTAL
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 450c8e894277..4bc215c0953f 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -86,6 +86,7 @@ obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
 obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
+obj-$(CONFIG_SENSORS_AMC6821)   += amc6821.o
 obj-$(CONFIG_SENSORS_THMC50)    += thmc50.o
 obj-$(CONFIG_SENSORS_TMP401)    += tmp401.o
 obj-$(CONFIG_SENSORS_TMP421)    += tmp421.o
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c
index a1a7ef14b519..a31e77c776ae 100644
--- a/drivers/hwmon/adt7462.c
+++ b/drivers/hwmon/adt7462.c
@@ -94,7 +94,7 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 #define         ADT7462_PIN24_SHIFT             6
 #define         ADT7462_PIN26_VOLT_INPUT        0x08
 #define         ADT7462_PIN25_VOLT_INPUT        0x20
-#define         ADT7462_PIN28_SHIFT             6       /* cfg3 */
+#define         ADT7462_PIN28_SHIFT             4       /* cfg3 */
 #define         ADT7462_PIN28_VOLT              0x5
 
 #define ADT7462_REG_ALARM1                      0xB8
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c
new file mode 100644
index 000000000000..fa9708c2d723
--- /dev/null
+++ b/drivers/hwmon/amc6821.c
@@ -0,0 +1,1115 @@
+/*
+        amc6821.c - Part of lm_sensors, Linux kernel modules for hardware
+        monitoring
+        Copyright (C) 2009 T. Mertelj <tomaz.mertelj@guest.arnes.si>
+
+        Based on max6650.c:
+        Copyright (C) 2007 Hans J. Koch <hjk@linutronix.de>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#include <linux/kernel.h>       /* Needed for KERN_INFO */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+
+/*
+ * Addresses to scan.
+ */
+
+static const unsigned short normal_i2c[] = {0x18, 0x19, 0x1a, 0x2c, 0x2d, 0x2e,
+        0x4c, 0x4d, 0x4e, I2C_CLIENT_END};
+
+
+
+/*
+ * Insmod parameters
+ */
+
+static int pwminv = 0;  /*Inverted PWM output. */
+module_param(pwminv, int, S_IRUGO);
+
+static int init = 1; /*Power-on initialization.*/
+module_param(init, int, S_IRUGO);
+
+
+enum chips { amc6821 };
+
+#define AMC6821_REG_DEV_ID 0x3D
+#define AMC6821_REG_COMP_ID 0x3E
+#define AMC6821_REG_CONF1 0x00
+#define AMC6821_REG_CONF2 0x01
+#define AMC6821_REG_CONF3 0x3F
+#define AMC6821_REG_CONF4 0x04
+#define AMC6821_REG_STAT1 0x02
+#define AMC6821_REG_STAT2 0x03
+#define AMC6821_REG_TDATA_LOW 0x08
+#define AMC6821_REG_TDATA_HI 0x09
+#define AMC6821_REG_LTEMP_HI 0x0A
+#define AMC6821_REG_RTEMP_HI 0x0B
+#define AMC6821_REG_LTEMP_LIMIT_MIN 0x15
+#define AMC6821_REG_LTEMP_LIMIT_MAX 0x14
+#define AMC6821_REG_RTEMP_LIMIT_MIN 0x19
+#define AMC6821_REG_RTEMP_LIMIT_MAX 0x18
+#define AMC6821_REG_LTEMP_CRIT 0x1B
+#define AMC6821_REG_RTEMP_CRIT 0x1D
+#define AMC6821_REG_PSV_TEMP 0x1C
+#define AMC6821_REG_DCY 0x22
+#define AMC6821_REG_LTEMP_FAN_CTRL 0x24
+#define AMC6821_REG_RTEMP_FAN_CTRL 0x25
+#define AMC6821_REG_DCY_LOW_TEMP 0x21
+
+#define AMC6821_REG_TACH_LLIMITL 0x10
+#define AMC6821_REG_TACH_LLIMITH 0x11
+#define AMC6821_REG_TACH_HLIMITL 0x12
+#define AMC6821_REG_TACH_HLIMITH 0x13
+
+#define AMC6821_CONF1_START 0x01
+#define AMC6821_CONF1_FAN_INT_EN 0x02
+#define AMC6821_CONF1_FANIE 0x04
+#define AMC6821_CONF1_PWMINV 0x08
+#define AMC6821_CONF1_FAN_FAULT_EN 0x10
+#define AMC6821_CONF1_FDRC0 0x20
+#define AMC6821_CONF1_FDRC1 0x40
+#define AMC6821_CONF1_THERMOVIE 0x80
+
+#define AMC6821_CONF2_PWM_EN 0x01
+#define AMC6821_CONF2_TACH_MODE 0x02
+#define AMC6821_CONF2_TACH_EN 0x04
+#define AMC6821_CONF2_RTFIE 0x08
+#define AMC6821_CONF2_LTOIE 0x10
+#define AMC6821_CONF2_RTOIE 0x20
+#define AMC6821_CONF2_PSVIE 0x40
+#define AMC6821_CONF2_RST 0x80
+
+#define AMC6821_CONF3_THERM_FAN_EN 0x80
+#define AMC6821_CONF3_REV_MASK 0x0F
+
+#define AMC6821_CONF4_OVREN 0x10
+#define AMC6821_CONF4_TACH_FAST 0x20
+#define AMC6821_CONF4_PSPR 0x40
+#define AMC6821_CONF4_MODE 0x80
+
+#define AMC6821_STAT1_RPM_ALARM 0x01
+#define AMC6821_STAT1_FANS 0x02
+#define AMC6821_STAT1_RTH 0x04
+#define AMC6821_STAT1_RTL 0x08
+#define AMC6821_STAT1_R_THERM 0x10
+#define AMC6821_STAT1_RTF 0x20
+#define AMC6821_STAT1_LTH 0x40
+#define AMC6821_STAT1_LTL 0x80
+
+#define AMC6821_STAT2_RTC 0x08
+#define AMC6821_STAT2_LTC 0x10
+#define AMC6821_STAT2_LPSV 0x20
+#define AMC6821_STAT2_L_THERM 0x40
+#define AMC6821_STAT2_THERM_IN 0x80
+
+enum {IDX_TEMP1_INPUT = 0, IDX_TEMP1_MIN, IDX_TEMP1_MAX,
+        IDX_TEMP1_CRIT, IDX_TEMP2_INPUT, IDX_TEMP2_MIN,
+        IDX_TEMP2_MAX, IDX_TEMP2_CRIT,
+        TEMP_IDX_LEN, };
+
+static const u8 temp_reg[] = {AMC6821_REG_LTEMP_HI,
+                        AMC6821_REG_LTEMP_LIMIT_MIN,
+                        AMC6821_REG_LTEMP_LIMIT_MAX,
+                        AMC6821_REG_LTEMP_CRIT,
+                        AMC6821_REG_RTEMP_HI,
+                        AMC6821_REG_RTEMP_LIMIT_MIN,
+                        AMC6821_REG_RTEMP_LIMIT_MAX,
+                        AMC6821_REG_RTEMP_CRIT, };
+
+enum {IDX_FAN1_INPUT = 0, IDX_FAN1_MIN, IDX_FAN1_MAX,
+        FAN1_IDX_LEN, };
+
+static const u8 fan_reg_low[] = {AMC6821_REG_TDATA_LOW,
+                        AMC6821_REG_TACH_LLIMITL,
+                        AMC6821_REG_TACH_HLIMITL, };
+
+
+static const u8 fan_reg_hi[] = {AMC6821_REG_TDATA_HI,
+                        AMC6821_REG_TACH_LLIMITH,
+                        AMC6821_REG_TACH_HLIMITH, };
+
+static int amc6821_probe(
+                struct i2c_client *client,
+                const struct i2c_device_id *id);
+static int amc6821_detect(
+                struct i2c_client *client,
+                struct i2c_board_info *info);
+static int amc6821_init_client(struct i2c_client *client);
+static int amc6821_remove(struct i2c_client *client);
+static struct amc6821_data *amc6821_update_device(struct device *dev);
+
+/*
+ * Driver data (common to all clients)
+ */
+
+static const struct i2c_device_id amc6821_id[] = {
+        { "amc6821", amc6821 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, amc6821_id);
+
+static struct i2c_driver amc6821_driver = {
+        .class = I2C_CLASS_HWMON,
+        .driver = {
+                .name   = "amc6821",
+        },
+        .probe = amc6821_probe,
+        .remove = amc6821_remove,
+        .id_table = amc6821_id,
+        .detect = amc6821_detect,
+        .address_list = normal_i2c,
+};
+
+
+/*
+ * Client data (each client gets its own)
+  */
+
+struct amc6821_data {
+        struct device *hwmon_dev;
+        struct mutex update_lock;
+        char valid; /* zero until following fields are valid */
+        unsigned long last_updated; /* in jiffies */
+
+        /* register values */
+        int temp[TEMP_IDX_LEN];
+
+        u16 fan[FAN1_IDX_LEN];
+        u8 fan1_div;
+
+        u8 pwm1;
+        u8 temp1_auto_point_temp[3];
+        u8 temp2_auto_point_temp[3];
+        u8 pwm1_auto_point_pwm[3];
+        u8 pwm1_enable;
+        u8 pwm1_auto_channels_temp;
+
+        u8 stat1;
+        u8 stat2;
+};
+
+
+static ssize_t get_temp(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        int ix = to_sensor_dev_attr(devattr)->index;
+
+        return sprintf(buf, "%d\n", data->temp[ix] * 1000);
+}
+
+
+
+static ssize_t set_temp(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        int ix = to_sensor_dev_attr(attr)->index;
+        long val;
+
+        int ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+        val = SENSORS_LIMIT(val / 1000, -128, 127);
+
+        mutex_lock(&data->update_lock);
+        data->temp[ix] = val;
+        if (i2c_smbus_write_byte_data(client, temp_reg[ix], data->temp[ix])) {
+                dev_err(&client->dev, "Register write error, aborting.\n");
+                count = -EIO;
+        }
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+
+
+
+static ssize_t get_temp_alarm(
+        struct device *dev,
+        struct device_attribute *devattr,
+        char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        int ix = to_sensor_dev_attr(devattr)->index;
+        u8 flag;
+
+        switch (ix) {
+        case IDX_TEMP1_MIN:
+                flag = data->stat1 & AMC6821_STAT1_LTL;
+                break;
+        case IDX_TEMP1_MAX:
+                flag = data->stat1 & AMC6821_STAT1_LTH;
+                break;
+        case IDX_TEMP1_CRIT:
+                flag = data->stat2 & AMC6821_STAT2_LTC;
+                break;
+        case IDX_TEMP2_MIN:
+                flag = data->stat1 & AMC6821_STAT1_RTL;
+                break;
+        case IDX_TEMP2_MAX:
+                flag = data->stat1 & AMC6821_STAT1_RTH;
+                break;
+        case IDX_TEMP2_CRIT:
+                flag = data->stat2 & AMC6821_STAT2_RTC;
+                break;
+        default:
+                dev_dbg(dev, "Unknown attr->index (%d).\n", ix);
+                return -EINVAL;
+        }
+        if (flag)
+                return sprintf(buf, "1");
+        else
+                return sprintf(buf, "0");
+}
+
+
+
+
+static ssize_t get_temp2_fault(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        if (data->stat1 & AMC6821_STAT1_RTF)
+                return sprintf(buf, "1");
+        else
+                return sprintf(buf, "0");
+}
+
+static ssize_t get_pwm1(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm1);
+}
+
+static ssize_t set_pwm1(
+                struct device *dev,
+                struct device_attribute *devattr,
+                const char *buf,
+                size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        long val;
+        int ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&data->update_lock);
+        data->pwm1 = SENSORS_LIMIT(val , 0, 255);
+        i2c_smbus_write_byte_data(client, AMC6821_REG_DCY, data->pwm1);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t get_pwm1_enable(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm1_enable);
+}
+
+static ssize_t set_pwm1_enable(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        long val;
+        int config = strict_strtol(buf, 10, &val);
+        if (config)
+                return config;
+
+        config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF1);
+        if (config < 0) {
+                        dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                        return -EIO;
+        }
+
+        switch (val) {
+        case 1:
+                config &= ~AMC6821_CONF1_FDRC0;
+                config &= ~AMC6821_CONF1_FDRC1;
+                break;
+        case 2:
+                config &= ~AMC6821_CONF1_FDRC0;
+                config |= AMC6821_CONF1_FDRC1;
+                break;
+        case 3:
+                config |= AMC6821_CONF1_FDRC0;
+                config |= AMC6821_CONF1_FDRC1;
+                break;
+        default:
+                return -EINVAL;
+        }
+        mutex_lock(&data->update_lock);
+        if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF1, config)) {
+                        dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                        count = -EIO;
+        }
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+
+static ssize_t get_pwm1_auto_channels_temp(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm1_auto_channels_temp);
+}
+
+
+static ssize_t get_temp_auto_point_temp(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        int ix = to_sensor_dev_attr_2(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->nr;
+        struct amc6821_data *data = amc6821_update_device(dev);
+        switch (nr) {
+        case 1:
+                return sprintf(buf, "%d\n",
+                        data->temp1_auto_point_temp[ix] * 1000);
+                break;
+        case 2:
+                return sprintf(buf, "%d\n",
+                        data->temp2_auto_point_temp[ix] * 1000);
+                break;
+        default:
+                dev_dbg(dev, "Unknown attr->nr (%d).\n", nr);
+                return -EINVAL;
+        }
+}
+
+
+static ssize_t get_pwm1_auto_point_pwm(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        int ix = to_sensor_dev_attr(devattr)->index;
+        struct amc6821_data *data = amc6821_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm1_auto_point_pwm[ix]);
+}
+
+
+static inline ssize_t set_slope_register(struct i2c_client *client,
+                u8 reg,
+                u8 dpwm,
+                u8 *ptemp)
+{
+        int dt;
+        u8 tmp;
+
+        dt = ptemp[2]-ptemp[1];
+        for (tmp = 4; tmp > 0; tmp--) {
+                if (dt * (0x20 >> tmp) >= dpwm)
+                        break;
+        }
+        tmp |= (ptemp[1] & 0x7C) << 1;
+        if (i2c_smbus_write_byte_data(client,
+                        reg, tmp)) {
+                dev_err(&client->dev, "Register write error, aborting.\n");
+                return -EIO;
+        }
+        return 0;
+}
+
+
+
+static ssize_t set_temp_auto_point_temp(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = amc6821_update_device(dev);
+        int ix = to_sensor_dev_attr_2(attr)->index;
+        int nr = to_sensor_dev_attr_2(attr)->nr;
+        u8 *ptemp;
+        u8 reg;
+        int dpwm;
+        long val;
+        int ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        switch (nr) {
+        case 1:
+                ptemp = data->temp1_auto_point_temp;
+                reg = AMC6821_REG_LTEMP_FAN_CTRL;
+                break;
+        case 2:
+                ptemp = data->temp2_auto_point_temp;
+                reg = AMC6821_REG_RTEMP_FAN_CTRL;
+                break;
+        default:
+                dev_dbg(dev, "Unknown attr->nr (%d).\n", nr);
+                return -EINVAL;
+        }
+
+        data->valid = 0;
+        mutex_lock(&data->update_lock);
+        switch (ix) {
+        case 0:
+                ptemp[0] = SENSORS_LIMIT(val / 1000, 0,
+                                data->temp1_auto_point_temp[1]);
+                ptemp[0] = SENSORS_LIMIT(ptemp[0], 0,
+                                data->temp2_auto_point_temp[1]);
+                ptemp[0] = SENSORS_LIMIT(ptemp[0], 0, 63);
+                if (i2c_smbus_write_byte_data(
+                                        client,
+                                        AMC6821_REG_PSV_TEMP,
+                                        ptemp[0])) {
+                                dev_err(&client->dev,
+                                        "Register write error, aborting.\n");
+                                count = -EIO;
+                }
+                goto EXIT;
+                break;
+        case 1:
+                ptemp[1] = SENSORS_LIMIT(
+                                        val / 1000,
+                                        (ptemp[0] & 0x7C) + 4,
+                                        124);
+                ptemp[1] &= 0x7C;
+                ptemp[2] = SENSORS_LIMIT(
+                                        ptemp[2], ptemp[1] + 1,
+                                        255);
+                break;
+        case 2:
+                ptemp[2] = SENSORS_LIMIT(
+                                        val / 1000,
+                                        ptemp[1]+1,
+                                        255);
+                break;
+        default:
+                dev_dbg(dev, "Unknown attr->index (%d).\n", ix);
+                count = -EINVAL;
+                goto EXIT;
+        }
+        dpwm = data->pwm1_auto_point_pwm[2] - data->pwm1_auto_point_pwm[1];
+        if (set_slope_register(client, reg, dpwm, ptemp))
+                count = -EIO;
+
+EXIT:
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+
+
+static ssize_t set_pwm1_auto_point_pwm(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        int dpwm;
+        long val;
+        int ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&data->update_lock);
+        data->pwm1_auto_point_pwm[1] = SENSORS_LIMIT(val, 0, 254);
+        if (i2c_smbus_write_byte_data(client, AMC6821_REG_DCY_LOW_TEMP,
+                        data->pwm1_auto_point_pwm[1])) {
+                dev_err(&client->dev, "Register write error, aborting.\n");
+                count = -EIO;
+                goto EXIT;
+        }
+        dpwm = data->pwm1_auto_point_pwm[2] - data->pwm1_auto_point_pwm[1];
+        if (set_slope_register(client, AMC6821_REG_LTEMP_FAN_CTRL, dpwm,
+                        data->temp1_auto_point_temp)) {
+                count = -EIO;
+                goto EXIT;
+        }
+        if (set_slope_register(client, AMC6821_REG_RTEMP_FAN_CTRL, dpwm,
+                        data->temp2_auto_point_temp)) {
+                count = -EIO;
+                goto EXIT;
+        }
+
+EXIT:
+        data->valid = 0;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t get_fan(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        int ix = to_sensor_dev_attr(devattr)->index;
+        if (0 == data->fan[ix])
+                return sprintf(buf, "0");
+        return sprintf(buf, "%d\n", (int)(6000000 / data->fan[ix]));
+}
+
+
+
+static ssize_t get_fan1_fault(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        if (data->stat1 & AMC6821_STAT1_FANS)
+                return sprintf(buf, "1");
+        else
+                return sprintf(buf, "0");
+}
+
+
+
+static ssize_t set_fan(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        long val;
+        int ix = to_sensor_dev_attr(attr)->index;
+        int ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+        val = 1 > val ? 0xFFFF : 6000000/val;
+
+        mutex_lock(&data->update_lock);
+        data->fan[ix] = (u16) SENSORS_LIMIT(val, 1, 0xFFFF);
+        if (i2c_smbus_write_byte_data(client, fan_reg_low[ix],
+                        data->fan[ix] & 0xFF)) {
+                dev_err(&client->dev, "Register write error, aborting.\n");
+                count = -EIO;
+                goto EXIT;
+        }
+        if (i2c_smbus_write_byte_data(client,
+                        fan_reg_hi[ix], data->fan[ix] >> 8)) {
+                dev_err(&client->dev, "Register write error, aborting.\n");
+                count = -EIO;
+        }
+EXIT:
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+
+
+static ssize_t get_fan1_div(
+                struct device *dev,
+                struct device_attribute *devattr,
+                char *buf)
+{
+        struct amc6821_data *data = amc6821_update_device(dev);
+        return sprintf(buf, "%d\n", data->fan1_div);
+}
+
+static ssize_t set_fan1_div(
+                struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        long val;
+        int config = strict_strtol(buf, 10, &val);
+        if (config)
+                return config;
+
+        config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF4);
+        if (config < 0) {
+                dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                return -EIO;
+        }
+        mutex_lock(&data->update_lock);
+        switch (val) {
+        case 2:
+                config &= ~AMC6821_CONF4_PSPR;
+                data->fan1_div = 2;
+                break;
+        case 4:
+                config |= AMC6821_CONF4_PSPR;
+                data->fan1_div = 4;
+                break;
+        default:
+                count = -EINVAL;
+                goto EXIT;
+        }
+        if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF4, config)) {
+                dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                count = -EIO;
+        }
+EXIT:
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
+        get_temp, NULL, IDX_TEMP1_INPUT);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP1_MIN);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP1_MAX);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP1_CRIT);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP1_MIN);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP1_MAX);
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP1_CRIT);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO | S_IWUSR,
+        get_temp, NULL, IDX_TEMP2_INPUT);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP2_MIN);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP2_MAX);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO | S_IWUSR, get_temp,
+        set_temp, IDX_TEMP2_CRIT);
+static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO,
+        get_temp2_fault, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP2_MIN);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP2_MAX);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO,
+        get_temp_alarm, NULL, IDX_TEMP2_CRIT);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, get_fan, NULL, IDX_FAN1_INPUT);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO | S_IWUSR,
+        get_fan, set_fan, IDX_FAN1_MIN);
+static SENSOR_DEVICE_ATTR(fan1_max, S_IRUGO | S_IWUSR,
+        get_fan, set_fan, IDX_FAN1_MAX);
+static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, get_fan1_fault, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,
+        get_fan1_div, set_fan1_div, 0);
+
+static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, get_pwm1, set_pwm1, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
+        get_pwm1_enable, set_pwm1_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_auto_point1_pwm, S_IRUGO,
+        get_pwm1_auto_point_pwm, NULL, 0);
+static SENSOR_DEVICE_ATTR(pwm1_auto_point2_pwm, S_IWUSR | S_IRUGO,
+        get_pwm1_auto_point_pwm, set_pwm1_auto_point_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm1_auto_point3_pwm, S_IRUGO,
+        get_pwm1_auto_point_pwm, NULL, 2);
+static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, S_IRUGO,
+        get_pwm1_auto_channels_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_auto_point1_temp, S_IRUGO,
+        get_temp_auto_point_temp, NULL, 1, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_auto_point2_temp, S_IWUSR | S_IRUGO,
+        get_temp_auto_point_temp, set_temp_auto_point_temp, 1, 1);
+static SENSOR_DEVICE_ATTR_2(temp1_auto_point3_temp, S_IWUSR | S_IRUGO,
+        get_temp_auto_point_temp, set_temp_auto_point_temp, 1, 2);
+
+static SENSOR_DEVICE_ATTR_2(temp2_auto_point1_temp, S_IWUSR | S_IRUGO,
+        get_temp_auto_point_temp, set_temp_auto_point_temp, 2, 0);
+static SENSOR_DEVICE_ATTR_2(temp2_auto_point2_temp, S_IWUSR | S_IRUGO,
+        get_temp_auto_point_temp, set_temp_auto_point_temp, 2, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_auto_point3_temp, S_IWUSR | S_IRUGO,
+        get_temp_auto_point_temp, set_temp_auto_point_temp, 2, 2);
+
+
+
+static struct attribute *amc6821_attrs[] = {
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_min.dev_attr.attr,
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_crit.dev_attr.attr,
+        &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_min.dev_attr.attr,
+        &sensor_dev_attr_temp2_max.dev_attr.attr,
+        &sensor_dev_attr_temp2_crit.dev_attr.attr,
+        &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_fault.dev_attr.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_max.dev_attr.attr,
+        &sensor_dev_attr_fan1_fault.dev_attr.attr,
+        &sensor_dev_attr_fan1_div.dev_attr.attr,
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_channels_temp.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_point2_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_point3_pwm.dev_attr.attr,
+        &sensor_dev_attr_temp1_auto_point1_temp.dev_attr.attr,
+        &sensor_dev_attr_temp1_auto_point2_temp.dev_attr.attr,
+        &sensor_dev_attr_temp1_auto_point3_temp.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_point1_temp.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_point2_temp.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_point3_temp.dev_attr.attr,
+        NULL
+};
+
+static struct attribute_group amc6821_attr_grp = {
+        .attrs = amc6821_attrs,
+};
+
+
+
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int amc6821_detect(
+                struct i2c_client *client,
+                struct i2c_board_info *info)
+{
+        struct i2c_adapter *adapter = client->adapter;
+        int address = client->addr;
+        int dev_id, comp_id;
+
+        dev_dbg(&adapter->dev, "amc6821_detect called.\n");
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_dbg(&adapter->dev,
+                        "amc6821: I2C bus doesn't support byte mode, "
+                        "skipping.\n");
+                return -ENODEV;
+        }
+
+        dev_id = i2c_smbus_read_byte_data(client, AMC6821_REG_DEV_ID);
+        comp_id = i2c_smbus_read_byte_data(client, AMC6821_REG_COMP_ID);
+        if (dev_id != 0x21 || comp_id != 0x49) {
+                dev_dbg(&adapter->dev,
+                        "amc6821: detection failed at 0x%02x.\n",
+                        address);
+                return -ENODEV;
+        }
+
+        /* Bit 7 of the address register is ignored, so we can check the
+           ID registers again */
+        dev_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_DEV_ID);
+        comp_id = i2c_smbus_read_byte_data(client, 0x80 | AMC6821_REG_COMP_ID);
+        if (dev_id != 0x21 || comp_id != 0x49) {
+                dev_dbg(&adapter->dev,
+                        "amc6821: detection failed at 0x%02x.\n",
+                        address);
+                return -ENODEV;
+        }
+
+        dev_info(&adapter->dev, "amc6821: chip found at 0x%02x.\n", address);
+        strlcpy(info->type, "amc6821", I2C_NAME_SIZE);
+
+        return 0;
+}
+
+static int amc6821_probe(
+        struct i2c_client *client,
+        const struct i2c_device_id *id)
+{
+        struct amc6821_data *data;
+        int err;
+
+        data = kzalloc(sizeof(struct amc6821_data), GFP_KERNEL);
+        if (!data) {
+                dev_err(&client->dev, "out of memory.\n");
+                return -ENOMEM;
+        }
+
+
+        i2c_set_clientdata(client, data);
+        mutex_init(&data->update_lock);
+
+        /*
+         * Initialize the amc6821 chip
+         */
+        err = amc6821_init_client(client);
+        if (err)
+                goto err_free;
+
+        err = sysfs_create_group(&client->dev.kobj, &amc6821_attr_grp);
+        if (err)
+                goto err_free;
+
+        data->hwmon_dev = hwmon_device_register(&client->dev);
+        if (!IS_ERR(data->hwmon_dev))
+                return 0;
+
+        err = PTR_ERR(data->hwmon_dev);
+        dev_err(&client->dev, "error registering hwmon device.\n");
+        sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
+err_free:
+        kfree(data);
+        return err;
+}
+
+static int amc6821_remove(struct i2c_client *client)
+{
+        struct amc6821_data *data = i2c_get_clientdata(client);
+
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
+
+        kfree(data);
+
+        return 0;
+}
+
+
+static int amc6821_init_client(struct i2c_client *client)
+{
+        int config;
+        int err = -EIO;
+
+        if (init) {
+                config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF4);
+
+                if (config < 0) {
+                                dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                                return err;
+                }
+
+                config |= AMC6821_CONF4_MODE;
+
+                if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF4,
+                                config)) {
+                        dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                        return err;
+                }
+
+                config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF3);
+
+                if (config < 0) {
+                        dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                        return err;
+                }
+
+                dev_info(&client->dev, "Revision %d\n", config & 0x0f);
+
+                config &= ~AMC6821_CONF3_THERM_FAN_EN;
+
+                if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF3,
+                                config)) {
+                        dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                        return err;
+                }
+
+                config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF2);
+
+                if (config < 0) {
+                        dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                        return err;
+                }
+
+                config &= ~AMC6821_CONF2_RTFIE;
+                config &= ~AMC6821_CONF2_LTOIE;
+                config &= ~AMC6821_CONF2_RTOIE;
+                if (i2c_smbus_write_byte_data(client,
+                                AMC6821_REG_CONF2, config)) {
+                        dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                        return err;
+                }
+
+                config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF1);
+
+                if (config < 0) {
+                        dev_err(&client->dev,
+                        "Error reading configuration register, aborting.\n");
+                        return err;
+                }
+
+                config &= ~AMC6821_CONF1_THERMOVIE;
+                config &= ~AMC6821_CONF1_FANIE;
+                config |= AMC6821_CONF1_START;
+                if (pwminv)
+                        config |= AMC6821_CONF1_PWMINV;
+                else
+                        config &= ~AMC6821_CONF1_PWMINV;
+
+                if (i2c_smbus_write_byte_data(
+                                client, AMC6821_REG_CONF1, config)) {
+                        dev_err(&client->dev,
+                        "Configuration register write error, aborting.\n");
+                        return err;
+                }
+        }
+        return 0;
+}
+
+
+static struct amc6821_data *amc6821_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct amc6821_data *data = i2c_get_clientdata(client);
+        int timeout = HZ;
+        u8 reg;
+        int i;
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + timeout) ||
+                        !data->valid) {
+
+                for (i = 0; i < TEMP_IDX_LEN; i++)
+                        data->temp[i] = i2c_smbus_read_byte_data(client,
+                                temp_reg[i]);
+
+                data->stat1 = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_STAT1);
+                data->stat2 = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_STAT2);
+
+                data->pwm1 = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_DCY);
+                for (i = 0; i < FAN1_IDX_LEN; i++) {
+                        data->fan[i] = i2c_smbus_read_byte_data(
+                                        client,
+                                        fan_reg_low[i]);
+                        data->fan[i] += i2c_smbus_read_byte_data(
+                                        client,
+                                        fan_reg_hi[i]) << 8;
+                }
+                data->fan1_div = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_CONF4);
+                data->fan1_div = data->fan1_div & AMC6821_CONF4_PSPR ? 4 : 2;
+
+                data->pwm1_auto_point_pwm[0] = 0;
+                data->pwm1_auto_point_pwm[2] = 255;
+                data->pwm1_auto_point_pwm[1] = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_DCY_LOW_TEMP);
+
+                data->temp1_auto_point_temp[0] =
+                        i2c_smbus_read_byte_data(client,
+                                        AMC6821_REG_PSV_TEMP);
+                data->temp2_auto_point_temp[0] =
+                                data->temp1_auto_point_temp[0];
+                reg = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_LTEMP_FAN_CTRL);
+                data->temp1_auto_point_temp[1] = (reg & 0xF8) >> 1;
+                reg &= 0x07;
+                reg = 0x20 >> reg;
+                if (reg > 0)
+                        data->temp1_auto_point_temp[2] =
+                                data->temp1_auto_point_temp[1] +
+                                (data->pwm1_auto_point_pwm[2] -
+                                data->pwm1_auto_point_pwm[1]) / reg;
+                else
+                        data->temp1_auto_point_temp[2] = 255;
+
+                reg = i2c_smbus_read_byte_data(client,
+                        AMC6821_REG_RTEMP_FAN_CTRL);
+                data->temp2_auto_point_temp[1] = (reg & 0xF8) >> 1;
+                reg &= 0x07;
+                reg = 0x20 >> reg;
+                if (reg > 0)
+                        data->temp2_auto_point_temp[2] =
+                                data->temp2_auto_point_temp[1] +
+                                (data->pwm1_auto_point_pwm[2] -
+                                data->pwm1_auto_point_pwm[1]) / reg;
+                else
+                        data->temp2_auto_point_temp[2] = 255;
+
+                reg = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF1);
+                reg = (reg >> 5) & 0x3;
+                switch (reg) {
+                case 0: /*open loop: software sets pwm1*/
+                        data->pwm1_auto_channels_temp = 0;
+                        data->pwm1_enable = 1;
+                        break;
+                case 2: /*closed loop: remote T (temp2)*/
+                        data->pwm1_auto_channels_temp = 2;
+                        data->pwm1_enable = 2;
+                        break;
+                case 3: /*closed loop: local and remote T (temp2)*/
+                        data->pwm1_auto_channels_temp = 3;
+                        data->pwm1_enable = 3;
+                        break;
+                case 1: /*semi-open loop: software sets rpm, chip controls pwm1,
+                          *currently not implemented
+                          */
+                        data->pwm1_auto_channels_temp = 0;
+                        data->pwm1_enable = 0;
+                        break;
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+        mutex_unlock(&data->update_lock);
+        return data;
+}
+
+
+static int __init amc6821_init(void)
+{
+        return i2c_add_driver(&amc6821_driver);
+}
+
+static void __exit amc6821_exit(void)
+{
+        i2c_del_driver(&amc6821_driver);
+}
+
+module_init(amc6821_init);
+module_exit(amc6821_exit);
+
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("T. Mertelj <tomaz.mertelj@guest.arnes.si>");
+MODULE_DESCRIPTION("Texas Instruments amc6821 hwmon driver");
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index 5a3ee00c0e7d..028284f544e3 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -5,6 +5,7 @@
  * See COPYING in the top level directory of the kernel tree.
  */
 
+#include <linux/debugfs.h>
 #include <linux/kernel.h>
 #include <linux/hwmon.h>
 #include <linux/list.h>
@@ -101,6 +102,11 @@ struct atk_data {
         int temperature_count;
         int fan_count;
         struct list_head sensor_list;
+
+        struct {
+                struct dentry *root;
+                u32 id;
+        } debugfs;
 };
 
 
@@ -624,6 +630,187 @@ static int atk_read_value(struct atk_sensor_data *sensor, u64 *value)
         return err;
 }
 
+#ifdef CONFIG_DEBUG_FS
+static int atk_debugfs_gitm_get(void *p, u64 *val)
+{
+        struct atk_data *data = p;
+        union acpi_object *ret;
+        struct atk_acpi_ret_buffer *buf;
+        int err = 0;
+
+        if (!data->read_handle)
+                return -ENODEV;
+
+        if (!data->debugfs.id)
+                return -EINVAL;
+
+        ret = atk_gitm(data, data->debugfs.id);
+        if (IS_ERR(ret))
+                return PTR_ERR(ret);
+
+        buf = (struct atk_acpi_ret_buffer *)ret->buffer.pointer;
+        if (buf->flags)
+                *val = buf->value;
+        else
+                err = -EIO;
+
+        return err;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(atk_debugfs_gitm,
+                        atk_debugfs_gitm_get,
+                        NULL,
+                        "0x%08llx\n")
+
+static int atk_acpi_print(char *buf, size_t sz, union acpi_object *obj)
+{
+        int ret = 0;
+
+        switch (obj->type) {
+        case ACPI_TYPE_INTEGER:
+                ret = snprintf(buf, sz, "0x%08llx\n", obj->integer.value);
+                break;
+        case ACPI_TYPE_STRING:
+                ret = snprintf(buf, sz, "%s\n", obj->string.pointer);
+                break;
+        }
+
+        return ret;
+}
+
+static void atk_pack_print(char *buf, size_t sz, union acpi_object *pack)
+{
+        int ret;
+        int i;
+
+        for (i = 0; i < pack->package.count; i++) {
+                union acpi_object *obj = &pack->package.elements[i];
+
+                ret = atk_acpi_print(buf, sz, obj);
+                if (ret >= sz)
+                        break;
+                buf += ret;
+                sz -= ret;
+        }
+}
+
+static int atk_debugfs_ggrp_open(struct inode *inode, struct file *file)
+{
+        struct atk_data *data = inode->i_private;
+        char *buf = NULL;
+        union acpi_object *ret;
+        u8 cls;
+        int i;
+
+        if (!data->enumerate_handle)
+                return -ENODEV;
+        if (!data->debugfs.id)
+                return -EINVAL;
+
+        cls = (data->debugfs.id & 0xff000000) >> 24;
+        ret = atk_ggrp(data, cls);
+        if (IS_ERR(ret))
+                return PTR_ERR(ret);
+
+        for (i = 0; i < ret->package.count; i++) {
+                union acpi_object *pack = &ret->package.elements[i];
+                union acpi_object *id;
+
+                if (pack->type != ACPI_TYPE_PACKAGE)
+                        continue;
+                if (!pack->package.count)
+                        continue;
+                id = &pack->package.elements[0];
+                if (id->integer.value == data->debugfs.id) {
+                        /* Print the package */
+                        buf = kzalloc(512, GFP_KERNEL);
+                        if (!buf) {
+                                ACPI_FREE(ret);
+                                return -ENOMEM;
+                        }
+                        atk_pack_print(buf, 512, pack);
+                        break;
+                }
+        }
+        ACPI_FREE(ret);
+
+        if (!buf)
+                return -EINVAL;
+
+        file->private_data = buf;
+
+        return nonseekable_open(inode, file);
+}
+
+static ssize_t atk_debugfs_ggrp_read(struct file *file, char __user *buf,
+                size_t count, loff_t *pos)
+{
+        char *str = file->private_data;
+        size_t len = strlen(str);
+
+        return simple_read_from_buffer(buf, count, pos, str, len);
+}
+
+static int atk_debugfs_ggrp_release(struct inode *inode, struct file *file)
+{
+        kfree(file->private_data);
+        return 0;
+}
+
+static const struct file_operations atk_debugfs_ggrp_fops = {
+        .read           = atk_debugfs_ggrp_read,
+        .open           = atk_debugfs_ggrp_open,
+        .release        = atk_debugfs_ggrp_release,
+};
+
+static void atk_debugfs_init(struct atk_data *data)
+{
+        struct dentry *d;
+        struct dentry *f;
+
+        data->debugfs.id = 0;
+
+        d = debugfs_create_dir("asus_atk0110", NULL);
+        if (!d || IS_ERR(d))
+                return;
+
+        f = debugfs_create_x32("id", S_IRUSR | S_IWUSR, d, &data->debugfs.id);
+        if (!f || IS_ERR(f))
+                goto cleanup;
+
+        f = debugfs_create_file("gitm", S_IRUSR, d, data,
+                        &atk_debugfs_gitm);
+        if (!f || IS_ERR(f))
+                goto cleanup;
+
+        f = debugfs_create_file("ggrp", S_IRUSR, d, data,
+                        &atk_debugfs_ggrp_fops);
+        if (!f || IS_ERR(f))
+                goto cleanup;
+
+        data->debugfs.root = d;
+
+        return;
+cleanup:
+        debugfs_remove_recursive(d);
+}
+
+static void atk_debugfs_cleanup(struct atk_data *data)
+{
+        debugfs_remove_recursive(data->debugfs.root);
+}
+
+#else /* CONFIG_DEBUG_FS */
+
+static void atk_debugfs_init(struct atk_data *data)
+{
+}
+
+static void atk_debugfs_cleanup(struct atk_data *data)
+{
+}
+#endif
+
 static int atk_add_sensor(struct atk_data *data, union acpi_object *obj)
 {
         struct device *dev = &data->acpi_dev->dev;
@@ -1047,76 +1234,75 @@ remove:
         return err;
 }
 
-static int atk_check_old_if(struct atk_data *data)
+static int atk_probe_if(struct atk_data *data)
 {
         struct device *dev = &data->acpi_dev->dev;
         acpi_handle ret;
         acpi_status status;
+        int err = 0;
 
         /* RTMP: read temperature */
         status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_TMP, &ret);
-        if (status != AE_OK) {
+        if (ACPI_SUCCESS(status))
+                data->rtmp_handle = ret;
+        else
                 dev_dbg(dev, "method " METHOD_OLD_READ_TMP " not found: %s\n",
                                 acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->rtmp_handle = ret;
 
         /* RVLT: read voltage */
         status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_VLT, &ret);
-        if (status != AE_OK) {
+        if (ACPI_SUCCESS(status))
+                data->rvlt_handle = ret;
+        else
                 dev_dbg(dev, "method " METHOD_OLD_READ_VLT " not found: %s\n",
                                 acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->rvlt_handle = ret;
 
         /* RFAN: read fan status */
         status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_FAN, &ret);
-        if (status != AE_OK) {
+        if (ACPI_SUCCESS(status))
+                data->rfan_handle = ret;
+        else
                 dev_dbg(dev, "method " METHOD_OLD_READ_FAN " not found: %s\n",
                                 acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->rfan_handle = ret;
-
-        return 0;
-}
-
-static int atk_check_new_if(struct atk_data *data)
-{
-        struct device *dev = &data->acpi_dev->dev;
-        acpi_handle ret;
-        acpi_status status;
 
         /* Enumeration */
         status = acpi_get_handle(data->atk_handle, METHOD_ENUMERATE, &ret);
-        if (status != AE_OK) {
+        if (ACPI_SUCCESS(status))
+                data->enumerate_handle = ret;
+        else
                 dev_dbg(dev, "method " METHOD_ENUMERATE " not found: %s\n",
                                 acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->enumerate_handle = ret;
 
         /* De-multiplexer (read) */
         status = acpi_get_handle(data->atk_handle, METHOD_READ, &ret);
-        if (status != AE_OK) {
+        if (ACPI_SUCCESS(status))
+                data->read_handle = ret;
+        else
                 dev_dbg(dev, "method " METHOD_READ " not found: %s\n",
                                 acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->read_handle = ret;
 
         /* De-multiplexer (write) */
         status = acpi_get_handle(data->atk_handle, METHOD_WRITE, &ret);
-        if (status != AE_OK) {
-                dev_dbg(dev, "method " METHOD_READ " not found: %s\n",
+        if (ACPI_SUCCESS(status))
+                data->write_handle = ret;
+        else
+                dev_dbg(dev, "method " METHOD_WRITE " not found: %s\n",
                                  acpi_format_exception(status));
-                return -ENODEV;
-        }
-        data->write_handle = ret;
 
-        return 0;
+        /* Check for hwmon methods: first check "old" style methods; note that
+         * both may be present: in this case we stick to the old interface;
+         * analysis of multiple DSDTs indicates that when both interfaces
+         * are present the new one (GGRP/GITM) is not functional.
+         */
+        if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle)
+                data->old_interface = true;
+        else if (data->enumerate_handle && data->read_handle &&
+                        data->write_handle)
+                data->old_interface = false;
+        else
+                err = -ENODEV;
+
+        return err;
 }
 
 static int atk_add(struct acpi_device *device)
@@ -1143,40 +1329,30 @@ static int atk_add(struct acpi_device *device)
                         &buf, ACPI_TYPE_PACKAGE);
         if (ret != AE_OK) {
                 dev_dbg(&device->dev, "atk: method MBIF not found\n");
-                err = -ENODEV;
-                goto out;
+        } else {
+                obj = buf.pointer;
+                if (obj->package.count >= 2) {
+                        union acpi_object *id = &obj->package.elements[1];
+                        if (id->type == ACPI_TYPE_STRING)
+                                dev_dbg(&device->dev, "board ID = %s\n",
+                                        id->string.pointer);
+                }
+                ACPI_FREE(buf.pointer);
         }
 
-        obj = buf.pointer;
-        if (obj->package.count >= 2 &&
-                        obj->package.elements[1].type == ACPI_TYPE_STRING) {
-                dev_dbg(&device->dev, "board ID = %s\n",
-                                obj->package.elements[1].string.pointer);
+        err = atk_probe_if(data);
+        if (err) {
+                dev_err(&device->dev, "No usable hwmon interface detected\n");
+                goto out;
         }
-        ACPI_FREE(buf.pointer);
 
-        /* Check for hwmon methods: first check "old" style methods; note that
-         * both may be present: in this case we stick to the old interface;
-         * analysis of multiple DSDTs indicates that when both interfaces
-         * are present the new one (GGRP/GITM) is not functional.
-         */
-        err = atk_check_old_if(data);
-        if (!err) {
+        if (data->old_interface) {
                 dev_dbg(&device->dev, "Using old hwmon interface\n");
-                data->old_interface = true;
+                err = atk_enumerate_old_hwmon(data);
         } else {
-                err = atk_check_new_if(data);
-                if (err)
-                        goto out;
-
                 dev_dbg(&device->dev, "Using new hwmon interface\n");
-                data->old_interface = false;
-        }
-
-        if (data->old_interface)
-                err = atk_enumerate_old_hwmon(data);
-        else
                 err = atk_enumerate_new_hwmon(data);
+        }
         if (err < 0)
                 goto out;
         if (err == 0) {
@@ -1190,6 +1366,8 @@ static int atk_add(struct acpi_device *device)
         if (err)
                 goto cleanup;
 
+        atk_debugfs_init(data);
+
         device->driver_data = data;
         return 0;
 cleanup:
@@ -1208,6 +1386,8 @@ static int atk_remove(struct acpi_device *device, int type)
 
         device->driver_data = NULL;
 
+        atk_debugfs_cleanup(data);
+
         atk_remove_files(data);
         atk_free_sensors(data);
         hwmon_device_unregister(data->hwmon_dev);
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index caef39cda8c8..2d7bceeed0bc 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -33,6 +33,7 @@
 #include <linux/list.h>
 #include <linux/platform_device.h>
 #include <linux/cpu.h>
+#include <linux/pci.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 
@@ -161,6 +162,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
         int usemsr_ee = 1;
         int err;
         u32 eax, edx;
+        struct pci_dev *host_bridge;
 
         /* Early chips have no MSR for TjMax */
 
@@ -168,11 +170,21 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
                 usemsr_ee = 0;
         }
 
-        /* Atoms seems to have TjMax at 90C */
+        /* Atom CPUs */
 
         if (c->x86_model == 0x1c) {
                 usemsr_ee = 0;
-                tjmax = 90000;
+
+                host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+
+                if (host_bridge && host_bridge->vendor == PCI_VENDOR_ID_INTEL
+                    && (host_bridge->device == 0xa000   /* NM10 based nettop */
+                    || host_bridge->device == 0xa010))  /* NM10 based netbook */
+                        tjmax = 100000;
+                else
+                        tjmax = 90000;
+
+                pci_dev_put(host_bridge);
         }
 
         if ((c->x86_model > 0xe) && (usemsr_ee)) {
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index bd0fc67e804b..fa0728232e71 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -768,6 +768,7 @@ leave:
 static int watchdog_open(struct inode *inode, struct file *filp)
 {
         struct fschmd_data *pos, *data = NULL;
+        int watchdog_is_open;
 
         /* We get called from drivers/char/misc.c with misc_mtx hold, and we
            call misc_register() from fschmd_probe() with watchdog_data_mutex
@@ -782,10 +783,12 @@ static int watchdog_open(struct inode *inode, struct file *filp)
                 }
         }
         /* Note we can never not have found data, so we don't check for this */
-        kref_get(&data->kref);
+        watchdog_is_open = test_and_set_bit(0, &data->watchdog_is_open);
+        if (!watchdog_is_open)
+                kref_get(&data->kref);
         mutex_unlock(&watchdog_data_mutex);
 
-        if (test_and_set_bit(0, &data->watchdog_is_open))
+        if (watchdog_is_open)
                 return -EBUSY;
 
         /* Start the watchdog */
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index d8a26d16d948..099a2138cdf6 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -33,6 +33,16 @@ static bool force;
 module_param(force, bool, 0444);
 MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
 
+/* CPUID function 0x80000001, ebx */
+#define CPUID_PKGTYPE_MASK      0xf0000000
+#define CPUID_PKGTYPE_F         0x00000000
+#define CPUID_PKGTYPE_AM2R2_AM3 0x10000000
+
+/* DRAM controller (PCI function 2) */
+#define REG_DCT0_CONFIG_HIGH            0x094
+#define  DDR3_MODE                      0x00000100
+
+/* miscellaneous (PCI function 3) */
 #define REG_HARDWARE_THERMAL_CONTROL    0x64
 #define  HTC_ENABLE                     0x00000001
 
@@ -85,13 +95,28 @@ static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit, NULL, 1);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static bool __devinit has_erratum_319(void)
+static bool __devinit has_erratum_319(struct pci_dev *pdev)
 {
+        u32 pkg_type, reg_dram_cfg;
+
+        if (boot_cpu_data.x86 != 0x10)
+                return false;
+
         /*
-         * Erratum 319: The thermal sensor of older Family 10h processors
-         *              (B steppings) may be unreliable.
+         * Erratum 319: The thermal sensor of Socket F/AM2+ processors
+         *              may be unreliable.
          */
-        return boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model <= 2;
+        pkg_type = cpuid_ebx(0x80000001) & CPUID_PKGTYPE_MASK;
+        if (pkg_type == CPUID_PKGTYPE_F)
+                return true;
+        if (pkg_type != CPUID_PKGTYPE_AM2R2_AM3)
+                return false;
+
+        /* Differentiate between AM2+ (bad) and AM3 (good) */
+        pci_bus_read_config_dword(pdev->bus,
+                                  PCI_DEVFN(PCI_SLOT(pdev->devfn), 2),
+                                  REG_DCT0_CONFIG_HIGH, &reg_dram_cfg);
+        return !(reg_dram_cfg & DDR3_MODE);
 }
 
 static int __devinit k10temp_probe(struct pci_dev *pdev,
@@ -99,9 +124,10 @@ static int __devinit k10temp_probe(struct pci_dev *pdev,
 {
         struct device *hwmon_dev;
         u32 reg_caps, reg_htc;
+        int unreliable = has_erratum_319(pdev);
         int err;
 
-        if (has_erratum_319() && !force) {
+        if (unreliable && !force) {
                 dev_err(&pdev->dev,
                         "unreliable CPU thermal sensor; monitoring disabled\n");
                 err = -ENODEV;
@@ -139,7 +165,7 @@ static int __devinit k10temp_probe(struct pci_dev *pdev,
         }
         dev_set_drvdata(&pdev->dev, hwmon_dev);
 
-        if (has_erratum_319() && force)
+        if (unreliable && force)
                 dev_warn(&pdev->dev,
                          "unreliable CPU thermal sensor; check erratum 319\n");
         return 0;
@@ -169,7 +195,7 @@ static void __devexit k10temp_remove(struct pci_dev *pdev)
         dev_set_drvdata(&pdev->dev, NULL);
 }
 
-static struct pci_device_id k10temp_id_table[] = {
+static const struct pci_device_id k10temp_id_table[] = {
         { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
         { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
         {}
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 1fe995111841..0ceb6d6200a3 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -136,7 +136,7 @@ static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0);
 static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static struct pci_device_id k8temp_ids[] = {
+static const struct pci_device_id k8temp_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
         { 0 },
 };
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 12f2e7086560..79c2931e3008 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -697,7 +697,7 @@ static struct sis5595_data *sis5595_update_device(struct device *dev)
         return data;
 }
 
-static struct pci_device_id sis5595_pci_ids[] = {
+static const struct pci_device_id sis5595_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
         { 0, }
 };
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 9ca97818bd4b..8fa462f2b570 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -488,7 +488,7 @@ static int __init smsc47m1_find(unsigned short *addr,
 }
 
 /* Restore device to its initial state */
-static void __init smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
+static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
 {
         if ((sio_data->activate & 0x01) == 0) {
                 superio_enter();
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 39e82a492f26..f397ce7ad598 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -767,7 +767,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
         return data;
 }
 
-static struct pci_device_id via686a_pci_ids[] = {
+static const struct pci_device_id via686a_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
         { 0, }
 };
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 470a1226ba2b..d47b4c9949c2 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -697,7 +697,7 @@ static struct platform_driver vt8231_driver = {
         .remove = __devexit_p(vt8231_remove),
 };
 
-static struct pci_device_id vt8231_pci_ids[] = {
+static const struct pci_device_id vt8231_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index f70f46582c6c..4687af40dd50 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -87,9 +87,9 @@ static int ali1563_transaction(struct i2c_adapter * a, int size)
         outb_p(inb_p(SMB_HST_CNTL2) | HST_CNTL2_START, SMB_HST_CNTL2);
 
         timeout = ALI1563_MAX_TIMEOUT;
-        do
+        do {
                 msleep(1);
-        while (((data = inb_p(SMB_HST_STS)) & HST_STS_BUSY) && --timeout);
+        } while (((data = inb_p(SMB_HST_STS)) & HST_STS_BUSY) && --timeout);
 
         dev_dbg(&a->dev, "Transaction (post): STS=%02x, CNTL1=%02x, "
                 "CNTL2=%02x, CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n",
@@ -157,9 +157,9 @@ static int ali1563_block_start(struct i2c_adapter * a)
         outb_p(inb_p(SMB_HST_CNTL2) | HST_CNTL2_START, SMB_HST_CNTL2);
 
         timeout = ALI1563_MAX_TIMEOUT;
-        do
+        do {
                 msleep(1);
-        while (!((data = inb_p(SMB_HST_STS)) & HST_STS_DONE) && --timeout);
+        } while (!((data = inb_p(SMB_HST_STS)) & HST_STS_DONE) && --timeout);
 
         dev_dbg(&a->dev, "Block (post): STS=%02x, CNTL1=%02x, "
                 "CNTL2=%02x, CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n",
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index e3654d683e15..75bf820e7ccb 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -226,7 +226,6 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
                 temp = readb(i2c_imx->base + IMX_I2C_I2CR);
                 temp &= ~(I2CR_MSTA | I2CR_MTX);
                 writeb(temp, i2c_imx->base + IMX_I2C_I2CR);
-                i2c_imx->stopped = 1;
         }
         if (cpu_is_mx1()) {
                 /*
@@ -236,8 +235,10 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
                 udelay(i2c_imx->disable_delay);
         }
 
-        if (!i2c_imx->stopped)
+        if (!i2c_imx->stopped) {
                 i2c_imx_bus_busy(i2c_imx, 0);
+                i2c_imx->stopped = 1;
+        }
 
         /* Disable I2C controller */
         writeb(0, i2c_imx->base + IMX_I2C_I2CR);
@@ -496,22 +497,23 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
         }
 
         res_size = resource_size(res);
+
+        if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {
+                ret = -EBUSY;
+                goto fail0;
+        }
+
         base = ioremap(res->start, res_size);
         if (!base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -EIO;
-                goto fail0;
+                goto fail1;
         }
 
         i2c_imx = kzalloc(sizeof(struct imx_i2c_struct), GFP_KERNEL);
         if (!i2c_imx) {
                 dev_err(&pdev->dev, "can't allocate interface\n");
                 ret = -ENOMEM;
-                goto fail1;
-        }
-
-        if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {
-                ret = -EBUSY;
                 goto fail2;
         }
 
@@ -582,11 +584,11 @@ fail5:
 fail4:
         clk_put(i2c_imx->clk);
 fail3:
-        release_mem_region(i2c_imx->res->start, resource_size(res));
-fail2:
         kfree(i2c_imx);
-fail1:
+fail2:
         iounmap(base);
+fail1:
+        release_mem_region(res->start, resource_size(res));
 fail0:
         if (pdata && pdata->exit)
                 pdata->exit(&pdev->dev);
@@ -618,8 +620,8 @@ static int __exit i2c_imx_remove(struct platform_device *pdev)
 
         clk_put(i2c_imx->clk);
 
-        release_mem_region(i2c_imx->res->start, resource_size(i2c_imx->res));
         iounmap(i2c_imx->base);
+        release_mem_region(i2c_imx->res->start, resource_size(i2c_imx->res));
         kfree(i2c_imx);
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 0ed68e2ccd22..f7346a9bd95f 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(void *pd)
         unsigned long timeout;
 
         if (irq > -1) {
-                ret = wait_event_interruptible_timeout(pca_wait,
+                ret = wait_event_timeout(pca_wait,
                                 pca_isa_readbyte(pd, I2C_PCA_CON)
                                 & I2C_PCA_CON_SI, pca_isa_ops.timeout);
         } else {
@@ -96,7 +96,7 @@ static void pca_isa_resetchip(void *pd)
 }
 
 static irqreturn_t pca_handler(int this_irq, void *dev_id) {
-        wake_up_interruptible(&pca_wait);
+        wake_up(&pca_wait);
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index c4df9d411cd5..5b2213df5ed0 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(void *pd)
         unsigned long timeout;
 
         if (i2c->irq) {
-                ret = wait_event_interruptible_timeout(i2c->wait,
+                ret = wait_event_timeout(i2c->wait,
                         i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
                         & I2C_PCA_CON_SI, i2c->adap.timeout);
         } else {
@@ -122,7 +122,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
         if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
                 return IRQ_NONE;
 
-        wake_up_interruptible(&i2c->wait);
+        wake_up(&i2c->wait);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 1e245e9cad31..e56e4b6823ca 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -324,12 +324,12 @@ static int piix4_transaction(void)
         else
                 msleep(1);
 
-        while ((timeout++ < MAX_TIMEOUT) &&
+        while ((++timeout < MAX_TIMEOUT) &&
                ((temp = inb_p(SMBHSTSTS)) & 0x01))
                 msleep(1);
 
         /* If the SMBus is still busy, we give up */
-        if (timeout >= MAX_TIMEOUT) {
+        if (timeout == MAX_TIMEOUT) {
                 dev_err(&piix4_adapter.dev, "SMBus Timeout!\n");
                 result = -ETIMEDOUT;
         }
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index e4b1543015af..a84a909e1234 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -165,10 +165,10 @@ static int vt596_transaction(u8 size)
         do {
                 msleep(1);
                 temp = inb_p(SMBHSTSTS);
-        } while ((temp & 0x01) && (timeout++ < MAX_TIMEOUT));
+        } while ((temp & 0x01) && (++timeout < MAX_TIMEOUT));
 
         /* If the SMBus is still busy, we give up */
-        if (timeout >= MAX_TIMEOUT) {
+        if (timeout == MAX_TIMEOUT) {
                 result = -ETIMEDOUT;
                 dev_err(&vt596_adapter.dev, "SMBus timeout!\n");
         }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 0ac2f90ab840..10be7b5fbe97 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -248,7 +248,7 @@ static const struct attribute_group *i2c_dev_attr_groups[] = {
         NULL
 };
 
-const static struct dev_pm_ops i2c_device_pm_ops = {
+static const struct dev_pm_ops i2c_device_pm_ops = {
         .suspend = i2c_device_pm_suspend,
         .resume = i2c_device_pm_resume,
 };
@@ -843,6 +843,9 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                                  adap->dev.parent);
 #endif
 
+        /* device name is gone after device_unregister */
+        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
+
         /* clean up the sysfs representation */
         init_completion(&adap->dev_released);
         device_unregister(&adap->dev);
@@ -855,8 +858,6 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         idr_remove(&i2c_adapter_idr, adap->nr);
         mutex_unlock(&core_lock);
 
-        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
-
         /* Clear the device structure in case this adapter is ever going to be
            added again */
         memset(&adap->dev, 0, sizeof(adap->dev));
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index fbdd73106000..cc9b5940fa97 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2083,7 +2083,7 @@ static int cma_get_port(struct rdma_id_private *id_priv)
 static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
                                struct sockaddr *addr)
 {
-#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct sockaddr_in6 *sin6;
 
         if (addr->sa_family != AF_INET6)
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index b3684060465e..100da8542bba 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -346,10 +346,8 @@ static int ipathfs_fill_super(struct super_block *sb, void *data,
         list_for_each_entry_safe(dd, tmp, &ipath_dev_list, ipath_list) {
                 spin_unlock_irqrestore(&ipath_devs_lock, flags);
                 ret = create_device_files(sb, dd);
-                if (ret) {
-                        deactivate_locked_super(sb);
+                if (ret)
                         goto bail;
-                }
                 spin_lock_irqsave(&ipath_devs_lock, flags);
         }
 
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 989555cee883..2a97c964b9ef 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1752,7 +1752,7 @@ int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         ind = qp->rq.head & (qp->rq.wqe_cnt - 1);
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
-                if (mlx4_wq_overflow(&qp->rq, nreq, qp->ibqp.send_cq)) {
+                if (mlx4_wq_overflow(&qp->rq, nreq, qp->ibqp.recv_cq)) {
                         err = -ENOMEM;
                         *bad_wr = wr;
                         goto out;
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index d42565258fb7..cf8085bcbd6d 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -74,6 +74,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
         struct mlx4_ib_dev *dev = to_mdev(pd->device);
         struct mlx4_ib_srq *srq;
         struct mlx4_wqe_srq_next_seg *next;
+        struct mlx4_wqe_data_seg *scatter;
         int desc_size;
         int buf_size;
         int err;
@@ -149,6 +150,11 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                         next = get_wqe(srq, i);
                         next->next_wqe_index =
                                 cpu_to_be16((i + 1) & (srq->msrq.max - 1));
+
+                        for (scatter = (void *) (next + 1);
+                             (void *) scatter < (void *) next + desc_size;
+                             ++scatter)
+                                scatter->lkey = cpu_to_be32(MLX4_INVALID_LKEY);
                 }
 
                 err = mlx4_mtt_init(dev->dev, srq->buf.npages, srq->buf.page_shift,
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index dee6706038aa..258c639571b5 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -59,7 +59,8 @@ static void evdev_pass_event(struct evdev_client *client,
         client->head &= EVDEV_BUFFER_SIZE - 1;
         spin_unlock(&client->buffer_lock);
 
-        kill_fasync(&client->fasync, SIGIO, POLL_IN);
+        if (event->type == EV_SYN)
+                kill_fasync(&client->fasync, SIGIO, POLL_IN);
 }
 
 /*
diff --git a/drivers/input/input.c b/drivers/input/input.c
index ab060710688f..86cb2d2196ff 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -24,6 +24,7 @@
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>
 #include <linux/smp_lock.h>
+#include "input-compat.h"
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
@@ -45,6 +46,7 @@ static unsigned int input_abs_bypass_init_data[] __initdata = {
         ABS_MT_TOOL_TYPE,
         ABS_MT_BLOB_ID,
         ABS_MT_TRACKING_ID,
+        ABS_MT_PRESSURE,
         0
 };
 static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)];
@@ -764,6 +766,40 @@ static int input_attach_handler(struct input_dev *dev, struct input_handler *han
         return error;
 }
 
+#ifdef CONFIG_COMPAT
+
+static int input_bits_to_string(char *buf, int buf_size,
+                                unsigned long bits, bool skip_empty)
+{
+        int len = 0;
+
+        if (INPUT_COMPAT_TEST) {
+                u32 dword = bits >> 32;
+                if (dword || !skip_empty)
+                        len += snprintf(buf, buf_size, "%x ", dword);
+
+                dword = bits & 0xffffffffUL;
+                if (dword || !skip_empty || len)
+                        len += snprintf(buf + len, max(buf_size - len, 0),
+                                        "%x", dword);
+        } else {
+                if (bits || !skip_empty)
+                        len += snprintf(buf, buf_size, "%lx", bits);
+        }
+
+        return len;
+}
+
+#else /* !CONFIG_COMPAT */
+
+static int input_bits_to_string(char *buf, int buf_size,
+                                unsigned long bits, bool skip_empty)
+{
+        return bits || !skip_empty ?
+                snprintf(buf, buf_size, "%lx", bits) : 0;
+}
+
+#endif
 
 #ifdef CONFIG_PROC_FS
 
@@ -832,14 +868,25 @@ static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
                                    unsigned long *bitmap, int max)
 {
         int i;
-
-        for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)
-                if (bitmap[i])
-                        break;
+        bool skip_empty = true;
+        char buf[18];
 
         seq_printf(seq, "B: %s=", name);
-        for (; i >= 0; i--)
-                seq_printf(seq, "%lx%s", bitmap[i], i > 0 ? " " : "");
+
+        for (i = BITS_TO_LONGS(max) - 1; i >= 0; i--) {
+                if (input_bits_to_string(buf, sizeof(buf),
+                                         bitmap[i], skip_empty)) {
+                        skip_empty = false;
+                        seq_printf(seq, "%s%s", buf, i > 0 ? " " : "");
+                }
+        }
+
+        /*
+         * If no output was produced print a single 0.
+         */
+        if (skip_empty)
+                seq_puts(seq, "0");
+
         seq_putc(seq, '\n');
 }
 
@@ -1128,14 +1175,23 @@ static int input_print_bitmap(char *buf, int buf_size, unsigned long *bitmap,
 {
         int i;
         int len = 0;
+        bool skip_empty = true;
+
+        for (i = BITS_TO_LONGS(max) - 1; i >= 0; i--) {
+                len += input_bits_to_string(buf + len, max(buf_size - len, 0),
+                                            bitmap[i], skip_empty);
+                if (len) {
+                        skip_empty = false;
+                        if (i > 0)
+                                len += snprintf(buf + len, max(buf_size - len, 0), " ");
+                }
+        }
 
-        for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)
-                if (bitmap[i])
-                        break;
-
-        for (; i >= 0; i--)
-                len += snprintf(buf + len, max(buf_size - len, 0),
-                                "%lx%s", bitmap[i], i > 0 ? " " : "");
+        /*
+         * If no output was produced print a single 0.
+         */
+        if (len == 0)
+                len = snprintf(buf, buf_size, "%d", 0);
 
         if (add_cr)
                 len += snprintf(buf + len, max(buf_size - len, 0), "\n");
@@ -1150,7 +1206,8 @@ static ssize_t input_dev_show_cap_##bm(struct device *dev,		\
 {                                                                       \
         struct input_dev *input_dev = to_input_dev(dev);                \
         int len = input_print_bitmap(buf, PAGE_SIZE,                    \
-                                     input_dev->bm##bit, ev##_MAX, 1);  \
+                                     input_dev->bm##bit, ev##_MAX,      \
+                                     true);                             \
         return min_t(int, len, PAGE_SIZE);                              \
 }                                                                       \
 static DEVICE_ATTR(bm, S_IRUGO, input_dev_show_cap_##bm, NULL)
@@ -1214,7 +1271,7 @@ static int input_add_uevent_bm_var(struct kobj_uevent_env *env,
 
         len = input_print_bitmap(&env->buf[env->buflen - 1],
                                  sizeof(env->buf) - env->buflen,
-                                 bitmap, max, 0);
+                                 bitmap, max, false);
         if (len >= (sizeof(env->buf) - env->buflen))
                 return -ENOMEM;
 
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 67c207f5b1a1..45ac70eae0aa 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -277,7 +277,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
         }
 
 #ifdef RESET_WORKS
-        if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) ||
+        if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) &&
             (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) {
                 err = -ENODEV;
                 goto fail2;
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 482cb1204e43..8a28fb7846dc 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -446,7 +446,7 @@ static void xpad_irq_in(struct urb *urb)
         }
 
 exit:
-        retval = usb_submit_urb (urb, GFP_ATOMIC);
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
                 err ("%s - usb_submit_urb failed with result %d",
                      __func__, retval);
@@ -571,7 +571,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data,
                 xpad->odata[6] = 0x00;
                 xpad->odata[7] = 0x00;
                 xpad->irq_out->transfer_buffer_length = 8;
-                usb_submit_urb(xpad->irq_out, GFP_KERNEL);
+                usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
         }
 
         return 0;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 1f5e2ce327d6..7b4056292eaf 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -225,8 +225,10 @@ struct atkbd {
 
         struct delayed_work event_work;
         unsigned long event_jiffies;
-        struct mutex event_mutex;
         unsigned long event_mask;
+
+        /* Serializes reconnect(), attr->set() and event work */
+        struct mutex mutex;
 };
 
 /*
@@ -577,7 +579,7 @@ static void atkbd_event_work(struct work_struct *work)
 {
         struct atkbd *atkbd = container_of(work, struct atkbd, event_work.work);
 
-        mutex_lock(&atkbd->event_mutex);
+        mutex_lock(&atkbd->mutex);
 
         if (!atkbd->enabled) {
                 /*
@@ -596,7 +598,7 @@ static void atkbd_event_work(struct work_struct *work)
                         atkbd_set_repeat_rate(atkbd);
         }
 
-        mutex_unlock(&atkbd->event_mutex);
+        mutex_unlock(&atkbd->mutex);
 }
 
 /*
@@ -612,7 +614,7 @@ static void atkbd_schedule_event_work(struct atkbd *atkbd, int event_bit)
 
         atkbd->event_jiffies = jiffies;
         set_bit(event_bit, &atkbd->event_mask);
-        wmb();
+        mb();
         schedule_delayed_work(&atkbd->event_work, delay);
 }
 
@@ -849,13 +851,20 @@ static void atkbd_disconnect(struct serio *serio)
 {
         struct atkbd *atkbd = serio_get_drvdata(serio);
 
+        sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);
+
         atkbd_disable(atkbd);
 
-        /* make sure we don't have a command in flight */
+        input_unregister_device(atkbd->dev);
+
+        /*
+         * Make sure we don't have a command in flight.
+         * Note that since atkbd->enabled is false event work will keep
+         * rescheduling itself until it gets canceled and will not try
+         * accessing freed input device or serio port.
+         */
         cancel_delayed_work_sync(&atkbd->event_work);
 
-        sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);
-        input_unregister_device(atkbd->dev);
         serio_close(serio);
         serio_set_drvdata(serio, NULL);
         kfree(atkbd);
@@ -1087,7 +1096,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
         atkbd->dev = dev;
         ps2_init(&atkbd->ps2dev, serio);
         INIT_DELAYED_WORK(&atkbd->event_work, atkbd_event_work);
-        mutex_init(&atkbd->event_mutex);
+        mutex_init(&atkbd->mutex);
 
         switch (serio->id.type) {
 
@@ -1160,19 +1169,23 @@ static int atkbd_reconnect(struct serio *serio)
 {
         struct atkbd *atkbd = serio_get_drvdata(serio);
         struct serio_driver *drv = serio->drv;
+        int retval = -1;
 
         if (!atkbd || !drv) {
                 printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
                 return -1;
         }
 
+        mutex_lock(&atkbd->mutex);
+
         atkbd_disable(atkbd);
 
         if (atkbd->write) {
                 if (atkbd_probe(atkbd))
-                        return -1;
+                        goto out;
+
                 if (atkbd->set != atkbd_select_set(atkbd, atkbd->set, atkbd->extra))
-                        return -1;
+                        goto out;
 
                 atkbd_activate(atkbd);
 
@@ -1190,8 +1203,11 @@ static int atkbd_reconnect(struct serio *serio)
         }
 
         atkbd_enable(atkbd);
+        retval = 0;
 
-        return 0;
+ out:
+        mutex_unlock(&atkbd->mutex);
+        return retval;
 }
 
 static struct serio_device_id atkbd_serio_ids[] = {
@@ -1235,47 +1251,28 @@ static ssize_t atkbd_attr_show_helper(struct device *dev, char *buf,
                                 ssize_t (*handler)(struct atkbd *, char *))
 {
         struct serio *serio = to_serio_port(dev);
-        int retval;
-
-        retval = serio_pin_driver(serio);
-        if (retval)
-                return retval;
-
-        if (serio->drv != &atkbd_drv) {
-                retval = -ENODEV;
-                goto out;
-        }
-
-        retval = handler((struct atkbd *)serio_get_drvdata(serio), buf);
+        struct atkbd *atkbd = serio_get_drvdata(serio);
 
-out:
-        serio_unpin_driver(serio);
-        return retval;
+        return handler(atkbd, buf);
 }
 
 static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t count,
                                 ssize_t (*handler)(struct atkbd *, const char *, size_t))
 {
         struct serio *serio = to_serio_port(dev);
-        struct atkbd *atkbd;
+        struct atkbd *atkbd = serio_get_drvdata(serio);
         int retval;
 
-        retval = serio_pin_driver(serio);
+        retval = mutex_lock_interruptible(&atkbd->mutex);
         if (retval)
                 return retval;
 
-        if (serio->drv != &atkbd_drv) {
-                retval = -ENODEV;
-                goto out;
-        }
-
-        atkbd = serio_get_drvdata(serio);
         atkbd_disable(atkbd);
         retval = handler(atkbd, buf, count);
         atkbd_enable(atkbd);
 
-out:
-        serio_unpin_driver(serio);
+        mutex_unlock(&atkbd->mutex);
+
         return retval;
 }
 
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index 6e52d855f637..d410d7a52f1d 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -174,6 +174,14 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
         struct davinci_ks_platform_data *pdata = pdev->dev.platform_data;
         int error, i;
 
+        if (pdata->device_enable) {
+                error = pdata->device_enable(dev);
+                if (error < 0) {
+                        dev_dbg(dev, "device enable function failed\n");
+                        return error;
+                }
+        }
+
         if (!pdata->keymap) {
                 dev_dbg(dev, "no keymap from pdata\n");
                 return -EINVAL;
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c
index 33309fe44e20..c8f5a9a3fa14 100644
--- a/drivers/input/misc/winbond-cir.c
+++ b/drivers/input/misc/winbond-cir.c
@@ -768,7 +768,7 @@ wbcir_parse_rc6(struct device *dev, struct wbcir_data *data)
                 return;
         }
 
-        dev_info(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
+        dev_dbg(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
                 "toggle %u mode %u scan 0x%08X\n",
                 address,
                 command,
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 0d1d33468b43..4f8fe0886b2a 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -139,6 +139,7 @@ struct tp_finger {
 /* trackpad finger data size, empirically at least ten fingers */
 #define SIZEOF_FINGER           sizeof(struct tp_finger)
 #define SIZEOF_ALL_FINGERS      (16 * SIZEOF_FINGER)
+#define MAX_FINGER_ORIENTATION  16384
 
 /* device-specific parameters */
 struct bcm5974_param {
@@ -284,6 +285,26 @@ static void setup_events_to_report(struct input_dev *input_dev,
         input_set_abs_params(input_dev, ABS_Y,
                                 0, cfg->y.dim, cfg->y.fuzz, 0);
 
+        /* finger touch area */
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        /* finger approach area */
+        input_set_abs_params(input_dev, ABS_MT_WIDTH_MAJOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_WIDTH_MINOR,
+                             cfg->w.devmin, cfg->w.devmax, 0, 0);
+        /* finger orientation */
+        input_set_abs_params(input_dev, ABS_MT_ORIENTATION,
+                             -MAX_FINGER_ORIENTATION,
+                             MAX_FINGER_ORIENTATION, 0, 0);
+        /* finger position */
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                             cfg->x.devmin, cfg->x.devmax, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                             cfg->y.devmin, cfg->y.devmax, 0, 0);
+
         __set_bit(EV_KEY, input_dev->evbit);
         __set_bit(BTN_TOUCH, input_dev->keybit);
         __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
@@ -310,13 +331,29 @@ static int report_bt_state(struct bcm5974 *dev, int size)
         return 0;
 }
 
+static void report_finger_data(struct input_dev *input,
+                               const struct bcm5974_config *cfg,
+                               const struct tp_finger *f)
+{
+        input_report_abs(input, ABS_MT_TOUCH_MAJOR, raw2int(f->force_major));
+        input_report_abs(input, ABS_MT_TOUCH_MINOR, raw2int(f->force_minor));
+        input_report_abs(input, ABS_MT_WIDTH_MAJOR, raw2int(f->size_major));
+        input_report_abs(input, ABS_MT_WIDTH_MINOR, raw2int(f->size_minor));
+        input_report_abs(input, ABS_MT_ORIENTATION,
+                         MAX_FINGER_ORIENTATION - raw2int(f->orientation));
+        input_report_abs(input, ABS_MT_POSITION_X, raw2int(f->abs_x));
+        input_report_abs(input, ABS_MT_POSITION_Y,
+                         cfg->y.devmin + cfg->y.devmax - raw2int(f->abs_y));
+        input_mt_sync(input);
+}
+
 /* report trackpad data as logical trackpad state */
 static int report_tp_state(struct bcm5974 *dev, int size)
 {
         const struct bcm5974_config *c = &dev->cfg;
         const struct tp_finger *f;
         struct input_dev *input = dev->input;
-        int raw_p, raw_w, raw_x, raw_y, raw_n;
+        int raw_p, raw_w, raw_x, raw_y, raw_n, i;
         int ptest, origin, ibt = 0, nmin = 0, nmax = 0;
         int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
 
@@ -329,6 +366,11 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 
         /* always track the first finger; when detached, start over */
         if (raw_n) {
+
+                /* report raw trackpad data */
+                for (i = 0; i < raw_n; i++)
+                        report_finger_data(input, c, &f[i]);
+
                 raw_p = raw2int(f->force_major);
                 raw_w = raw2int(f->size_major);
                 raw_x = raw2int(f->abs_x);
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 6d7aa10d10f0..7c1d7d420ae3 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -53,6 +53,12 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
         {
                 /* LifeBook B */
                 .matches = {
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Lifebook B Series"),
+                },
+        },
+        {
+                /* LifeBook B */
+                .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),
                 },
         },
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 401ac6b6edd4..9774bdfaa482 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -627,8 +627,15 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 synaptics_hardware = true;
 
                 if (max_proto > PSMOUSE_IMEX) {
-                        if (!set_properties || synaptics_init(psmouse) == 0)
+/*
+ * Try activating protocol, but check if support is enabled first, since
+ * we try detecting Synaptics even when protocol is disabled.
+ */
+                        if (synaptics_supported() &&
+                            (!set_properties || synaptics_init(psmouse) == 0)) {
                                 return PSMOUSE_SYNAPTICS;
+                        }
+
 /*
  * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
  * Unfortunately Logitech/Genius probes confuse some firmware versions so
@@ -683,19 +690,6 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 max_proto = PSMOUSE_IMEX;
         }
 
-/*
- * Try Finger Sensing Pad
- */
-        if (max_proto > PSMOUSE_IMEX) {
-                if (fsp_detect(psmouse, set_properties) == 0) {
-                        if (!set_properties || fsp_init(psmouse) == 0)
-                                return PSMOUSE_FSP;
-/*
- * Init failed, try basic relative protocols
- */
-                        max_proto = PSMOUSE_IMEX;
-                }
-        }
 
         if (max_proto > PSMOUSE_IMEX) {
                 if (genius_detect(psmouse, set_properties) == 0)
@@ -712,6 +706,21 @@ static int psmouse_extensions(struct psmouse *psmouse,
         }
 
 /*
+ * Try Finger Sensing Pad. We do it here because its probe upsets
+ * Trackpoint devices (causing TP_READ_ID command to time out).
+ */
+        if (max_proto > PSMOUSE_IMEX) {
+                if (fsp_detect(psmouse, set_properties) == 0) {
+                        if (!set_properties || fsp_init(psmouse) == 0)
+                                return PSMOUSE_FSP;
+/*
+ * Init failed, try basic relative protocols
+ */
+                        max_proto = PSMOUSE_IMEX;
+                }
+        }
+
+/*
  * Reset to defaults in case the device got confused by extended
  * protocol probes. Note that we follow up with full reset because
  * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.
@@ -1450,24 +1459,10 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *de
         struct serio *serio = to_serio_port(dev);
         struct psmouse_attribute *attr = to_psmouse_attr(devattr);
         struct psmouse *psmouse;
-        int retval;
-
-        retval = serio_pin_driver(serio);
-        if (retval)
-                return retval;
-
-        if (serio->drv != &psmouse_drv) {
-                retval = -ENODEV;
-                goto out;
-        }
 
         psmouse = serio_get_drvdata(serio);
 
-        retval = attr->show(psmouse, attr->data, buf);
-
-out:
-        serio_unpin_driver(serio);
-        return retval;
+        return attr->show(psmouse, attr->data, buf);
 }
 
 ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *devattr,
@@ -1478,18 +1473,9 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
         struct psmouse *psmouse, *parent = NULL;
         int retval;
 
-        retval = serio_pin_driver(serio);
-        if (retval)
-                return retval;
-
-        if (serio->drv != &psmouse_drv) {
-                retval = -ENODEV;
-                goto out_unpin;
-        }
-
         retval = mutex_lock_interruptible(&psmouse_mutex);
         if (retval)
-                goto out_unpin;
+                goto out;
 
         psmouse = serio_get_drvdata(serio);
 
@@ -1519,8 +1505,7 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
  out_unlock:
         mutex_unlock(&psmouse_mutex);
- out_unpin:
-        serio_unpin_driver(serio);
+ out:
         return retval;
 }
 
@@ -1582,9 +1567,7 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
                 }
 
                 mutex_unlock(&psmouse_mutex);
-                serio_unpin_driver(serio);
                 serio_unregister_child_port(serio);
-                serio_pin_driver_uninterruptible(serio);
                 mutex_lock(&psmouse_mutex);
 
                 if (serio->drv != &psmouse_drv) {
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index 77b9fd0b3fbf..81a6b81cb2fe 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -2,7 +2,7 @@
  * Finger Sensing Pad PS/2 mouse driver.
  *
  * Copyright (C) 2005-2007 Asia Vital Components Co., Ltd.
- * Copyright (C) 2005-2009 Tai-hwa Liang, Sentelic Corporation.
+ * Copyright (C) 2005-2010 Tai-hwa Liang, Sentelic Corporation.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -658,9 +658,9 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
                         if (packet[3] & BIT(1))
                                 button_status |= 0x0f;  /* wheel up */
                         if (packet[3] & BIT(2))
-                                button_status |= BIT(5);/* horizontal left */
+                                button_status |= BIT(4);/* horizontal left */
                         if (packet[3] & BIT(3))
-                                button_status |= BIT(4);/* horizontal right */
+                                button_status |= BIT(5);/* horizontal right */
                         /* push back to packet queue */
                         if (button_status != 0)
                                 packet[3] = button_status;
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 05689e732191..d3f5243fa093 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -743,6 +743,11 @@ int synaptics_init(struct psmouse *psmouse)
         return -1;
 }
 
+bool synaptics_supported(void)
+{
+        return true;
+}
+
 #else /* CONFIG_MOUSE_PS2_SYNAPTICS */
 
 void __init synaptics_module_init(void)
@@ -754,5 +759,10 @@ int synaptics_init(struct psmouse *psmouse)
         return -ENOSYS;
 }
 
+bool synaptics_supported(void)
+{
+        return false;
+}
+
 #endif /* CONFIG_MOUSE_PS2_SYNAPTICS */
 
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 838e7f2c9b30..f0f40a331dc8 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -109,5 +109,6 @@ void synaptics_module_init(void);
 int synaptics_detect(struct psmouse *psmouse, bool set_properties);
 int synaptics_init(struct psmouse *psmouse);
 void synaptics_reset(struct psmouse *psmouse);
+bool synaptics_supported(void);
 
 #endif /* _SYNAPTICS_H */
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 64b688daf48a..2a5982e532f8 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -524,6 +524,13 @@ static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
  */
 static const struct dmi_system_id __initconst i8042_dmi_dritek_table[] = {
         {
+                /* Acer Aspire 5610 */
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+                },
+        },
+        {
                 /* Acer Aspire 5630 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index c21e6d3a8844..794d070c6900 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -47,6 +47,7 @@
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
+#include <linux/gpio.h>
 
 #include <linux/spi/ad7879.h>
 
@@ -132,7 +133,9 @@ struct ad7879 {
         struct input_dev        *input;
         struct work_struct      work;
         struct timer_list       timer;
-
+#ifdef CONFIG_GPIOLIB
+        struct gpio_chip        gc;
+#endif
         struct mutex            mutex;
         unsigned                disabled:1;     /* P: mutex */
 
@@ -150,11 +153,9 @@ struct ad7879 {
         u8                      median;
         u16                     x_plate_ohms;
         u16                     pressure_max;
-        u16                     gpio_init;
         u16                     cmd_crtl1;
         u16                     cmd_crtl2;
         u16                     cmd_crtl3;
-        unsigned                gpio:1;
 };
 
 static int ad7879_read(bus_device *, u8);
@@ -237,24 +238,6 @@ static irqreturn_t ad7879_irq(int irq, void *handle)
 
 static void ad7879_setup(struct ad7879 *ts)
 {
-        ts->cmd_crtl3 = AD7879_YPLUS_BIT |
-                        AD7879_XPLUS_BIT |
-                        AD7879_Z2_BIT |
-                        AD7879_Z1_BIT |
-                        AD7879_TEMPMASK_BIT |
-                        AD7879_AUXVBATMASK_BIT |
-                        AD7879_GPIOALERTMASK_BIT;
-
-        ts->cmd_crtl2 = AD7879_PM(AD7879_PM_DYN) | AD7879_DFR |
-                        AD7879_AVG(ts->averaging) |
-                        AD7879_MFS(ts->median) |
-                        AD7879_FCD(ts->first_conversion_delay) |
-                        ts->gpio_init;
-
-        ts->cmd_crtl1 = AD7879_MODE_INT | AD7879_MODE_SEQ1 |
-                        AD7879_ACQ(ts->acquisition_time) |
-                        AD7879_TMR(ts->pen_down_acc_interval);
-
         ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
         ad7879_write(ts->bus, AD7879_REG_CTRL3, ts->cmd_crtl3);
         ad7879_write(ts->bus, AD7879_REG_CTRL1, ts->cmd_crtl1);
@@ -324,48 +307,132 @@ static ssize_t ad7879_disable_store(struct device *dev,
 
 static DEVICE_ATTR(disable, 0664, ad7879_disable_show, ad7879_disable_store);
 
-static ssize_t ad7879_gpio_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+static struct attribute *ad7879_attributes[] = {
+        &dev_attr_disable.attr,
+        NULL
+};
+
+static const struct attribute_group ad7879_attr_group = {
+        .attrs = ad7879_attributes,
+};
+
+#ifdef CONFIG_GPIOLIB
+static int ad7879_gpio_direction_input(struct gpio_chip *chip,
+                                        unsigned gpio)
 {
-        struct ad7879 *ts = dev_get_drvdata(dev);
+        struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+        int err;
 
-        return sprintf(buf, "%u\n", ts->gpio);
+        mutex_lock(&ts->mutex);
+        ts->cmd_crtl2 |= AD7879_GPIO_EN | AD7879_GPIODIR | AD7879_GPIOPOL;
+        err = ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        mutex_unlock(&ts->mutex);
+
+        return err;
 }
 
-static ssize_t ad7879_gpio_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+static int ad7879_gpio_direction_output(struct gpio_chip *chip,
+                                        unsigned gpio, int level)
 {
-        struct ad7879 *ts = dev_get_drvdata(dev);
-        unsigned long val;
-        int error;
+        struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+        int err;
 
-        error = strict_strtoul(buf, 10, &val);
-        if (error)
-                return error;
+        mutex_lock(&ts->mutex);
+        ts->cmd_crtl2 &= ~AD7879_GPIODIR;
+        ts->cmd_crtl2 |= AD7879_GPIO_EN | AD7879_GPIOPOL;
+        if (level)
+                ts->cmd_crtl2 |= AD7879_GPIO_DATA;
+        else
+                ts->cmd_crtl2 &= ~AD7879_GPIO_DATA;
+
+        err = ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        mutex_unlock(&ts->mutex);
+
+        return err;
+}
+
+static int ad7879_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
+{
+        struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+        u16 val;
 
         mutex_lock(&ts->mutex);
-        ts->gpio = !!val;
-        error = ad7879_write(ts->bus, AD7879_REG_CTRL2,
-                           ts->gpio ?
-                                ts->cmd_crtl2 & ~AD7879_GPIO_DATA :
-                                ts->cmd_crtl2 | AD7879_GPIO_DATA);
+        val = ad7879_read(ts->bus, AD7879_REG_CTRL2);
         mutex_unlock(&ts->mutex);
 
-        return error ? : count;
+        return !!(val & AD7879_GPIO_DATA);
 }
 
-static DEVICE_ATTR(gpio, 0664, ad7879_gpio_show, ad7879_gpio_store);
+static void ad7879_gpio_set_value(struct gpio_chip *chip,
+                                  unsigned gpio, int value)
+{
+        struct ad7879 *ts = container_of(chip, struct ad7879, gc);
 
-static struct attribute *ad7879_attributes[] = {
-        &dev_attr_disable.attr,
-        &dev_attr_gpio.attr,
-        NULL
-};
+        mutex_lock(&ts->mutex);
+        if (value)
+                ts->cmd_crtl2 |= AD7879_GPIO_DATA;
+        else
+                ts->cmd_crtl2 &= ~AD7879_GPIO_DATA;
 
-static const struct attribute_group ad7879_attr_group = {
-        .attrs = ad7879_attributes,
-};
+        ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        mutex_unlock(&ts->mutex);
+}
+
+static int __devinit ad7879_gpio_add(struct device *dev)
+{
+        struct ad7879 *ts = dev_get_drvdata(dev);
+        struct ad7879_platform_data *pdata = dev->platform_data;
+        int ret = 0;
+
+        if (pdata->gpio_export) {
+                ts->gc.direction_input = ad7879_gpio_direction_input;
+                ts->gc.direction_output = ad7879_gpio_direction_output;
+                ts->gc.get = ad7879_gpio_get_value;
+                ts->gc.set = ad7879_gpio_set_value;
+                ts->gc.can_sleep = 1;
+                ts->gc.base = pdata->gpio_base;
+                ts->gc.ngpio = 1;
+                ts->gc.label = "AD7879-GPIO";
+                ts->gc.owner = THIS_MODULE;
+                ts->gc.dev = dev;
+
+                ret = gpiochip_add(&ts->gc);
+                if (ret)
+                        dev_err(dev, "failed to register gpio %d\n",
+                                ts->gc.base);
+        }
+
+        return ret;
+}
+
+/*
+ * We mark ad7879_gpio_remove inline so there is a chance the code
+ * gets discarded when not needed. We can't do __devinit/__devexit
+ * markup since it is used in both probe and remove methods.
+ */
+static inline void ad7879_gpio_remove(struct device *dev)
+{
+        struct ad7879 *ts = dev_get_drvdata(dev);
+        struct ad7879_platform_data *pdata = dev->platform_data;
+        int ret;
+
+        if (pdata->gpio_export) {
+                ret = gpiochip_remove(&ts->gc);
+                if (ret)
+                        dev_err(dev, "failed to remove gpio %d\n",
+                                ts->gc.base);
+        }
+}
+#else
+static inline int ad7879_gpio_add(struct device *dev)
+{
+        return 0;
+}
+
+static inline void ad7879_gpio_remove(struct device *dev)
+{
+}
+#endif
 
 static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
 {
@@ -403,12 +470,6 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
         ts->pen_down_acc_interval = pdata->pen_down_acc_interval;
         ts->median = pdata->median;
 
-        if (pdata->gpio_output)
-                ts->gpio_init = AD7879_GPIO_EN |
-                                (pdata->gpio_default ? 0 : AD7879_GPIO_DATA);
-        else
-                ts->gpio_init = AD7879_GPIO_EN | AD7879_GPIODIR;
-
         snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&bus->dev));
 
         input_dev->name = "AD7879 Touchscreen";
@@ -446,6 +507,23 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
                 goto err_free_mem;
         }
 
+        ts->cmd_crtl3 = AD7879_YPLUS_BIT |
+                        AD7879_XPLUS_BIT |
+                        AD7879_Z2_BIT |
+                        AD7879_Z1_BIT |
+                        AD7879_TEMPMASK_BIT |
+                        AD7879_AUXVBATMASK_BIT |
+                        AD7879_GPIOALERTMASK_BIT;
+
+        ts->cmd_crtl2 = AD7879_PM(AD7879_PM_DYN) | AD7879_DFR |
+                        AD7879_AVG(ts->averaging) |
+                        AD7879_MFS(ts->median) |
+                        AD7879_FCD(ts->first_conversion_delay);
+
+        ts->cmd_crtl1 = AD7879_MODE_INT | AD7879_MODE_SEQ1 |
+                        AD7879_ACQ(ts->acquisition_time) |
+                        AD7879_TMR(ts->pen_down_acc_interval);
+
         ad7879_setup(ts);
 
         err = request_irq(bus->irq, ad7879_irq,
@@ -460,15 +538,21 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
         if (err)
                 goto err_free_irq;
 
-        err = input_register_device(input_dev);
+        err = ad7879_gpio_add(&bus->dev);
         if (err)
                 goto err_remove_attr;
 
+        err = input_register_device(input_dev);
+        if (err)
+                goto err_remove_gpio;
+
         dev_info(&bus->dev, "Rev.%d touchscreen, irq %d\n",
                  revid >> 8, bus->irq);
 
         return 0;
 
+err_remove_gpio:
+        ad7879_gpio_remove(&bus->dev);
 err_remove_attr:
         sysfs_remove_group(&bus->dev.kobj, &ad7879_attr_group);
 err_free_irq:
@@ -481,6 +565,7 @@ err_free_mem:
 
 static int __devexit ad7879_destroy(bus_device *bus, struct ad7879 *ts)
 {
+        ad7879_gpio_remove(&bus->dev);
         ad7879_disable(ts);
         sysfs_remove_group(&ts->bus->dev.kobj, &ad7879_attr_group);
         free_irq(ts->bus->irq, ts);
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index a6624ad252c5..1a1420d7a828 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -3152,7 +3152,7 @@ static void
 hfcmulti_pcm(struct hfc_multi *hc, int ch, int slot_tx, int bank_tx,
     int slot_rx, int bank_rx)
 {
-        if (slot_rx < 0 || slot_rx < 0 || bank_tx < 0 || bank_rx < 0) {
+        if (slot_tx < 0 || slot_rx < 0 || bank_tx < 0 || bank_rx < 0) {
                 /* disable PCM */
                 mode_hfcmulti(hc, ch, hc->chan[ch].protocol, -1, 0, -1, 0);
                 return;
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 96faa799b82a..f96feeb6b9ce 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -660,7 +660,7 @@ static int smu_platform_probe(struct of_device* dev,
         return 0;
 }
 
-static struct of_device_id smu_platform_match[] =
+static const struct of_device_id smu_platform_match[] =
 {
         {
                 .type           = "smu",
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index ea32c7e5a9af..454bc501df3c 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -2211,7 +2211,7 @@ static int fcu_of_remove(struct of_device* dev)
         return 0;
 }
 
-static struct of_device_id fcu_match[] = 
+static const struct of_device_id fcu_match[] = 
 {
         {
         .type           = "fcu",
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 3fbe41b0ac07..ba48fd76396e 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -457,7 +457,7 @@ therm_of_remove( struct of_device *dev )
         return 0;
 }
 
-static struct of_device_id therm_of_match[] = {{
+static const struct of_device_id therm_of_match[] = {{
         .name           = "fan",
         .compatible     = "adm1030"
     }, {}
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index be625475cf6d..4b22feb01a0c 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -503,16 +503,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
                 return 0;
         }
 
-        if (blk_stack_limits(limits, &q->limits, start << 9) < 0)
-                DMWARN("%s: target device %s is misaligned: "
+        if (bdev_stack_limits(limits, bdev, start) < 0)
+                DMWARN("%s: adding target device %s caused an alignment inconsistency: "
                        "physical_block_size=%u, logical_block_size=%u, "
                        "alignment_offset=%u, start=%llu",
                        dm_device_name(ti->table->md), bdevname(bdev, b),
                        q->limits.physical_block_size,
                        q->limits.logical_block_size,
                        q->limits.alignment_offset,
-                       (unsigned long long) start << 9);
-
+                       (unsigned long long) start << SECTOR_SHIFT);
 
         /*
          * Check if merge fn is supported.
@@ -1026,9 +1025,9 @@ combine_limits:
                  * for the table.
                  */
                 if (blk_stack_limits(limits, &ti_limits, 0) < 0)
-                        DMWARN("%s: target device "
+                        DMWARN("%s: adding target device "
                                "(start sect %llu len %llu) "
-                               "is misaligned",
+                               "caused an alignment inconsistency",
                                dm_device_name(table->md),
                                (unsigned long long) ti->begin,
                                (unsigned long long) ti->len);
@@ -1080,15 +1079,6 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
                                struct queue_limits *limits)
 {
         /*
-         * Each target device in the table has a data area that should normally
-         * be aligned such that the DM device's alignment_offset is 0.
-         * FIXME: Propagate alignment_offsets up the stack and warn of
-         *        sub-optimal or inconsistent settings.
-         */
-        limits->alignment_offset = 0;
-        limits->misaligned = 0;
-
-        /*
          * Copy table's limits to the DM device's request_queue
          */
         q->limits = *limits;
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index bff7a5356037..b521ed9d6e2e 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -13,7 +13,7 @@
  */
 
 
-#include <linux/usb/input.h>
+#include <linux/input.h>
 #include <media/ir-common.h>
 
 #define IR_TAB_MIN_SIZE 32
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index c190b0dedee4..2833137fa819 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -144,7 +144,8 @@ static void set_audio(struct dvb_frontend *fe,
         }
 
         if (params->mode == V4L2_TUNER_RADIO) {
-                priv->tda8290_easy_mode = 0x01;         /* Start with MN values */
+                /* Set TDA8295 to FM radio; Start TDA8290 with MN values */
+                priv->tda8290_easy_mode = (priv->ver & TDA8295) ? 0x80 : 0x01;
                 tuner_dbg("setting to radio FM\n");
         } else {
                 tuner_dbg("setting tda829x to system %s\n", mode);
@@ -672,16 +673,19 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props)
 static int tda8295_probe(struct tuner_i2c_props *i2c_props)
 {
 #define TDA8295_ID 0x8a
+#define TDA8295C2_ID 0x8b
         unsigned char tda8295_id[] = { 0x2f, 0x00 };
 
         /* detect tda8295 */
         tuner_i2c_xfer_send(i2c_props, &tda8295_id[0], 1);
         tuner_i2c_xfer_recv(i2c_props, &tda8295_id[1], 1);
 
-        if (tda8295_id[1] == TDA8295_ID) {
+        if ((tda8295_id[1] & 0xfe) == TDA8295_ID) {
                 if (debug)
-                        printk(KERN_DEBUG "%s: tda8295 detected @ %d-%04x\n",
-                               __func__, i2c_adapter_id(i2c_props->adap),
+                        printk(KERN_DEBUG "%s: %s detected @ %d-%04x\n",
+                               __func__, (tda8295_id[1] == TDA8295_ID) ?
+                               "tda8295c1" : "tda8295c2",
+                               i2c_adapter_id(i2c_props->adap),
                                i2c_props->addr);
                 return 0;
         }
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 35d0817126e9..cf8f65f309da 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -72,6 +72,10 @@ comment "Supported Earthsoft PT1 Adapters"
         depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/pt1/Kconfig"
 
+comment "Supported Mantis Adapters"
+        depends on DVB_CORE && PCI && I2C
+        source "drivers/media/dvb/mantis/Kconfig"
+
 comment "Supported DVB Frontends"
         depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 16d262ddb45d..c12922c3659b 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,6 +2,18 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ pt1/
+obj-y        := dvb-core/       \
+                frontends/      \
+                ttpci/          \
+                ttusb-dec/      \
+                ttusb-budget/   \
+                b2c2/           \
+                bt8xx/          \
+                dvb-usb/        \
+                pluto2/         \
+                siano/          \
+                dm1105/         \
+                pt1/            \
+                mantis/
 
 obj-$(CONFIG_DVB_FIREDTV)       += firewire/
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index a3b8b697349b..cd7f9b7cbffa 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -208,6 +208,14 @@ config DVB_DS3000
         help
           A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
 
+config DVB_MB86A16
+        tristate "Fujitsu MB86A16 based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S/DSS Direct Conversion reveiver.
+          Say Y when you want to support this frontend.
+
 comment "DVB-T (terrestrial) frontends"
         depends on DVB_CORE
 
@@ -587,6 +595,17 @@ config DVB_ATBM8830
         help
           A DMB-TH tuner module. Say Y when you want to support this frontend.
 
+config DVB_TDA665x
+        tristate "TDA665x tuner"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          Support for tuner modules based on Philips TDA6650/TDA6651 chips.
+          Say Y when you want to support this chip.
+
+          Currently supported tuners:
+          * Panasonic ENV57H12D5 (ET-50DT)
+
 comment "Tools to develop new frontends"
 
 config DVB_DUMMY_FE
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 47575cc7b699..874e8ada4d1d 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_DVB_TDA10048) += tda10048.o
 obj-$(CONFIG_DVB_TUNER_CX24113) += cx24113.o
 obj-$(CONFIG_DVB_S5H1411) += s5h1411.o
 obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o
+obj-$(CONFIG_DVB_TDA665x) += tda665x.o
 obj-$(CONFIG_DVB_LGS8GXX) += lgs8gxx.o
 obj-$(CONFIG_DVB_ATBM8830) += atbm8830.o
 obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
@@ -80,3 +81,4 @@ obj-$(CONFIG_DVB_STV6110x) += stv6110x.o
 obj-$(CONFIG_DVB_ISL6423) += isl6423.o
 obj-$(CONFIG_DVB_EC100) += ec100.o
 obj-$(CONFIG_DVB_DS3000) += ds3000.o
+obj-$(CONFIG_DVB_MB86A16) += mb86a16.o
diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb/frontends/dib8000.h
index d99619ae983c..b1ee20799639 100644
--- a/drivers/media/dvb/frontends/dib8000.h
+++ b/drivers/media/dvb/frontends/dib8000.h
@@ -100,7 +100,7 @@ static inline int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_
 static inline enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
-    return CT_SHUTDOWN,
+        return CT_SHUTDOWN;
 }
 static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)
 {
diff --git a/drivers/media/dvb/frontends/lgdt3305.h b/drivers/media/dvb/frontends/lgdt3305.h
index 4fa6e52d1fe8..9cb11c9cae53 100644
--- a/drivers/media/dvb/frontends/lgdt3305.h
+++ b/drivers/media/dvb/frontends/lgdt3305.h
@@ -54,13 +54,13 @@ struct lgdt3305_config {
         u16 usref_qam256; /* default: 0x2a80 */
 
         /* disable i2c repeater - 0:repeater enabled 1:repeater disabled */
-        int deny_i2c_rptr:1;
+        unsigned int deny_i2c_rptr:1;
 
         /* spectral inversion - 0:disabled 1:enabled */
-        int spectral_inversion:1;
+        unsigned int spectral_inversion:1;
 
         /* use RF AGC loop - 0:disabled 1:enabled */
-        int rf_agc_loop:1;
+        unsigned int rf_agc_loop:1;
 
         enum lgdt3305_mpeg_mode mpeg_mode;
         enum lgdt3305_tp_clock_edge tpclk_edge;
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
new file mode 100644
index 000000000000..d05f7500e0c5
--- /dev/null
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -0,0 +1,1878 @@
+/*
+        Fujitsu MB86A16 DVB-S/DSS DC Receiver driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+#include "dvb_frontend.h"
+#include "mb86a16.h"
+#include "mb86a16_priv.h"
+
+unsigned int verbose = 5;
+module_param(verbose, int, 0644);
+
+#define ABS(x)          ((x) < 0 ? (-x) : (x))
+
+struct mb86a16_state {
+        struct i2c_adapter              *i2c_adap;
+        const struct mb86a16_config     *config;
+        struct dvb_frontend             frontend;
+
+        /* tuning parameters */
+        int                             frequency;
+        int                             srate;
+
+        /* Internal stuff */
+        int                             master_clk;
+        int                             deci;
+        int                             csel;
+        int                             rsel;
+};
+
+#define MB86A16_ERROR           0
+#define MB86A16_NOTICE          1
+#define MB86A16_INFO            2
+#define MB86A16_DEBUG           3
+
+#define dprintk(x, y, z, format, arg...) do {                                           \
+        if (z) {                                                                        \
+                if      ((x > MB86A16_ERROR) && (x > y))                                \
+                        printk(KERN_ERR "%s: " format "\n", __func__, ##arg);           \
+                else if ((x > MB86A16_NOTICE) && (x > y))                               \
+                        printk(KERN_NOTICE "%s: " format "\n", __func__, ##arg);        \
+                else if ((x > MB86A16_INFO) && (x > y))                                 \
+                        printk(KERN_INFO "%s: " format "\n", __func__, ##arg);          \
+                else if ((x > MB86A16_DEBUG) && (x > y))                                \
+                        printk(KERN_DEBUG "%s: " format "\n", __func__, ##arg);         \
+        } else {                                                                        \
+                if (x > y)                                                              \
+                        printk(format, ##arg);                                          \
+        }                                                                               \
+} while (0)
+
+#define TRACE_IN        dprintk(verbose, MB86A16_DEBUG, 1, "-->()")
+#define TRACE_OUT       dprintk(verbose, MB86A16_DEBUG, 1, "()-->")
+
+static int mb86a16_write(struct mb86a16_state *state, u8 reg, u8 val)
+{
+        int ret;
+        u8 buf[] = { reg, val };
+
+        struct i2c_msg msg = {
+                .addr = state->config->demod_address,
+                .flags = 0,
+                .buf = buf,
+                .len = 2
+        };
+
+        dprintk(verbose, MB86A16_DEBUG, 1,
+                "writing to [0x%02x],Reg[0x%02x],Data[0x%02x]",
+                state->config->demod_address, buf[0], buf[1]);
+
+        ret = i2c_transfer(state->i2c_adap, &msg, 1);
+
+        return (ret != 1) ? -EREMOTEIO : 0;
+}
+
+static int mb86a16_read(struct mb86a16_state *state, u8 reg, u8 *val)
+{
+        int ret;
+        u8 b0[] = { reg };
+        u8 b1[] = { 0 };
+
+        struct i2c_msg msg[] = {
+                {
+                        .addr = state->config->demod_address,
+                        .flags = 0,
+                        .buf = b0,
+                        .len = 1
+                }, {
+                        .addr = state->config->demod_address,
+                        .flags = I2C_M_RD,
+                        .buf = b1,
+                        .len = 1
+                }
+        };
+        ret = i2c_transfer(state->i2c_adap, msg, 2);
+        if (ret != 2) {
+                dprintk(verbose, MB86A16_ERROR, 1, "read error(reg=0x%02x, ret=0x%i)",
+                        reg, ret);
+
+                return -EREMOTEIO;
+        }
+        *val = b1[0];
+
+        return ret;
+}
+
+static int CNTM_set(struct mb86a16_state *state,
+                    unsigned char timint1,
+                    unsigned char timint2,
+                    unsigned char cnext)
+{
+        unsigned char val;
+
+        val = (timint1 << 4) | (timint2 << 2) | cnext;
+        if (mb86a16_write(state, MB86A16_CNTMR, val) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int smrt_set(struct mb86a16_state *state, int rate)
+{
+        int tmp ;
+        int m ;
+        unsigned char STOFS0, STOFS1;
+
+        m = 1 << state->deci;
+        tmp = (8192 * state->master_clk - 2 * m * rate * 8192 + state->master_clk / 2) / state->master_clk;
+
+        STOFS0 = tmp & 0x0ff;
+        STOFS1 = (tmp & 0xf00) >> 8;
+
+        if (mb86a16_write(state, MB86A16_SRATE1, (state->deci << 2) |
+                                       (state->csel << 1) |
+                                        state->rsel) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_SRATE2, STOFS0) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_SRATE3, STOFS1) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -1;
+}
+
+static int srst(struct mb86a16_state *state)
+{
+        if (mb86a16_write(state, MB86A16_RESET, 0x04) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+
+}
+
+static int afcex_data_set(struct mb86a16_state *state,
+                          unsigned char AFCEX_L,
+                          unsigned char AFCEX_H)
+{
+        if (mb86a16_write(state, MB86A16_AFCEXL, AFCEX_L) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_AFCEXH, AFCEX_H) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+
+        return -1;
+}
+
+static int afcofs_data_set(struct mb86a16_state *state,
+                           unsigned char AFCEX_L,
+                           unsigned char AFCEX_H)
+{
+        if (mb86a16_write(state, 0x58, AFCEX_L) < 0)
+                goto err;
+        if (mb86a16_write(state, 0x59, AFCEX_H) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int stlp_set(struct mb86a16_state *state,
+                    unsigned char STRAS,
+                    unsigned char STRBS)
+{
+        if (mb86a16_write(state, MB86A16_STRFILTCOEF1, (STRBS << 3) | (STRAS)) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int Vi_set(struct mb86a16_state *state, unsigned char ETH, unsigned char VIA)
+{
+        if (mb86a16_write(state, MB86A16_VISET2, 0x04) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_VISET3, 0xf5) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int initial_set(struct mb86a16_state *state)
+{
+        if (stlp_set(state, 5, 7))
+                goto err;
+
+        udelay(100);
+        if (afcex_data_set(state, 0, 0))
+                goto err;
+
+        udelay(100);
+        if (afcofs_data_set(state, 0, 0))
+                goto err;
+
+        udelay(100);
+        if (mb86a16_write(state, MB86A16_CRLFILTCOEF1, 0x16) < 0)
+                goto err;
+        if (mb86a16_write(state, 0x2f, 0x21) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_VIMAG, 0x38) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_FAGCS1, 0x00) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_FAGCS2, 0x1c) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_FAGCS3, 0x20) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_FAGCS4, 0x1e) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_FAGCS5, 0x23) < 0)
+                goto err;
+        if (mb86a16_write(state, 0x54, 0xff) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_TSOUT, 0x00) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int S01T_set(struct mb86a16_state *state,
+                    unsigned char s1t,
+                    unsigned s0t)
+{
+        if (mb86a16_write(state, 0x33, (s1t << 3) | s0t) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+
+static int EN_set(struct mb86a16_state *state,
+                  int cren,
+                  int afcen)
+{
+        unsigned char val;
+
+        val = 0x7a | (cren << 7) | (afcen << 2);
+        if (mb86a16_write(state, 0x49, val) < 0)
+                goto err;
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int AFCEXEN_set(struct mb86a16_state *state,
+                       int afcexen,
+                       int smrt)
+{
+        unsigned char AFCA ;
+
+        if (smrt > 18875)
+                AFCA = 4;
+        else if (smrt > 9375)
+                AFCA = 3;
+        else if (smrt > 2250)
+                AFCA = 2;
+        else
+                AFCA = 1;
+
+        if (mb86a16_write(state, 0x2a, 0x02 | (afcexen << 5) | (AFCA << 2)) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int DAGC_data_set(struct mb86a16_state *state,
+                         unsigned char DAGCA,
+                         unsigned char DAGCW)
+{
+        if (mb86a16_write(state, 0x2d, (DAGCA << 3) | DAGCW) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static void smrt_info_get(struct mb86a16_state *state, int rate)
+{
+        if (rate >= 37501) {
+                state->deci = 0; state->csel = 0; state->rsel = 0;
+        } else if (rate >= 30001) {
+                state->deci = 0; state->csel = 0; state->rsel = 1;
+        } else if (rate >= 26251) {
+                state->deci = 0; state->csel = 1; state->rsel = 0;
+        } else if (rate >= 22501) {
+                state->deci = 0; state->csel = 1; state->rsel = 1;
+        } else if (rate >= 18751) {
+                state->deci = 1; state->csel = 0; state->rsel = 0;
+        } else if (rate >= 15001) {
+                state->deci = 1; state->csel = 0; state->rsel = 1;
+        } else if (rate >= 13126) {
+                state->deci = 1; state->csel = 1; state->rsel = 0;
+        } else if (rate >= 11251) {
+                state->deci = 1; state->csel = 1; state->rsel = 1;
+        } else if (rate >= 9376) {
+                state->deci = 2; state->csel = 0; state->rsel = 0;
+        } else if (rate >= 7501) {
+                state->deci = 2; state->csel = 0; state->rsel = 1;
+        } else if (rate >= 6563) {
+                state->deci = 2; state->csel = 1; state->rsel = 0;
+        } else if (rate >= 5626) {
+                state->deci = 2; state->csel = 1; state->rsel = 1;
+        } else if (rate >= 4688) {
+                state->deci = 3; state->csel = 0; state->rsel = 0;
+        } else if (rate >= 3751) {
+                state->deci = 3; state->csel = 0; state->rsel = 1;
+        } else if (rate >= 3282) {
+                state->deci = 3; state->csel = 1; state->rsel = 0;
+        } else if (rate >= 2814) {
+                state->deci = 3; state->csel = 1; state->rsel = 1;
+        } else if (rate >= 2344) {
+                state->deci = 4; state->csel = 0; state->rsel = 0;
+        } else if (rate >= 1876) {
+                state->deci = 4; state->csel = 0; state->rsel = 1;
+        } else if (rate >= 1641) {
+                state->deci = 4; state->csel = 1; state->rsel = 0;
+        } else if (rate >= 1407) {
+                state->deci = 4; state->csel = 1; state->rsel = 1;
+        } else if (rate >= 1172) {
+                state->deci = 5; state->csel = 0; state->rsel = 0;
+        } else if (rate >=  939) {
+                state->deci = 5; state->csel = 0; state->rsel = 1;
+        } else if (rate >=  821) {
+                state->deci = 5; state->csel = 1; state->rsel = 0;
+        } else {
+                state->deci = 5; state->csel = 1; state->rsel = 1;
+        }
+
+        if (state->csel == 0)
+                state->master_clk = 92000;
+        else
+                state->master_clk = 61333;
+
+}
+
+static int signal_det(struct mb86a16_state *state,
+                      int smrt,
+                      unsigned char *SIG)
+{
+
+        int ret ;
+        int smrtd ;
+        int wait_sym ;
+
+        u32 wait_t;
+        unsigned char S[3] ;
+        int i ;
+
+        if (*SIG > 45) {
+                if (CNTM_set(state, 2, 1, 2) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "CNTM set Error");
+                        return -1;
+                }
+                wait_sym = 40000;
+        } else {
+                if (CNTM_set(state, 3, 1, 2) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "CNTM set Error");
+                        return -1;
+                }
+                wait_sym = 80000;
+        }
+        for (i = 0; i < 3; i++) {
+                if (i == 0)
+                        smrtd = smrt * 98 / 100;
+                else if (i == 1)
+                        smrtd = smrt;
+                else
+                        smrtd = smrt * 102 / 100;
+                smrt_info_get(state, smrtd);
+                smrt_set(state, smrtd);
+                srst(state);
+                wait_t = (wait_sym + 99 * smrtd / 100) / smrtd;
+                if (wait_t == 0)
+                        wait_t = 1;
+                msleep_interruptible(10);
+                if (mb86a16_read(state, 0x37, &(S[i])) != 2) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                        return -EREMOTEIO;
+                }
+        }
+        if ((S[1] > S[0] * 112 / 100) &&
+            (S[1] > S[2] * 112 / 100)) {
+
+                ret = 1;
+        } else {
+                ret = 0;
+        }
+        *SIG = S[1];
+
+        if (CNTM_set(state, 0, 1, 2) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "CNTM set Error");
+                return -1;
+        }
+
+        return ret;
+}
+
+static int rf_val_set(struct mb86a16_state *state,
+                      int f,
+                      int smrt,
+                      unsigned char R)
+{
+        unsigned char C, F, B;
+        int M;
+        unsigned char rf_val[5];
+        int ack = -1;
+
+        if (smrt > 37750)
+                C = 1;
+        else if (smrt > 18875)
+                C = 2;
+        else if (smrt > 5500)
+                C = 3;
+        else
+                C = 4;
+
+        if (smrt > 30500)
+                F = 3;
+        else if (smrt > 9375)
+                F = 1;
+        else if (smrt > 4625)
+                F = 0;
+        else
+                F = 2;
+
+        if (f < 1060)
+                B = 0;
+        else if (f < 1175)
+                B = 1;
+        else if (f < 1305)
+                B = 2;
+        else if (f < 1435)
+                B = 3;
+        else if (f < 1570)
+                B = 4;
+        else if (f < 1715)
+                B = 5;
+        else if (f < 1845)
+                B = 6;
+        else if (f < 1980)
+                B = 7;
+        else if (f < 2080)
+                B = 8;
+        else
+                B = 9;
+
+        M = f * (1 << R) / 2;
+
+        rf_val[0] = 0x01 | (C << 3) | (F << 1);
+        rf_val[1] = (R << 5) | ((M & 0x1f000) >> 12);
+        rf_val[2] = (M & 0x00ff0) >> 4;
+        rf_val[3] = ((M & 0x0000f) << 4) | B;
+
+        /* Frequency Set */
+        if (mb86a16_write(state, 0x21, rf_val[0]) < 0)
+                ack = 0;
+        if (mb86a16_write(state, 0x22, rf_val[1]) < 0)
+                ack = 0;
+        if (mb86a16_write(state, 0x23, rf_val[2]) < 0)
+                ack = 0;
+        if (mb86a16_write(state, 0x24, rf_val[3]) < 0)
+                ack = 0;
+        if (mb86a16_write(state, 0x25, 0x01) < 0)
+                ack = 0;
+        if (ack == 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "RF Setup - I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int afcerr_chk(struct mb86a16_state *state)
+{
+        unsigned char AFCM_L, AFCM_H ;
+        int AFCM ;
+        int afcm, afcerr ;
+
+        if (mb86a16_read(state, 0x0e, &AFCM_L) != 2)
+                goto err;
+        if (mb86a16_read(state, 0x0f, &AFCM_H) != 2)
+                goto err;
+
+        AFCM = (AFCM_H << 8) + AFCM_L;
+
+        if (AFCM > 2048)
+                afcm = AFCM - 4096;
+        else
+                afcm = AFCM;
+        afcerr = afcm * state->master_clk / 8192;
+
+        return afcerr;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int dagcm_val_get(struct mb86a16_state *state)
+{
+        int DAGCM;
+        unsigned char DAGCM_H, DAGCM_L;
+
+        if (mb86a16_read(state, 0x45, &DAGCM_L) != 2)
+                goto err;
+        if (mb86a16_read(state, 0x46, &DAGCM_H) != 2)
+                goto err;
+
+        DAGCM = (DAGCM_H << 8) + DAGCM_L;
+
+        return DAGCM;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int mb86a16_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        u8 stat, stat2;
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        *status = 0;
+
+        if (mb86a16_read(state, MB86A16_SIG1, &stat) != 2)
+                goto err;
+        if (mb86a16_read(state, MB86A16_SIG2, &stat2) != 2)
+                goto err;
+        if ((stat > 25) && (stat2 > 25))
+                *status |= FE_HAS_SIGNAL;
+        if ((stat > 45) && (stat2 > 45))
+                *status |= FE_HAS_CARRIER;
+
+        if (mb86a16_read(state, MB86A16_STATUS, &stat) != 2)
+                goto err;
+
+        if (stat & 0x01)
+                *status |= FE_HAS_SYNC;
+        if (stat & 0x01)
+                *status |= FE_HAS_VITERBI;
+
+        if (mb86a16_read(state, MB86A16_FRAMESYNC, &stat) != 2)
+                goto err;
+
+        if ((stat & 0x0f) && (*status & FE_HAS_VITERBI))
+                *status |= FE_HAS_LOCK;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int sync_chk(struct mb86a16_state *state,
+                    unsigned char *VIRM)
+{
+        unsigned char val;
+        int sync;
+
+        if (mb86a16_read(state, 0x0d, &val) != 2)
+                goto err;
+
+        dprintk(verbose, MB86A16_INFO, 1, "Status = %02x,", val);
+        sync = val & 0x01;
+        *VIRM = (val & 0x1c) >> 2;
+
+        return sync;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+
+}
+
+static int freqerr_chk(struct mb86a16_state *state,
+                       int fTP,
+                       int smrt,
+                       int unit)
+{
+        unsigned char CRM, AFCML, AFCMH;
+        unsigned char temp1, temp2, temp3;
+        int crm, afcm, AFCM;
+        int crrerr, afcerr;             /* kHz */
+        int frqerr;                     /* MHz */
+        int afcen, afcexen = 0;
+        int R, M, fOSC, fOSC_OFS;
+
+        if (mb86a16_read(state, 0x43, &CRM) != 2)
+                goto err;
+
+        if (CRM > 127)
+                crm = CRM - 256;
+        else
+                crm = CRM;
+
+        crrerr = smrt * crm / 256;
+        if (mb86a16_read(state, 0x49, &temp1) != 2)
+                goto err;
+
+        afcen = (temp1 & 0x04) >> 2;
+        if (afcen == 0) {
+                if (mb86a16_read(state, 0x2a, &temp1) != 2)
+                        goto err;
+                afcexen = (temp1 & 0x20) >> 5;
+        }
+
+        if (afcen == 1) {
+                if (mb86a16_read(state, 0x0e, &AFCML) != 2)
+                        goto err;
+                if (mb86a16_read(state, 0x0f, &AFCMH) != 2)
+                        goto err;
+        } else if (afcexen == 1) {
+                if (mb86a16_read(state, 0x2b, &AFCML) != 2)
+                        goto err;
+                if (mb86a16_read(state, 0x2c, &AFCMH) != 2)
+                        goto err;
+        }
+        if ((afcen == 1) || (afcexen == 1)) {
+                smrt_info_get(state, smrt);
+                AFCM = ((AFCMH & 0x01) << 8) + AFCML;
+                if (AFCM > 255)
+                        afcm = AFCM - 512;
+                else
+                        afcm = AFCM;
+
+                afcerr = afcm * state->master_clk / 8192;
+        } else
+                afcerr = 0;
+
+        if (mb86a16_read(state, 0x22, &temp1) != 2)
+                goto err;
+        if (mb86a16_read(state, 0x23, &temp2) != 2)
+                goto err;
+        if (mb86a16_read(state, 0x24, &temp3) != 2)
+                goto err;
+
+        R = (temp1 & 0xe0) >> 5;
+        M = ((temp1 & 0x1f) << 12) + (temp2 << 4) + (temp3 >> 4);
+        if (R == 0)
+                fOSC = 2 * M;
+        else
+                fOSC = M;
+
+        fOSC_OFS = fOSC - fTP;
+
+        if (unit == 0) {        /* MHz */
+                if (crrerr + afcerr + fOSC_OFS * 1000 >= 0)
+                        frqerr = (crrerr + afcerr + fOSC_OFS * 1000 + 500) / 1000;
+                else
+                        frqerr = (crrerr + afcerr + fOSC_OFS * 1000 - 500) / 1000;
+        } else {        /* kHz */
+                frqerr = crrerr + afcerr + fOSC_OFS * 1000;
+        }
+
+        return frqerr;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static unsigned char vco_dev_get(struct mb86a16_state *state, int smrt)
+{
+        unsigned char R;
+
+        if (smrt > 9375)
+                R = 0;
+        else
+                R = 1;
+
+        return R;
+}
+
+static void swp_info_get(struct mb86a16_state *state,
+                         int fOSC_start,
+                         int smrt,
+                         int v, int R,
+                         int swp_ofs,
+                         int *fOSC,
+                         int *afcex_freq,
+                         unsigned char *AFCEX_L,
+                         unsigned char *AFCEX_H)
+{
+        int AFCEX ;
+        int crnt_swp_freq ;
+
+        crnt_swp_freq = fOSC_start * 1000 + v * swp_ofs;
+
+        if (R == 0)
+                *fOSC = (crnt_swp_freq + 1000) / 2000 * 2;
+        else
+                *fOSC = (crnt_swp_freq + 500) / 1000;
+
+        if (*fOSC >= crnt_swp_freq)
+                *afcex_freq = *fOSC * 1000 - crnt_swp_freq;
+        else
+                *afcex_freq = crnt_swp_freq - *fOSC * 1000;
+
+        AFCEX = *afcex_freq * 8192 / state->master_clk;
+        *AFCEX_L =  AFCEX & 0x00ff;
+        *AFCEX_H = (AFCEX & 0x0f00) >> 8;
+}
+
+
+static int swp_freq_calcuation(struct mb86a16_state *state, int i, int v, int *V,  int vmax, int vmin,
+                               int SIGMIN, int fOSC, int afcex_freq, int swp_ofs, unsigned char *SIG1)
+{
+        int swp_freq ;
+
+        if ((i % 2 == 1) && (v <= vmax)) {
+                /* positive v (case 1) */
+                if ((v - 1 == vmin)                             &&
+                    (*(V + 30 + v) >= 0)                        &&
+                    (*(V + 30 + v - 1) >= 0)                    &&
+                    (*(V + 30 + v - 1) > *(V + 30 + v))         &&
+                    (*(V + 30 + v - 1) > SIGMIN)) {
+
+                        swp_freq = fOSC * 1000 + afcex_freq - swp_ofs;
+                        *SIG1 = *(V + 30 + v - 1);
+                } else if ((v == vmax)                          &&
+                           (*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v - 1) >= 0)             &&
+                           (*(V + 30 + v) > *(V + 30 + v - 1))  &&
+                           (*(V + 30 + v) > SIGMIN)) {
+                        /* (case 2) */
+                        swp_freq = fOSC * 1000 + afcex_freq;
+                        *SIG1 = *(V + 30 + v);
+                } else if ((*(V + 30 + v) > 0)                  &&
+                           (*(V + 30 + v - 1) > 0)              &&
+                           (*(V + 30 + v - 2) > 0)              &&
+                           (*(V + 30 + v - 3) > 0)              &&
+                           (*(V + 30 + v - 1) > *(V + 30 + v))  &&
+                           (*(V + 30 + v - 2) > *(V + 30 + v - 3)) &&
+                           ((*(V + 30 + v - 1) > SIGMIN)        ||
+                           (*(V + 30 + v - 2) > SIGMIN))) {
+                        /* (case 3) */
+                        if (*(V + 30 + v - 1) >= *(V + 30 + v - 2)) {
+                                swp_freq = fOSC * 1000 + afcex_freq - swp_ofs;
+                                *SIG1 = *(V + 30 + v - 1);
+                        } else {
+                                swp_freq = fOSC * 1000 + afcex_freq - swp_ofs * 2;
+                                *SIG1 = *(V + 30 + v - 2);
+                        }
+                } else if ((v == vmax)                          &&
+                           (*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v - 1) >= 0)             &&
+                           (*(V + 30 + v - 2) >= 0)             &&
+                           (*(V + 30 + v) > *(V + 30 + v - 2))  &&
+                           (*(V + 30 + v - 1) > *(V + 30 + v - 2)) &&
+                           ((*(V + 30 + v) > SIGMIN)            ||
+                           (*(V + 30 + v - 1) > SIGMIN))) {
+                        /* (case 4) */
+                        if (*(V + 30 + v) >= *(V + 30 + v - 1)) {
+                                swp_freq = fOSC * 1000 + afcex_freq;
+                                *SIG1 = *(V + 30 + v);
+                        } else {
+                                swp_freq = fOSC * 1000 + afcex_freq - swp_ofs;
+                                *SIG1 = *(V + 30 + v - 1);
+                        }
+                } else  {
+                        swp_freq = -1 ;
+                }
+        } else if ((i % 2 == 0) && (v >= vmin)) {
+                /* Negative v (case 1) */
+                if ((*(V + 30 + v) > 0)                         &&
+                    (*(V + 30 + v + 1) > 0)                     &&
+                    (*(V + 30 + v + 2) > 0)                     &&
+                    (*(V + 30 + v + 1) > *(V + 30 + v))         &&
+                    (*(V + 30 + v + 1) > *(V + 30 + v + 2))     &&
+                    (*(V + 30 + v + 1) > SIGMIN)) {
+
+                        swp_freq = fOSC * 1000 + afcex_freq + swp_ofs;
+                        *SIG1 = *(V + 30 + v + 1);
+                } else if ((v + 1 == vmax)                      &&
+                           (*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v + 1) >= 0)             &&
+                           (*(V + 30 + v + 1) > *(V + 30 + v))  &&
+                           (*(V + 30 + v + 1) > SIGMIN)) {
+                        /* (case 2) */
+                        swp_freq = fOSC * 1000 + afcex_freq + swp_ofs;
+                        *SIG1 = *(V + 30 + v);
+                } else if ((v == vmin)                          &&
+                           (*(V + 30 + v) > 0)                  &&
+                           (*(V + 30 + v + 1) > 0)              &&
+                           (*(V + 30 + v + 2) > 0)              &&
+                           (*(V + 30 + v) > *(V + 30 + v + 1))  &&
+                           (*(V + 30 + v) > *(V + 30 + v + 2))  &&
+                           (*(V + 30 + v) > SIGMIN)) {
+                        /* (case 3) */
+                        swp_freq = fOSC * 1000 + afcex_freq;
+                        *SIG1 = *(V + 30 + v);
+                } else if ((*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v + 1) >= 0)             &&
+                           (*(V + 30 + v + 2) >= 0)             &&
+                           (*(V + 30 + v + 3) >= 0)             &&
+                           (*(V + 30 + v + 1) > *(V + 30 + v))  &&
+                           (*(V + 30 + v + 2) > *(V + 30 + v + 3)) &&
+                           ((*(V + 30 + v + 1) > SIGMIN)        ||
+                            (*(V + 30 + v + 2) > SIGMIN))) {
+                        /* (case 4) */
+                        if (*(V + 30 + v + 1) >= *(V + 30 + v + 2)) {
+                                swp_freq = fOSC * 1000 + afcex_freq + swp_ofs;
+                                *SIG1 = *(V + 30 + v + 1);
+                        } else {
+                                swp_freq = fOSC * 1000 + afcex_freq + swp_ofs * 2;
+                                *SIG1 = *(V + 30 + v + 2);
+                        }
+                } else if ((*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v + 1) >= 0)             &&
+                           (*(V + 30 + v + 2) >= 0)             &&
+                           (*(V + 30 + v + 3) >= 0)             &&
+                           (*(V + 30 + v) > *(V + 30 + v + 2))  &&
+                           (*(V + 30 + v + 1) > *(V + 30 + v + 2)) &&
+                           (*(V + 30 + v) > *(V + 30 + v + 3))  &&
+                           (*(V + 30 + v + 1) > *(V + 30 + v + 3)) &&
+                           ((*(V + 30 + v) > SIGMIN)            ||
+                            (*(V + 30 + v + 1) > SIGMIN))) {
+                        /* (case 5) */
+                        if (*(V + 30 + v) >= *(V + 30 + v + 1)) {
+                                swp_freq = fOSC * 1000 + afcex_freq;
+                                *SIG1 = *(V + 30 + v);
+                        } else {
+                                swp_freq = fOSC * 1000 + afcex_freq + swp_ofs;
+                                *SIG1 = *(V + 30 + v + 1);
+                        }
+                } else if ((v + 2 == vmin)                      &&
+                           (*(V + 30 + v) >= 0)                 &&
+                           (*(V + 30 + v + 1) >= 0)             &&
+                           (*(V + 30 + v + 2) >= 0)             &&
+                           (*(V + 30 + v + 1) > *(V + 30 + v))  &&
+                           (*(V + 30 + v + 2) > *(V + 30 + v))  &&
+                           ((*(V + 30 + v + 1) > SIGMIN)        ||
+                            (*(V + 30 + v + 2) > SIGMIN))) {
+                        /* (case 6) */
+                        if (*(V + 30 + v + 1) >= *(V + 30 + v + 2)) {
+                                swp_freq = fOSC * 1000 + afcex_freq + swp_ofs;
+                                *SIG1 = *(V + 30 + v + 1);
+                        } else {
+                                swp_freq = fOSC * 1000 + afcex_freq + swp_ofs * 2;
+                                *SIG1 = *(V + 30 + v + 2);
+                        }
+                } else if ((vmax == 0) && (vmin == 0) && (*(V + 30 + v) > SIGMIN)) {
+                        swp_freq = fOSC * 1000;
+                        *SIG1 = *(V + 30 + v);
+                } else
+                        swp_freq = -1;
+        } else
+                swp_freq = -1;
+
+        return swp_freq;
+}
+
+static void swp_info_get2(struct mb86a16_state *state,
+                          int smrt,
+                          int R,
+                          int swp_freq,
+                          int *afcex_freq,
+                          int *fOSC,
+                          unsigned char *AFCEX_L,
+                          unsigned char *AFCEX_H)
+{
+        int AFCEX ;
+
+        if (R == 0)
+                *fOSC = (swp_freq + 1000) / 2000 * 2;
+        else
+                *fOSC = (swp_freq + 500) / 1000;
+
+        if (*fOSC >= swp_freq)
+                *afcex_freq = *fOSC * 1000 - swp_freq;
+        else
+                *afcex_freq = swp_freq - *fOSC * 1000;
+
+        AFCEX = *afcex_freq * 8192 / state->master_clk;
+        *AFCEX_L =  AFCEX & 0x00ff;
+        *AFCEX_H = (AFCEX & 0x0f00) >> 8;
+}
+
+static void afcex_info_get(struct mb86a16_state *state,
+                           int afcex_freq,
+                           unsigned char *AFCEX_L,
+                           unsigned char *AFCEX_H)
+{
+        int AFCEX ;
+
+        AFCEX = afcex_freq * 8192 / state->master_clk;
+        *AFCEX_L =  AFCEX & 0x00ff;
+        *AFCEX_H = (AFCEX & 0x0f00) >> 8;
+}
+
+static int SEQ_set(struct mb86a16_state *state, unsigned char loop)
+{
+        /* SLOCK0 = 0 */
+        if (mb86a16_write(state, 0x32, 0x02 | (loop << 2)) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int iq_vt_set(struct mb86a16_state *state, unsigned char IQINV)
+{
+        /* Viterbi Rate, IQ Settings */
+        if (mb86a16_write(state, 0x06, 0xdf | (IQINV << 5)) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int FEC_srst(struct mb86a16_state *state)
+{
+        if (mb86a16_write(state, MB86A16_RESET, 0x02) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int S2T_set(struct mb86a16_state *state, unsigned char S2T)
+{
+        if (mb86a16_write(state, 0x34, 0x70 | S2T) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int S45T_set(struct mb86a16_state *state, unsigned char S4T, unsigned char S5T)
+{
+        if (mb86a16_write(state, 0x35, 0x00 | (S5T << 4) | S4T) < 0) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+
+static int mb86a16_set_fe(struct mb86a16_state *state)
+{
+        u8 agcval, cnmval;
+
+        int i, j;
+        int fOSC = 0;
+        int fOSC_start = 0;
+        int wait_t;
+        int fcp;
+        int swp_ofs;
+        int V[60];
+        u8 SIG1MIN;
+
+        unsigned char CREN, AFCEN, AFCEXEN;
+        unsigned char SIG1;
+        unsigned char TIMINT1, TIMINT2, TIMEXT;
+        unsigned char S0T, S1T;
+        unsigned char S2T;
+/*      unsigned char S2T, S3T; */
+        unsigned char S4T, S5T;
+        unsigned char AFCEX_L, AFCEX_H;
+        unsigned char R;
+        unsigned char VIRM;
+        unsigned char ETH, VIA;
+        unsigned char junk;
+
+        int loop;
+        int ftemp;
+        int v, vmax, vmin;
+        int vmax_his, vmin_his;
+        int swp_freq, prev_swp_freq[20];
+        int prev_freq_num;
+        int signal_dupl;
+        int afcex_freq;
+        int signal;
+        int afcerr;
+        int temp_freq, delta_freq;
+        int dagcm[4];
+        int smrt_d;
+/*      int freq_err; */
+        int n;
+        int ret = -1;
+        int sync;
+
+        dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
+
+        fcp = 3000;
+        swp_ofs = state->srate / 4;
+
+        for (i = 0; i < 60; i++)
+                V[i] = -1;
+
+        for (i = 0; i < 20; i++)
+                prev_swp_freq[i] = 0;
+
+        SIG1MIN = 25;
+
+        for (n = 0; ((n < 3) && (ret == -1)); n++) {
+                SEQ_set(state, 0);
+                iq_vt_set(state, 0);
+
+                CREN = 0;
+                AFCEN = 0;
+                AFCEXEN = 1;
+                TIMINT1 = 0;
+                TIMINT2 = 1;
+                TIMEXT = 2;
+                S1T = 0;
+                S0T = 0;
+
+                if (initial_set(state) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "initial set failed");
+                        return -1;
+                }
+                if (DAGC_data_set(state, 3, 2) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "DAGC data set error");
+                        return -1;
+                }
+                if (EN_set(state, CREN, AFCEN) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "EN set error");
+                        return -1; /* (0, 0) */
+                }
+                if (AFCEXEN_set(state, AFCEXEN, state->srate) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "AFCEXEN set error");
+                        return -1; /* (1, smrt) = (1, symbolrate) */
+                }
+                if (CNTM_set(state, TIMINT1, TIMINT2, TIMEXT) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "CNTM set error");
+                        return -1; /* (0, 1, 2) */
+                }
+                if (S01T_set(state, S1T, S0T) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "S01T set error");
+                        return -1; /* (0, 0) */
+                }
+                smrt_info_get(state, state->srate);
+                if (smrt_set(state, state->srate) < 0) {
+                        dprintk(verbose, MB86A16_ERROR, 1, "smrt info get error");
+                        return -1;
+                }
+
+                R = vco_dev_get(state, state->srate);
+                if (R == 1)
+                        fOSC_start = state->frequency;
+
+                else if (R == 0) {
+                        if (state->frequency % 2 == 0) {
+                                fOSC_start = state->frequency;
+                        } else {
+                                fOSC_start = state->frequency + 1;
+                                if (fOSC_start > 2150)
+                                        fOSC_start = state->frequency - 1;
+                        }
+                }
+                loop = 1;
+                ftemp = fOSC_start * 1000;
+                vmax = 0 ;
+                while (loop == 1) {
+                        ftemp = ftemp + swp_ofs;
+                        vmax++;
+
+                        /* Upper bound */
+                        if (ftemp > 2150000) {
+                                loop = 0;
+                                vmax--;
+                        } else {
+                                if ((ftemp == 2150000) ||
+                                    (ftemp - state->frequency * 1000 >= fcp + state->srate / 4))
+                                        loop = 0;
+                        }
+                }
+
+                loop = 1;
+                ftemp = fOSC_start * 1000;
+                vmin = 0 ;
+                while (loop == 1) {
+                        ftemp = ftemp - swp_ofs;
+                        vmin--;
+
+                        /* Lower bound */
+                        if (ftemp < 950000) {
+                                loop = 0;
+                                vmin++;
+                        } else {
+                                if ((ftemp == 950000) ||
+                                    (state->frequency * 1000 - ftemp >= fcp + state->srate / 4))
+                                        loop = 0;
+                        }
+                }
+
+                wait_t = (8000 + state->srate / 2) / state->srate;
+                if (wait_t == 0)
+                        wait_t = 1;
+
+                i = 0;
+                j = 0;
+                prev_freq_num = 0;
+                loop = 1;
+                signal = 0;
+                vmax_his = 0;
+                vmin_his = 0;
+                v = 0;
+
+                while (loop == 1) {
+                        swp_info_get(state, fOSC_start, state->srate,
+                                     v, R, swp_ofs, &fOSC,
+                                     &afcex_freq, &AFCEX_L, &AFCEX_H);
+
+                        udelay(100);
+                        if (rf_val_set(state, fOSC, state->srate, R) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "rf val set error");
+                                return -1;
+                        }
+                        udelay(100);
+                        if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "afcex data set error");
+                                return -1;
+                        }
+                        if (srst(state) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "srst error");
+                                return -1;
+                        }
+                        msleep_interruptible(wait_t);
+
+                        if (mb86a16_read(state, 0x37, &SIG1) != 2) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                                return -1;
+                        }
+                        V[30 + v] = SIG1 ;
+                        swp_freq = swp_freq_calcuation(state, i, v, V, vmax, vmin,
+                                                      SIG1MIN, fOSC, afcex_freq,
+                                                      swp_ofs, &SIG1);  /* changed */
+
+                        signal_dupl = 0;
+                        for (j = 0; j < prev_freq_num; j++) {
+                                if ((ABS(prev_swp_freq[j] - swp_freq)) < (swp_ofs * 3 / 2)) {
+                                        signal_dupl = 1;
+                                        dprintk(verbose, MB86A16_INFO, 1, "Probably Duplicate Signal, j = %d", j);
+                                }
+                        }
+                        if ((signal_dupl == 0) && (swp_freq > 0) && (ABS(swp_freq - state->frequency * 1000) < fcp + state->srate / 6)) {
+                                dprintk(verbose, MB86A16_DEBUG, 1, "------ Signal detect ------ [swp_freq=[%07d, srate=%05d]]", swp_freq, state->srate);
+                                prev_swp_freq[prev_freq_num] = swp_freq;
+                                prev_freq_num++;
+                                swp_info_get2(state, state->srate, R, swp_freq,
+                                              &afcex_freq, &fOSC,
+                                              &AFCEX_L, &AFCEX_H);
+
+                                if (rf_val_set(state, fOSC, state->srate, R) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "rf val set error");
+                                        return -1;
+                                }
+                                if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "afcex data set error");
+                                        return -1;
+                                }
+                                signal = signal_det(state, state->srate, &SIG1);
+                                if (signal == 1) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "***** Signal Found *****");
+                                        loop = 0;
+                                } else {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "!!!!! No signal !!!!!, try again...");
+                                        smrt_info_get(state, state->srate);
+                                        if (smrt_set(state, state->srate) < 0) {
+                                                dprintk(verbose, MB86A16_ERROR, 1, "smrt set error");
+                                                return -1;
+                                        }
+                                }
+                        }
+                        if (v > vmax)
+                                vmax_his = 1 ;
+                        if (v < vmin)
+                                vmin_his = 1 ;
+                        i++;
+
+                        if ((i % 2 == 1) && (vmax_his == 1))
+                                i++;
+                        if ((i % 2 == 0) && (vmin_his == 1))
+                                i++;
+
+                        if (i % 2 == 1)
+                                v = (i + 1) / 2;
+                        else
+                                v = -i / 2;
+
+                        if ((vmax_his == 1) && (vmin_his == 1))
+                                loop = 0 ;
+                }
+
+                if (signal == 1) {
+                        dprintk(verbose, MB86A16_INFO, 1, " Start Freq Error Check");
+                        S1T = 7 ;
+                        S0T = 1 ;
+                        CREN = 0 ;
+                        AFCEN = 1 ;
+                        AFCEXEN = 0 ;
+
+                        if (S01T_set(state, S1T, S0T) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "S01T set error");
+                                return -1;
+                        }
+                        smrt_info_get(state, state->srate);
+                        if (smrt_set(state, state->srate) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "smrt set error");
+                                return -1;
+                        }
+                        if (EN_set(state, CREN, AFCEN) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "EN set error");
+                                return -1;
+                        }
+                        if (AFCEXEN_set(state, AFCEXEN, state->srate) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "AFCEXEN set error");
+                                return -1;
+                        }
+                        afcex_info_get(state, afcex_freq, &AFCEX_L, &AFCEX_H);
+                        if (afcofs_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "AFCOFS data set error");
+                                return -1;
+                        }
+                        if (srst(state) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "srst error");
+                                return -1;
+                        }
+                        /* delay 4~200 */
+                        wait_t = 200000 / state->master_clk + 200000 / state->srate;
+                        msleep(wait_t);
+                        afcerr = afcerr_chk(state);
+                        if (afcerr == -1)
+                                return -1;
+
+                        swp_freq = fOSC * 1000 + afcerr ;
+                        AFCEXEN = 1 ;
+                        if (state->srate >= 1500)
+                                smrt_d = state->srate / 3;
+                        else
+                                smrt_d = state->srate / 2;
+                        smrt_info_get(state, smrt_d);
+                        if (smrt_set(state, smrt_d) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "smrt set error");
+                                return -1;
+                        }
+                        if (AFCEXEN_set(state, AFCEXEN, smrt_d) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "AFCEXEN set error");
+                                return -1;
+                        }
+                        R = vco_dev_get(state, smrt_d);
+                        if (DAGC_data_set(state, 2, 0) < 0) {
+                                dprintk(verbose, MB86A16_ERROR, 1, "DAGC data set error");
+                                return -1;
+                        }
+                        for (i = 0; i < 3; i++) {
+                                temp_freq = swp_freq + (i - 1) * state->srate / 8;
+                                swp_info_get2(state, smrt_d, R, temp_freq, &afcex_freq, &fOSC, &AFCEX_L, &AFCEX_H);
+                                if (rf_val_set(state, fOSC, smrt_d, R) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "rf val set error");
+                                        return -1;
+                                }
+                                if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "afcex data set error");
+                                        return -1;
+                                }
+                                wait_t = 200000 / state->master_clk + 40000 / smrt_d;
+                                msleep(wait_t);
+                                dagcm[i] = dagcm_val_get(state);
+                        }
+                        if ((dagcm[0] > dagcm[1]) &&
+                            (dagcm[0] > dagcm[2]) &&
+                            (dagcm[0] - dagcm[1] > 2 * (dagcm[2] - dagcm[1]))) {
+
+                                temp_freq = swp_freq - 2 * state->srate / 8;
+                                swp_info_get2(state, smrt_d, R, temp_freq, &afcex_freq, &fOSC, &AFCEX_L, &AFCEX_H);
+                                if (rf_val_set(state, fOSC, smrt_d, R) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "rf val set error");
+                                        return -1;
+                                }
+                                if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "afcex data set");
+                                        return -1;
+                                }
+                                wait_t = 200000 / state->master_clk + 40000 / smrt_d;
+                                msleep(wait_t);
+                                dagcm[3] = dagcm_val_get(state);
+                                if (dagcm[3] > dagcm[1])
+                                        delta_freq = (dagcm[2] - dagcm[0] + dagcm[1] - dagcm[3]) * state->srate / 300;
+                                else
+                                        delta_freq = 0;
+                        } else if ((dagcm[2] > dagcm[1]) &&
+                                   (dagcm[2] > dagcm[0]) &&
+                                   (dagcm[2] - dagcm[1] > 2 * (dagcm[0] - dagcm[1]))) {
+
+                                temp_freq = swp_freq + 2 * state->srate / 8;
+                                swp_info_get2(state, smrt_d, R, temp_freq, &afcex_freq, &fOSC, &AFCEX_L, &AFCEX_H);
+                                if (rf_val_set(state, fOSC, smrt_d, R) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "rf val set");
+                                        return -1;
+                                }
+                                if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "afcex data set");
+                                        return -1;
+                                }
+                                wait_t = 200000 / state->master_clk + 40000 / smrt_d;
+                                msleep(wait_t);
+                                dagcm[3] = dagcm_val_get(state);
+                                if (dagcm[3] > dagcm[1])
+                                        delta_freq = (dagcm[2] - dagcm[0] + dagcm[3] - dagcm[1]) * state->srate / 300;
+                                else
+                                        delta_freq = 0 ;
+
+                        } else {
+                                delta_freq = 0 ;
+                        }
+                        dprintk(verbose, MB86A16_INFO, 1, "SWEEP Frequency = %d", swp_freq);
+                        swp_freq += delta_freq;
+                        dprintk(verbose, MB86A16_INFO, 1, "Adjusting .., DELTA Freq = %d, SWEEP Freq=%d", delta_freq, swp_freq);
+                        if (ABS(state->frequency * 1000 - swp_freq) > 3800) {
+                                dprintk(verbose, MB86A16_INFO, 1, "NO  --  SIGNAL !");
+                        } else {
+
+                                S1T = 0;
+                                S0T = 3;
+                                CREN = 1;
+                                AFCEN = 0;
+                                AFCEXEN = 1;
+
+                                if (S01T_set(state, S1T, S0T) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "S01T set error");
+                                        return -1;
+                                }
+                                if (DAGC_data_set(state, 0, 0) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "DAGC data set error");
+                                        return -1;
+                                }
+                                R = vco_dev_get(state, state->srate);
+                                smrt_info_get(state, state->srate);
+                                if (smrt_set(state, state->srate) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "smrt set error");
+                                        return -1;
+                                }
+                                if (EN_set(state, CREN, AFCEN) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "EN set error");
+                                        return -1;
+                                }
+                                if (AFCEXEN_set(state, AFCEXEN, state->srate) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "AFCEXEN set error");
+                                        return -1;
+                                }
+                                swp_info_get2(state, state->srate, R, swp_freq, &afcex_freq, &fOSC, &AFCEX_L, &AFCEX_H);
+                                if (rf_val_set(state, fOSC, state->srate, R) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "rf val set error");
+                                        return -1;
+                                }
+                                if (afcex_data_set(state, AFCEX_L, AFCEX_H) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "afcex data set error");
+                                        return -1;
+                                }
+                                if (srst(state) < 0) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "srst error");
+                                        return -1;
+                                }
+                                wait_t = 7 + (10000 + state->srate / 2) / state->srate;
+                                if (wait_t == 0)
+                                        wait_t = 1;
+                                msleep_interruptible(wait_t);
+                                if (mb86a16_read(state, 0x37, &SIG1) != 2) {
+                                        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                                        return -EREMOTEIO;
+                                }
+
+                                if (SIG1 > 110) {
+                                        S2T = 4; S4T = 1; S5T = 6; ETH = 4; VIA = 6;
+                                        wait_t = 7 + (917504 + state->srate / 2) / state->srate;
+                                } else if (SIG1 > 105) {
+                                        S2T = 4; S4T = 2; S5T = 8; ETH = 7; VIA = 2;
+                                        wait_t = 7 + (1048576 + state->srate / 2) / state->srate;
+                                } else if (SIG1 > 85) {
+                                        S2T = 5; S4T = 2; S5T = 8; ETH = 7; VIA = 2;
+                                        wait_t = 7 + (1310720 + state->srate / 2) / state->srate;
+                                } else if (SIG1 > 65) {
+                                        S2T = 6; S4T = 2; S5T = 8; ETH = 7; VIA = 2;
+                                        wait_t = 7 + (1572864 + state->srate / 2) / state->srate;
+                                } else {
+                                        S2T = 7; S4T = 2; S5T = 8; ETH = 7; VIA = 2;
+                                        wait_t = 7 + (2097152 + state->srate / 2) / state->srate;
+                                }
+                                wait_t *= 2; /* FOS */
+                                S2T_set(state, S2T);
+                                S45T_set(state, S4T, S5T);
+                                Vi_set(state, ETH, VIA);
+                                srst(state);
+                                msleep_interruptible(wait_t);
+                                sync = sync_chk(state, &VIRM);
+                                dprintk(verbose, MB86A16_INFO, 1, "-------- Viterbi=[%d] SYNC=[%d] ---------", VIRM, sync);
+                                if (VIRM) {
+                                        if (VIRM == 4) {
+                                                /* 5/6 */
+                                                if (SIG1 > 110)
+                                                        wait_t = (786432 + state->srate / 2) / state->srate;
+                                                else
+                                                        wait_t = (1572864 + state->srate / 2) / state->srate;
+                                                if (state->srate < 5000)
+                                                        /* FIXME ! , should be a long wait ! */
+                                                        msleep_interruptible(wait_t);
+                                                else
+                                                        msleep_interruptible(wait_t);
+
+                                                if (sync_chk(state, &junk) == 0) {
+                                                        iq_vt_set(state, 1);
+                                                        FEC_srst(state);
+                                                }
+                                        }
+                                        /* 1/2, 2/3, 3/4, 7/8 */
+                                        if (SIG1 > 110)
+                                                wait_t = (786432 + state->srate / 2) / state->srate;
+                                        else
+                                                wait_t = (1572864 + state->srate / 2) / state->srate;
+                                        msleep_interruptible(wait_t);
+                                        SEQ_set(state, 1);
+                                } else {
+                                        dprintk(verbose, MB86A16_INFO, 1, "NO  -- SYNC");
+                                        SEQ_set(state, 1);
+                                        ret = -1;
+                                }
+                        }
+                } else {
+                        dprintk(verbose, MB86A16_INFO, 1, "NO  -- SIGNAL");
+                        ret = -1;
+                }
+
+                sync = sync_chk(state, &junk);
+                if (sync) {
+                        dprintk(verbose, MB86A16_INFO, 1, "******* SYNC *******");
+                        freqerr_chk(state, state->frequency, state->srate, 1);
+                        ret = 0;
+                        break;
+                }
+        }
+
+        mb86a16_read(state, 0x15, &agcval);
+        mb86a16_read(state, 0x26, &cnmval);
+        dprintk(verbose, MB86A16_INFO, 1, "AGC = %02x CNM = %02x", agcval, cnmval);
+
+        return ret;
+}
+
+static int mb86a16_send_diseqc_msg(struct dvb_frontend *fe,
+                                   struct dvb_diseqc_master_cmd *cmd)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+        int i;
+        u8 regs;
+
+        if (mb86a16_write(state, MB86A16_DCC1, MB86A16_DCC1_DISTA) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_DCCOUT, 0x00) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_TONEOUT2, 0x04) < 0)
+                goto err;
+
+        regs = 0x18;
+
+        if (cmd->msg_len > 5 || cmd->msg_len < 4)
+                return -EINVAL;
+
+        for (i = 0; i < cmd->msg_len; i++) {
+                if (mb86a16_write(state, regs, cmd->msg[i]) < 0)
+                        goto err;
+
+                regs++;
+        }
+        i += 0x90;
+
+        msleep_interruptible(10);
+
+        if (mb86a16_write(state, MB86A16_DCC1, i) < 0)
+                goto err;
+        if (mb86a16_write(state, MB86A16_DCCOUT, MB86A16_DCCOUT_DISEN) < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int mb86a16_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t burst)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        switch (burst) {
+        case SEC_MINI_A:
+                if (mb86a16_write(state, MB86A16_DCC1, MB86A16_DCC1_DISTA |
+                                                       MB86A16_DCC1_TBEN  |
+                                                       MB86A16_DCC1_TBO) < 0)
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCCOUT, MB86A16_DCCOUT_DISEN) < 0)
+                        goto err;
+                break;
+        case SEC_MINI_B:
+                if (mb86a16_write(state, MB86A16_DCC1, MB86A16_DCC1_DISTA |
+                                                       MB86A16_DCC1_TBEN) < 0)
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCCOUT, MB86A16_DCCOUT_DISEN) < 0)
+                        goto err;
+                break;
+        }
+
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int mb86a16_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        switch (tone) {
+        case SEC_TONE_ON:
+                if (mb86a16_write(state, MB86A16_TONEOUT2, 0x00) < 0)
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCC1, MB86A16_DCC1_DISTA |
+                                                       MB86A16_DCC1_CTOE) < 0)
+
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCCOUT, MB86A16_DCCOUT_DISEN) < 0)
+                        goto err;
+                break;
+        case SEC_TONE_OFF:
+                if (mb86a16_write(state, MB86A16_TONEOUT2, 0x04) < 0)
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCC1, MB86A16_DCC1_DISTA) < 0)
+                        goto err;
+                if (mb86a16_write(state, MB86A16_DCCOUT, 0x00) < 0)
+                        goto err;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe,
+                                        struct dvb_frontend_parameters *p)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        state->frequency = p->frequency / 1000;
+        state->srate = p->u.qpsk.symbol_rate / 1000;
+
+        if (!mb86a16_set_fe(state)) {
+                dprintk(verbose, MB86A16_ERROR, 1, "Succesfully acquired LOCK");
+                return DVBFE_ALGO_SEARCH_SUCCESS;
+        }
+
+        dprintk(verbose, MB86A16_ERROR, 1, "Lock acquisition failed!");
+        return DVBFE_ALGO_SEARCH_FAILED;
+}
+
+static void mb86a16_release(struct dvb_frontend *fe)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+        kfree(state);
+}
+
+static int mb86a16_init(struct dvb_frontend *fe)
+{
+        return 0;
+}
+
+static int mb86a16_sleep(struct dvb_frontend *fe)
+{
+        return 0;
+}
+
+static int mb86a16_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        u8 ber_mon, ber_tab, ber_lsb, ber_mid, ber_msb, ber_tim, ber_rst;
+        u32 timer;
+
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        *ber = 0;
+        if (mb86a16_read(state, MB86A16_BERMON, &ber_mon) != 2)
+                goto err;
+        if (mb86a16_read(state, MB86A16_BERTAB, &ber_tab) != 2)
+                goto err;
+        if (mb86a16_read(state, MB86A16_BERLSB, &ber_lsb) != 2)
+                goto err;
+        if (mb86a16_read(state, MB86A16_BERMID, &ber_mid) != 2)
+                goto err;
+        if (mb86a16_read(state, MB86A16_BERMSB, &ber_msb) != 2)
+                goto err;
+        /* BER monitor invalid when BER_EN = 0  */
+        if (ber_mon & 0x04) {
+                /* coarse, fast calculation     */
+                *ber = ber_tab & 0x1f;
+                dprintk(verbose, MB86A16_DEBUG, 1, "BER coarse=[0x%02x]", *ber);
+                if (ber_mon & 0x01) {
+                        /*
+                         * BER_SEL = 1, The monitored BER is the estimated
+                         * value with a Reed-Solomon decoder error amount at
+                         * the deinterleaver output.
+                         * monitored BER is expressed as a 20 bit output in total
+                         */
+                        ber_rst = ber_mon >> 3;
+                        *ber = (((ber_msb << 8) | ber_mid) << 8) | ber_lsb;
+                        if (ber_rst == 0)
+                                timer =  12500000;
+                        if (ber_rst == 1)
+                                timer =  25000000;
+                        if (ber_rst == 2)
+                                timer =  50000000;
+                        if (ber_rst == 3)
+                                timer = 100000000;
+
+                        *ber /= timer;
+                        dprintk(verbose, MB86A16_DEBUG, 1, "BER fine=[0x%02x]", *ber);
+                } else {
+                        /*
+                         * BER_SEL = 0, The monitored BER is the estimated
+                         * value with a Viterbi decoder error amount at the
+                         * QPSK demodulator output.
+                         * monitored BER is expressed as a 24 bit output in total
+                         */
+                        ber_tim = ber_mon >> 1;
+                        *ber = (((ber_msb << 8) | ber_mid) << 8) | ber_lsb;
+                        if (ber_tim == 0)
+                                timer = 16;
+                        if (ber_tim == 1)
+                                timer = 24;
+
+                        *ber /= 2 ^ timer;
+                        dprintk(verbose, MB86A16_DEBUG, 1, "BER fine=[0x%02x]", *ber);
+                }
+        }
+        return 0;
+err:
+        dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+        return -EREMOTEIO;
+}
+
+static int mb86a16_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        u8 agcm = 0;
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        *strength = 0;
+        if (mb86a16_read(state, MB86A16_AGCM, &agcm) != 2) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        *strength = ((0xff - agcm) * 100) / 256;
+        dprintk(verbose, MB86A16_DEBUG, 1, "Signal strength=[%d %%]", (u8) *strength);
+        *strength = (0xffff - 0xff) + agcm;
+
+        return 0;
+}
+
+struct cnr {
+        u8 cn_reg;
+        u8 cn_val;
+};
+
+static const struct cnr cnr_tab[] = {
+        {  35,  2 },
+        {  40,  3 },
+        {  50,  4 },
+        {  60,  5 },
+        {  70,  6 },
+        {  80,  7 },
+        {  92,  8 },
+        { 103,  9 },
+        { 115, 10 },
+        { 138, 12 },
+        { 162, 15 },
+        { 180, 18 },
+        { 185, 19 },
+        { 189, 20 },
+        { 195, 22 },
+        { 199, 24 },
+        { 201, 25 },
+        { 202, 26 },
+        { 203, 27 },
+        { 205, 28 },
+        { 208, 30 }
+};
+
+static int mb86a16_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct mb86a16_state *state = fe->demodulator_priv;
+        int i = 0;
+        int low_tide = 2, high_tide = 30, q_level;
+        u8  cn;
+
+        *snr = 0;
+        if (mb86a16_read(state, 0x26, &cn) != 2) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(cnr_tab); i++) {
+                if (cn < cnr_tab[i].cn_reg) {
+                        *snr = cnr_tab[i].cn_val;
+                        break;
+                }
+        }
+        q_level = (*snr * 100) / (high_tide - low_tide);
+        dprintk(verbose, MB86A16_ERROR, 1, "SNR (Quality) = [%d dB], Level=%d %%", *snr, q_level);
+        *snr = (0xffff - 0xff) + *snr;
+
+        return 0;
+}
+
+static int mb86a16_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        u8 dist;
+        struct mb86a16_state *state = fe->demodulator_priv;
+
+        if (mb86a16_read(state, MB86A16_DISTMON, &dist) != 2) {
+                dprintk(verbose, MB86A16_ERROR, 1, "I2C transfer error");
+                return -EREMOTEIO;
+        }
+        *ucblocks = dist;
+
+        return 0;
+}
+
+static enum dvbfe_algo mb86a16_frontend_algo(struct dvb_frontend *fe)
+{
+        return DVBFE_ALGO_CUSTOM;
+}
+
+static struct dvb_frontend_ops mb86a16_ops = {
+        .info = {
+                .name                   = "Fujitsu MB86A16 DVB-S",
+                .type                   = FE_QPSK,
+                .frequency_min          = 950000,
+                .frequency_max          = 2150000,
+                .frequency_stepsize     = 3000,
+                .frequency_tolerance    = 0,
+                .symbol_rate_min        = 1000000,
+                .symbol_rate_max        = 45000000,
+                .symbol_rate_tolerance  = 500,
+                .caps                   = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
+                                          FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 |
+                                          FE_CAN_FEC_7_8 | FE_CAN_QPSK    |
+                                          FE_CAN_FEC_AUTO
+        },
+        .release                        = mb86a16_release,
+
+        .get_frontend_algo              = mb86a16_frontend_algo,
+        .search                         = mb86a16_search,
+        .read_status                    = mb86a16_read_status,
+        .init                           = mb86a16_init,
+        .sleep                          = mb86a16_sleep,
+        .read_status                    = mb86a16_read_status,
+
+        .read_ber                       = mb86a16_read_ber,
+        .read_signal_strength           = mb86a16_read_signal_strength,
+        .read_snr                       = mb86a16_read_snr,
+        .read_ucblocks                  = mb86a16_read_ucblocks,
+
+        .diseqc_send_master_cmd         = mb86a16_send_diseqc_msg,
+        .diseqc_send_burst              = mb86a16_send_diseqc_burst,
+        .set_tone                       = mb86a16_set_tone,
+};
+
+struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
+                                    struct i2c_adapter *i2c_adap)
+{
+        u8 dev_id = 0;
+        struct mb86a16_state *state = NULL;
+
+        state = kmalloc(sizeof(struct mb86a16_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        state->config = config;
+        state->i2c_adap = i2c_adap;
+
+        mb86a16_read(state, 0x7f, &dev_id);
+        if (dev_id != 0xfe)
+                goto error;
+
+        memcpy(&state->frontend.ops, &mb86a16_ops, sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        state->frontend.ops.set_voltage = state->config->set_voltage;
+
+        return &state->frontend;
+error:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(mb86a16_attach);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Manu Abraham");
diff --git a/drivers/media/dvb/frontends/mb86a16.h b/drivers/media/dvb/frontends/mb86a16.h
new file mode 100644
index 000000000000..6ea8c376394f
--- /dev/null
+++ b/drivers/media/dvb/frontends/mb86a16.h
@@ -0,0 +1,52 @@
+/*
+        Fujitsu MB86A16 DVB-S/DSS DC Receiver driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MB86A16_H
+#define __MB86A16_H
+
+#include <linux/dvb/frontend.h>
+#include "dvb_frontend.h"
+
+
+struct mb86a16_config {
+        u8 demod_address;
+
+        int (*set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
+};
+
+
+
+#if defined(CONFIG_DVB_MB86A16) || (defined(CONFIG_DVB_MB86A16_MODULE) && defined(MODULE))
+
+extern struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
+                                           struct i2c_adapter *i2c_adap);
+
+#else
+
+static inline struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
+                                           struct i2c_adapter *i2c_adap)
+{
+        printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+
+#endif /* CONFIG_DVB_MB86A16 */
+
+#endif /* __MB86A16_H */
diff --git a/drivers/media/dvb/frontends/mb86a16_priv.h b/drivers/media/dvb/frontends/mb86a16_priv.h
new file mode 100644
index 000000000000..360a35acfe84
--- /dev/null
+++ b/drivers/media/dvb/frontends/mb86a16_priv.h
@@ -0,0 +1,151 @@
+/*
+        Fujitsu MB86A16 DVB-S/DSS DC Receiver driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MB86A16_PRIV_H
+#define __MB86A16_PRIV_H
+
+#define MB86A16_TSOUT           0x00
+#define MB86A16_TSOUT_HIZSEL    (0x01 << 5)
+#define MB86A16_TSOUT_HIZCNTI   (0x01 << 4)
+#define MB86A16_TSOUT_MODE      (0x01 << 3)
+#define MB86A16_TSOUT_ORDER     (0x01 << 2)
+#define MB86A16_TSOUT_ERROR     (0x01 << 1)
+#define Mb86A16_TSOUT_EDGE      (0x01 << 0)
+
+#define MB86A16_FEC             0x01
+#define MB86A16_FEC_FSYNC       (0x01 << 5)
+#define MB86A16_FEC_PCKB8       (0x01 << 4)
+#define MB86A16_FEC_DVDS        (0x01 << 3)
+#define MB86A16_FEC_EREN        (0x01 << 2)
+#define Mb86A16_FEC_RSEN        (0x01 << 1)
+#define MB86A16_FEC_DIEN        (0x01 << 0)
+
+#define MB86A16_AGC             0x02
+#define MB86A16_AGC_AGMD        (0x01 << 6)
+#define MB86A16_AGC_AGCW        (0x0f << 2)
+#define MB86A16_AGC_AGCP        (0x01 << 1)
+#define MB86A16_AGC_AGCR        (0x01 << 0)
+
+#define MB86A16_SRATE1          0x03
+#define MB86A16_SRATE1_DECI     (0x07 << 2)
+#define MB86A16_SRATE1_CSEL     (0x01 << 1)
+#define MB86A16_SRATE1_RSEL     (0x01 << 0)
+
+#define MB86A16_SRATE2          0x04
+#define MB86A16_SRATE2_STOFSL   (0xff << 0)
+
+#define MB86A16_SRATE3          0x05
+#define MB86A16_SRATE2_STOFSH   (0xff << 0)
+
+#define MB86A16_VITERBI         0x06
+#define MB86A16_FRAMESYNC       0x07
+#define MB86A16_CRLFILTCOEF1    0x08
+#define MB86A16_CRLFILTCOEF2    0x09
+#define MB86A16_STRFILTCOEF1    0x0a
+#define MB86A16_STRFILTCOEF2    0x0b
+#define MB86A16_RESET           0x0c
+#define MB86A16_STATUS          0x0d
+#define MB86A16_AFCML           0x0e
+#define MB86A16_AFCMH           0x0f
+#define MB86A16_BERMON          0x10
+#define MB86A16_BERTAB          0x11
+#define MB86A16_BERLSB          0x12
+#define MB86A16_BERMID          0x13
+#define MB86A16_BERMSB          0x14
+#define MB86A16_AGCM            0x15
+
+#define MB86A16_DCC1            0x16
+#define MB86A16_DCC1_DISTA      (0x01 << 7)
+#define MB86A16_DCC1_PRTY       (0x01 << 6)
+#define MB86A16_DCC1_CTOE       (0x01 << 5)
+#define MB86A16_DCC1_TBEN       (0x01 << 4)
+#define MB86A16_DCC1_TBO        (0x01 << 3)
+#define MB86A16_DCC1_NUM        (0x07 << 0)
+
+#define MB86A16_DCC2            0x17
+#define MB86A16_DCC2_DCBST      (0x01 << 0)
+
+#define MB86A16_DCC3            0x18
+#define MB86A16_DCC3_CODE0      (0xff << 0)
+
+#define MB86A16_DCC4            0x19
+#define MB86A16_DCC4_CODE1      (0xff << 0)
+
+#define MB86A16_DCC5            0x1a
+#define MB86A16_DCC5_CODE2      (0xff << 0)
+
+#define MB86A16_DCC6            0x1b
+#define MB86A16_DCC6_CODE3      (0xff << 0)
+
+#define MB86A16_DCC7            0x1c
+#define MB86A16_DCC7_CODE4      (0xff << 0)
+
+#define MB86A16_DCC8            0x1d
+#define MB86A16_DCC8_CODE5      (0xff << 0)
+
+#define MB86A16_DCCOUT          0x1e
+#define MB86A16_DCCOUT_DISEN    (0x01 << 0)
+
+#define MB86A16_TONEOUT1        0x1f
+#define MB86A16_TONE_TDIVL      (0xff << 0)
+
+#define MB86A16_TONEOUT2        0x20
+#define MB86A16_TONE_TMD        (0x03 << 2)
+#define MB86A16_TONE_TDIVH      (0x03 << 0)
+
+#define MB86A16_FREQ1           0x21
+#define MB86A16_FREQ2           0x22
+#define MB86A16_FREQ3           0x23
+#define MB86A16_FREQ4           0x24
+#define MB86A16_FREQSET         0x25
+#define MB86A16_CNM             0x26
+#define MB86A16_PORT0           0x27
+#define MB86A16_PORT1           0x28
+#define MB86A16_DRCFILT         0x29
+#define MB86A16_AFC             0x2a
+#define MB86A16_AFCEXL          0x2b
+#define MB86A16_AFCEXH          0x2c
+#define MB86A16_DAGC            0x2d
+#define MB86A16_SEQMODE         0x32
+#define MB86A16_S0S1T           0x33
+#define MB86A16_S2S3T           0x34
+#define MB86A16_S4S5T           0x35
+#define MB86A16_CNTMR           0x36
+#define MB86A16_SIG1            0x37
+#define MB86A16_SIG2            0x38
+#define MB86A16_VIMAG           0x39
+#define MB86A16_VISET1          0x3a
+#define MB86A16_VISET2          0x3b
+#define MB86A16_VISET3          0x3c
+#define MB86A16_FAGCS1          0x3d
+#define MB86A16_FAGCS2          0x3e
+#define MB86A16_FAGCS3          0x3f
+#define MB86A16_FAGCS4          0x40
+#define MB86A16_FAGCS5          0x41
+#define MB86A16_FAGCS6          0x42
+#define MB86A16_CRM             0x43
+#define MB86A16_STRM            0x44
+#define MB86A16_DAGCML          0x45
+#define MB86A16_DAGCMH          0x46
+#define MB86A16_QPSKTST         0x49
+#define MB86A16_DISTMON         0x52
+#define MB86A16_VERSION         0x7f
+
+#endif /* __MB86A16_PRIV_H */
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 6c1dbf9288d8..6ca533ea0f0e 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -426,6 +426,10 @@ struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
         id = tda10021_readreg(state, 0x1a);
         if ((id & 0xf0) != 0x70) goto error;
 
+        /* Don't claim TDA10023 */
+        if (id == 0x7d)
+                goto error;
+
         printk("TDA10021: i2c-addr = 0x%02x, id = 0x%02x\n",
                state->config->demod_address, id);
 
diff --git a/drivers/media/dvb/frontends/tda665x.c b/drivers/media/dvb/frontends/tda665x.c
new file mode 100644
index 000000000000..87d52739c828
--- /dev/null
+++ b/drivers/media/dvb/frontends/tda665x.c
@@ -0,0 +1,257 @@
+/*
+        TDA665x tuner driver
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "dvb_frontend.h"
+#include "tda665x.h"
+
+struct tda665x_state {
+        struct dvb_frontend             *fe;
+        struct i2c_adapter              *i2c;
+        const struct tda665x_config     *config;
+
+        u32 frequency;
+        u32 bandwidth;
+};
+
+static int tda665x_read(struct tda665x_state *state, u8 *buf)
+{
+        const struct tda665x_config *config = state->config;
+        int err = 0;
+        struct i2c_msg msg = { .addr = config->addr, .flags = I2C_M_RD, .buf = buf, .len = 2 };
+
+        err = i2c_transfer(state->i2c, &msg, 1);
+        if (err != 1)
+                goto exit;
+
+        return err;
+exit:
+        printk(KERN_ERR "%s: I/O Error err=<%d>\n", __func__, err);
+        return err;
+}
+
+static int tda665x_write(struct tda665x_state *state, u8 *buf, u8 length)
+{
+        const struct tda665x_config *config = state->config;
+        int err = 0;
+        struct i2c_msg msg = { .addr = config->addr, .flags = 0, .buf = buf, .len = length };
+
+        err = i2c_transfer(state->i2c, &msg, 1);
+        if (err != 1)
+                goto exit;
+
+        return err;
+exit:
+        printk(KERN_ERR "%s: I/O Error err=<%d>\n", __func__, err);
+        return err;
+}
+
+static int tda665x_get_state(struct dvb_frontend *fe,
+                             enum tuner_param param,
+                             struct tuner_state *tstate)
+{
+        struct tda665x_state *state = fe->tuner_priv;
+        int err = 0;
+
+        switch (param) {
+        case DVBFE_TUNER_FREQUENCY:
+                tstate->frequency = state->frequency;
+                break;
+        case DVBFE_TUNER_BANDWIDTH:
+                break;
+        default:
+                printk(KERN_ERR "%s: Unknown parameter (param=%d)\n", __func__, param);
+                err = -EINVAL;
+                break;
+        }
+
+        return err;
+}
+
+static int tda665x_get_status(struct dvb_frontend *fe, u32 *status)
+{
+        struct tda665x_state *state = fe->tuner_priv;
+        u8 result = 0;
+        int err = 0;
+
+        *status = 0;
+
+        err = tda665x_read(state, &result);
+        if (err < 0)
+                goto exit;
+
+        if ((result >> 6) & 0x01) {
+                printk(KERN_DEBUG "%s: Tuner Phase Locked\n", __func__);
+                *status = 1;
+        }
+
+        return err;
+exit:
+        printk(KERN_ERR "%s: I/O Error\n", __func__);
+        return err;
+}
+
+static int tda665x_set_state(struct dvb_frontend *fe,
+                             enum tuner_param param,
+                             struct tuner_state *tstate)
+{
+        struct tda665x_state *state = fe->tuner_priv;
+        const struct tda665x_config *config = state->config;
+        u32 frequency, status = 0;
+        u8 buf[4];
+        int err = 0;
+
+        if (param & DVBFE_TUNER_FREQUENCY) {
+
+                frequency = tstate->frequency;
+                if ((frequency < config->frequency_max) || (frequency > config->frequency_min)) {
+                        printk(KERN_ERR "%s: Frequency beyond limits, frequency=%d\n", __func__, frequency);
+                        return -EINVAL;
+                }
+
+                frequency += config->frequency_offst;
+                frequency *= config->ref_multiplier;
+                frequency += config->ref_divider >> 1;
+                frequency /= config->ref_divider;
+
+                buf[0] = (u8) (frequency & 0x7f00) >> 8;
+                buf[1] = (u8) (frequency & 0x00ff) >> 0;
+                buf[2] = 0x80 | 0x40 | 0x02;
+                buf[3] = 0x00;
+
+                /* restore frequency */
+                frequency = tstate->frequency;
+
+                if (frequency < 153000000) {
+                        /* VHF-L */
+                        buf[3] |= 0x01; /* fc, Low Band, 47 - 153 MHz */
+                        if (frequency < 68000000)
+                                buf[3] |= 0x40; /* 83uA */
+                        if (frequency < 1040000000)
+                                buf[3] |= 0x60; /* 122uA */
+                        if (frequency < 1250000000)
+                                buf[3] |= 0x80; /* 163uA */
+                        else
+                                buf[3] |= 0xa0; /* 254uA */
+                } else if (frequency < 438000000) {
+                        /* VHF-H */
+                        buf[3] |= 0x02; /* fc, Mid Band, 153 - 438 MHz */
+                        if (frequency < 230000000)
+                                buf[3] |= 0x40;
+                        if (frequency < 300000000)
+                                buf[3] |= 0x60;
+                        else
+                                buf[3] |= 0x80;
+                } else {
+                        /* UHF */
+                        buf[3] |= 0x04; /* fc, High Band, 438 - 862 MHz */
+                        if (frequency < 470000000)
+                                buf[3] |= 0x60;
+                        if (frequency < 526000000)
+                                buf[3] |= 0x80;
+                        else
+                                buf[3] |= 0xa0;
+                }
+
+                /* Set params */
+                err = tda665x_write(state, buf, 5);
+                if (err < 0)
+                        goto exit;
+
+                /* sleep for some time */
+                printk(KERN_DEBUG "%s: Waiting to Phase LOCK\n", __func__);
+                msleep(20);
+                /* check status */
+                err = tda665x_get_status(fe, &status);
+                if (err < 0)
+                        goto exit;
+
+                if (status == 1) {
+                        printk(KERN_DEBUG "%s: Tuner Phase locked: status=%d\n", __func__, status);
+                        state->frequency = frequency; /* cache successful state */
+                } else {
+                        printk(KERN_ERR "%s: No Phase lock: status=%d\n", __func__, status);
+                }
+        } else {
+                printk(KERN_ERR "%s: Unknown parameter (param=%d)\n", __func__, param);
+                return -EINVAL;
+        }
+
+        return 0;
+exit:
+        printk(KERN_ERR "%s: I/O Error\n", __func__);
+        return err;
+}
+
+static int tda665x_release(struct dvb_frontend *fe)
+{
+        struct tda665x_state *state = fe->tuner_priv;
+
+        fe->tuner_priv = NULL;
+        kfree(state);
+        return 0;
+}
+
+static struct dvb_tuner_ops tda665x_ops = {
+
+        .set_state      = tda665x_set_state,
+        .get_state      = tda665x_get_state,
+        .get_status     = tda665x_get_status,
+        .release        = tda665x_release
+};
+
+struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
+                                    const struct tda665x_config *config,
+                                    struct i2c_adapter *i2c)
+{
+        struct tda665x_state *state = NULL;
+        struct dvb_tuner_info *info;
+
+        state = kzalloc(sizeof(struct tda665x_state), GFP_KERNEL);
+        if (state == NULL)
+                goto exit;
+
+        state->config           = config;
+        state->i2c              = i2c;
+        state->fe               = fe;
+        fe->tuner_priv          = state;
+        fe->ops.tuner_ops       = tda665x_ops;
+        info                     = &fe->ops.tuner_ops.info;
+
+        memcpy(info->name, config->name, sizeof(config->name));
+        info->frequency_min     = config->frequency_min;
+        info->frequency_max     = config->frequency_max;
+        info->frequency_step    = config->frequency_offst;
+
+        printk(KERN_DEBUG "%s: Attaching TDA665x (%s) tuner\n", __func__, info->name);
+
+        return fe;
+
+exit:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(tda665x_attach);
+
+MODULE_DESCRIPTION("TDA665x driver");
+MODULE_AUTHOR("Manu Abraham");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/tda665x.h b/drivers/media/dvb/frontends/tda665x.h
new file mode 100644
index 000000000000..ec7927aa75ae
--- /dev/null
+++ b/drivers/media/dvb/frontends/tda665x.h
@@ -0,0 +1,52 @@
+/*
+        TDA665x tuner driver
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __TDA665x_H
+#define __TDA665x_H
+
+struct tda665x_config {
+        char name[128];
+
+        u8      addr;
+        u32     frequency_min;
+        u32     frequency_max;
+        u32     frequency_offst;
+        u32     ref_multiplier;
+        u32     ref_divider;
+};
+
+#if defined(CONFIG_DVB_TDA665x) || (defined(CONFIG_DVB_TDA665x_MODULE) && defined(MODULE))
+
+extern struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
+                                           const struct tda665x_config *config,
+                                           struct i2c_adapter *i2c);
+
+#else
+
+static inline struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
+                                                  const struct tda665x_config *config,
+                                                  struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+
+#endif /* CONFIG_DVB_TDA665x */
+
+#endif /* __TDA665x_H */
diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
new file mode 100644
index 000000000000..f7b72a32adf3
--- /dev/null
+++ b/drivers/media/dvb/mantis/Kconfig
@@ -0,0 +1,32 @@
+config MANTIS_CORE
+        tristate "Mantis/Hopper PCI bridge based devices"
+        depends on PCI && I2C && INPUT
+
+        help
+          Support for PCI cards based on the Mantis and Hopper PCi bridge.
+
+          Say Y if you own such a device and want to use it.
+
+config DVB_MANTIS
+        tristate "MANTIS based cards"
+        depends on MANTIS_CORE && DVB_CORE && PCI && I2C
+        select DVB_MB86A16
+        select DVB_ZL10353
+        select DVB_STV0299
+        select DVB_PLL
+        help
+          Support for PCI cards based on the Mantis PCI bridge.
+          Say Y when you have a Mantis based DVB card and want to use it.
+
+          If unsure say N.
+
+config DVB_HOPPER
+        tristate "HOPPER based cards"
+        depends on MANTIS_CORE && DVB_CORE && PCI && I2C
+        select DVB_ZL10353
+        select DVB_PLL
+        help
+          Support for PCI cards based on the Hopper  PCI bridge.
+          Say Y when you have a Hopper based DVB card and want to use it.
+
+          If unsure say N
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
new file mode 100644
index 000000000000..98dc5cd258ac
--- /dev/null
+++ b/drivers/media/dvb/mantis/Makefile
@@ -0,0 +1,28 @@
+mantis_core-objs :=     mantis_ioc.o    \
+                        mantis_uart.o   \
+                        mantis_dma.o    \
+                        mantis_pci.o    \
+                        mantis_i2c.o    \
+                        mantis_dvb.o    \
+                        mantis_evm.o    \
+                        mantis_hif.o    \
+                        mantis_ca.o     \
+                        mantis_pcmcia.o \
+                        mantis_input.o
+
+mantis-objs     :=      mantis_cards.o  \
+                        mantis_vp1033.o \
+                        mantis_vp1034.o \
+                        mantis_vp1041.o \
+                        mantis_vp2033.o \
+                        mantis_vp2040.o \
+                        mantis_vp3030.o
+
+hopper-objs     :=      hopper_cards.o  \
+                        hopper_vp3028.o
+
+obj-$(CONFIG_MANTIS_CORE)       += mantis_core.o
+obj-$(CONFIG_DVB_MANTIS)        += mantis.o
+obj-$(CONFIG_DVB_HOPPER)        += hopper.o
+
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/dvb/mantis/hopper_cards.c
new file mode 100644
index 000000000000..d073c61e3c0d
--- /dev/null
+++ b/drivers/media/dvb/mantis/hopper_cards.c
@@ -0,0 +1,275 @@
+/*
+        Hopper PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <asm/irq.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "hopper_vp3028.h"
+#include "mantis_dma.h"
+#include "mantis_dvb.h"
+#include "mantis_uart.h"
+#include "mantis_ioc.h"
+#include "mantis_pci.h"
+#include "mantis_i2c.h"
+#include "mantis_reg.h"
+
+static unsigned int verbose;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
+
+#define DRIVER_NAME     "Hopper"
+
+static char *label[10] = {
+        "DMA",
+        "IRQ-0",
+        "IRQ-1",
+        "OCERR",
+        "PABRT",
+        "RIPRR",
+        "PPERR",
+        "FTRGT",
+        "RISCI",
+        "RACK"
+};
+
+static int devs;
+
+static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
+{
+        u32 stat = 0, mask = 0, lstat = 0, mstat = 0;
+        u32 rst_stat = 0, rst_mask = 0;
+
+        struct mantis_pci *mantis;
+        struct mantis_ca *ca;
+
+        mantis = (struct mantis_pci *) dev_id;
+        if (unlikely(mantis == NULL)) {
+                dprintk(MANTIS_ERROR, 1, "Mantis == NULL");
+                return IRQ_NONE;
+        }
+        ca = mantis->mantis_ca;
+
+        stat = mmread(MANTIS_INT_STAT);
+        mask = mmread(MANTIS_INT_MASK);
+        mstat = lstat = stat & ~MANTIS_INT_RISCSTAT;
+        if (!(stat & mask))
+                return IRQ_NONE;
+
+        rst_mask  = MANTIS_GPIF_WRACK  |
+                    MANTIS_GPIF_OTHERR |
+                    MANTIS_SBUF_WSTO   |
+                    MANTIS_GPIF_EXTIRQ;
+
+        rst_stat  = mmread(MANTIS_GPIF_STATUS);
+        rst_stat &= rst_mask;
+        mmwrite(rst_stat, MANTIS_GPIF_STATUS);
+
+        mantis->mantis_int_stat = stat;
+        mantis->mantis_int_mask = mask;
+        dprintk(MANTIS_DEBUG, 0, "\n-- Stat=<%02x> Mask=<%02x> --", stat, mask);
+        if (stat & MANTIS_INT_RISCEN) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[0]);
+        }
+        if (stat & MANTIS_INT_IRQ0) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[1]);
+                mantis->gpif_status = rst_stat;
+                wake_up(&ca->hif_write_wq);
+                schedule_work(&ca->hif_evm_work);
+        }
+        if (stat & MANTIS_INT_IRQ1) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]);
+                schedule_work(&mantis->uart_work);
+        }
+        if (stat & MANTIS_INT_OCERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[3]);
+        }
+        if (stat & MANTIS_INT_PABORT) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[4]);
+        }
+        if (stat & MANTIS_INT_RIPERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[5]);
+        }
+        if (stat & MANTIS_INT_PPERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[6]);
+        }
+        if (stat & MANTIS_INT_FTRGT) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[7]);
+        }
+        if (stat & MANTIS_INT_RISCI) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[8]);
+                mantis->finished_block = (stat & MANTIS_INT_RISCSTAT) >> 28;
+                tasklet_schedule(&mantis->tasklet);
+        }
+        if (stat & MANTIS_INT_I2CDONE) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[9]);
+                wake_up(&mantis->i2c_wq);
+        }
+        mmwrite(stat, MANTIS_INT_STAT);
+        stat &= ~(MANTIS_INT_RISCEN   | MANTIS_INT_I2CDONE |
+                  MANTIS_INT_I2CRACK  | MANTIS_INT_PCMCIA7 |
+                  MANTIS_INT_PCMCIA6  | MANTIS_INT_PCMCIA5 |
+                  MANTIS_INT_PCMCIA4  | MANTIS_INT_PCMCIA3 |
+                  MANTIS_INT_PCMCIA2  | MANTIS_INT_PCMCIA1 |
+                  MANTIS_INT_PCMCIA0  | MANTIS_INT_IRQ1    |
+                  MANTIS_INT_IRQ0     | MANTIS_INT_OCERR   |
+                  MANTIS_INT_PABORT   | MANTIS_INT_RIPERR  |
+                  MANTIS_INT_PPERR    | MANTIS_INT_FTRGT   |
+                  MANTIS_INT_RISCI);
+
+        if (stat)
+                dprintk(MANTIS_DEBUG, 0, "<Unknown> Stat=<%02x> Mask=<%02x>", stat, mask);
+
+        dprintk(MANTIS_DEBUG, 0, "\n");
+        return IRQ_HANDLED;
+}
+
+static int __devinit hopper_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+{
+        struct mantis_pci *mantis;
+        struct mantis_hwconfig *config;
+        int err = 0;
+
+        mantis = kzalloc(sizeof(struct mantis_pci), GFP_KERNEL);
+        if (mantis == NULL) {
+                printk(KERN_ERR "%s ERROR: Out of memory\n", __func__);
+                err = -ENOMEM;
+                goto fail0;
+        }
+
+        mantis->num             = devs;
+        mantis->verbose         = verbose;
+        mantis->pdev            = pdev;
+        config                  = (struct mantis_hwconfig *) pci_id->driver_data;
+        config->irq_handler     = &hopper_irq_handler;
+        mantis->hwconfig        = config;
+
+        err = mantis_pci_init(mantis);
+        if (err) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI initialization failed <%d>", err);
+                goto fail1;
+        }
+
+        err = mantis_stream_control(mantis, STREAM_TO_HIF);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis stream control failed <%d>", err);
+                goto fail1;
+        }
+
+        err = mantis_i2c_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C initialization failed <%d>", err);
+                goto fail2;
+        }
+
+        err = mantis_get_mac(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis MAC address read failed <%d>", err);
+                goto fail2;
+        }
+
+        err = mantis_dma_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA initialization failed <%d>", err);
+                goto fail3;
+        }
+
+        err = mantis_dvb_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB initialization failed <%d>", err);
+                goto fail4;
+        }
+        devs++;
+
+        return err;
+
+fail4:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err);
+        mantis_dma_exit(mantis);
+
+fail3:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C exit! <%d>", err);
+        mantis_i2c_exit(mantis);
+
+fail2:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI exit! <%d>", err);
+        mantis_pci_exit(mantis);
+
+fail1:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis free! <%d>", err);
+        kfree(mantis);
+
+fail0:
+        return err;
+}
+
+static void __devexit hopper_pci_remove(struct pci_dev *pdev)
+{
+        struct mantis_pci *mantis = pci_get_drvdata(pdev);
+
+        if (mantis) {
+                mantis_dvb_exit(mantis);
+                mantis_dma_exit(mantis);
+                mantis_i2c_exit(mantis);
+                mantis_pci_exit(mantis);
+                kfree(mantis);
+        }
+        return;
+
+}
+
+static struct pci_device_id hopper_pci_table[] = {
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3028_DVB_T, &vp3028_config),
+        { }
+};
+
+static struct pci_driver hopper_pci_driver = {
+        .name           = DRIVER_NAME,
+        .id_table       = hopper_pci_table,
+        .probe          = hopper_pci_probe,
+        .remove         = hopper_pci_remove,
+};
+
+static int __devinit hopper_init(void)
+{
+        return pci_register_driver(&hopper_pci_driver);
+}
+
+static void __devexit hopper_exit(void)
+{
+        return pci_unregister_driver(&hopper_pci_driver);
+}
+
+module_init(hopper_init);
+module_exit(hopper_exit);
+
+MODULE_DESCRIPTION("HOPPER driver");
+MODULE_AUTHOR("Manu Abraham");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/dvb/mantis/hopper_vp3028.c
new file mode 100644
index 000000000000..96674c78e86b
--- /dev/null
+++ b/drivers/media/dvb/mantis/hopper_vp3028.c
@@ -0,0 +1,88 @@
+/*
+        Hopper VP-3028 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "zl10353.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "hopper_vp3028.h"
+
+struct zl10353_config hopper_vp3028_config = {
+        .demod_address  = 0x0f,
+};
+
+#define MANTIS_MODEL_NAME       "VP-3028"
+#define MANTIS_DEV_TYPE         "DVB-T"
+
+static int vp3028_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter     = &mantis->adapter;
+        struct mantis_hwconfig *config  = mantis->hwconfig;
+        int err = 0;
+
+        gpio_set_bits(mantis, config->reset, 0);
+        msleep(100);
+        err = mantis_frontend_power(mantis, POWER_ON);
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 1);
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                msleep(250);
+                dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
+                fe = zl10353_attach(&hopper_vp3028_config, adapter);
+
+                if (!fe)
+                        return -1;
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+        dprintk(MANTIS_ERROR, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp3028_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_188,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp3028_frontend_init,
+        .power          = GPIF_A00,
+        .reset          = GPIF_A03,
+};
diff --git a/drivers/media/dvb/mantis/hopper_vp3028.h b/drivers/media/dvb/mantis/hopper_vp3028.h
new file mode 100644
index 000000000000..57239498bc87
--- /dev/null
+++ b/drivers/media/dvb/mantis/hopper_vp3028.h
@@ -0,0 +1,30 @@
+/*
+        Hopper VP-3028 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP3028_H
+#define __MANTIS_VP3028_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_3028_DVB_T    0x0028
+
+extern struct mantis_hwconfig vp3028_config;
+
+#endif /* __MANTIS_VP3028_H */
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
new file mode 100644
index 000000000000..403ce043d00e
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -0,0 +1,207 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_link.h"
+#include "mantis_hif.h"
+#include "mantis_reg.h"
+
+#include "mantis_ca.h"
+
+static int mantis_ca_read_attr_mem(struct dvb_ca_en50221 *en50221, int slot, int addr)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Request Attribute Mem Read", slot);
+
+        if (slot != 0)
+                return -EINVAL;
+
+        return mantis_hif_read_mem(ca, addr);
+}
+
+static int mantis_ca_write_attr_mem(struct dvb_ca_en50221 *en50221, int slot, int addr, u8 data)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Request Attribute Mem Write", slot);
+
+        if (slot != 0)
+                return -EINVAL;
+
+        return mantis_hif_write_mem(ca, addr, data);
+}
+
+static int mantis_ca_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Request CAM control Read", slot);
+
+        if (slot != 0)
+                return -EINVAL;
+
+        return mantis_hif_read_iom(ca, addr);
+}
+
+static int mantis_ca_write_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr, u8 data)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Request CAM control Write", slot);
+
+        if (slot != 0)
+                return -EINVAL;
+
+        return mantis_hif_write_iom(ca, addr, data);
+}
+
+static int mantis_ca_slot_reset(struct dvb_ca_en50221 *en50221, int slot)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Slot RESET", slot);
+        udelay(500); /* Wait.. */
+        mmwrite(0xda, MANTIS_PCMCIA_RESET); /* Leading edge assert */
+        udelay(500);
+        mmwrite(0x00, MANTIS_PCMCIA_RESET); /* Trailing edge deassert */
+        msleep(1000);
+        dvb_ca_en50221_camready_irq(&ca->en50221, 0);
+
+        return 0;
+}
+
+static int mantis_ca_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Slot shutdown", slot);
+
+        return 0;
+}
+
+static int mantis_ts_control(struct dvb_ca_en50221 *en50221, int slot)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): TS control", slot);
+/*      mantis_set_direction(mantis, 1); */ /* Enable TS through CAM */
+
+        return 0;
+}
+
+static int mantis_slot_status(struct dvb_ca_en50221 *en50221, int slot, int open)
+{
+        struct mantis_ca *ca = en50221->data;
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Slot(%d): Poll Slot status", slot);
+
+        if (ca->slot_state == MODULE_INSERTED) {
+                dprintk(MANTIS_DEBUG, 1, "CA Module present and ready");
+                return DVB_CA_EN50221_POLL_CAM_PRESENT | DVB_CA_EN50221_POLL_CAM_READY;
+        } else {
+                dprintk(MANTIS_DEBUG, 1, "CA Module not present or not ready");
+        }
+
+        return 0;
+}
+
+int mantis_ca_init(struct mantis_pci *mantis)
+{
+        struct dvb_adapter *dvb_adapter = &mantis->dvb_adapter;
+        struct mantis_ca *ca;
+        int ca_flags = 0, result;
+
+        dprintk(MANTIS_DEBUG, 1, "Initializing Mantis CA");
+        ca = kzalloc(sizeof(struct mantis_ca), GFP_KERNEL);
+        if (!ca) {
+                dprintk(MANTIS_ERROR, 1, "Out of memory!, exiting ..");
+                result = -ENOMEM;
+                goto err;
+        }
+
+        ca->ca_priv             = mantis;
+        mantis->mantis_ca       = ca;
+        ca_flags                = DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE;
+        /* register CA interface */
+        ca->en50221.owner               = THIS_MODULE;
+        ca->en50221.read_attribute_mem  = mantis_ca_read_attr_mem;
+        ca->en50221.write_attribute_mem = mantis_ca_write_attr_mem;
+        ca->en50221.read_cam_control    = mantis_ca_read_cam_ctl;
+        ca->en50221.write_cam_control   = mantis_ca_write_cam_ctl;
+        ca->en50221.slot_reset          = mantis_ca_slot_reset;
+        ca->en50221.slot_shutdown       = mantis_ca_slot_shutdown;
+        ca->en50221.slot_ts_enable      = mantis_ts_control;
+        ca->en50221.poll_slot_status    = mantis_slot_status;
+        ca->en50221.data                = ca;
+
+        mutex_init(&ca->ca_lock);
+
+        init_waitqueue_head(&ca->hif_data_wq);
+        init_waitqueue_head(&ca->hif_opdone_wq);
+        init_waitqueue_head(&ca->hif_write_wq);
+
+        dprintk(MANTIS_ERROR, 1, "Registering EN50221 device");
+        result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1);
+        if (result != 0) {
+                dprintk(MANTIS_ERROR, 1, "EN50221: Initialization failed <%d>", result);
+                goto err;
+        }
+        dprintk(MANTIS_ERROR, 1, "Registered EN50221 device");
+        mantis_evmgr_init(ca);
+        return 0;
+err:
+        kfree(ca);
+        return result;
+}
+EXPORT_SYMBOL_GPL(mantis_ca_init);
+
+void mantis_ca_exit(struct mantis_pci *mantis)
+{
+        struct mantis_ca *ca = mantis->mantis_ca;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis CA exit");
+
+        mantis_evmgr_exit(ca);
+        dprintk(MANTIS_ERROR, 1, "Unregistering EN50221 device");
+        if (ca)
+                dvb_ca_en50221_release(&ca->en50221);
+
+        kfree(ca);
+}
+EXPORT_SYMBOL_GPL(mantis_ca_exit);
diff --git a/drivers/media/dvb/mantis/mantis_ca.h b/drivers/media/dvb/mantis/mantis_ca.h
new file mode 100644
index 000000000000..dc63e55f7eca
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_ca.h
@@ -0,0 +1,27 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_CA_H
+#define __MANTIS_CA_H
+
+extern int mantis_ca_init(struct mantis_pci *mantis);
+extern void mantis_ca_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_CA_H */
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
new file mode 100644
index 000000000000..16f1708fd3bc
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_cards.c
@@ -0,0 +1,305 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <asm/irq.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+
+#include "mantis_vp1033.h"
+#include "mantis_vp1034.h"
+#include "mantis_vp1041.h"
+#include "mantis_vp2033.h"
+#include "mantis_vp2040.h"
+#include "mantis_vp3030.h"
+
+#include "mantis_dma.h"
+#include "mantis_ca.h"
+#include "mantis_dvb.h"
+#include "mantis_uart.h"
+#include "mantis_ioc.h"
+#include "mantis_pci.h"
+#include "mantis_i2c.h"
+#include "mantis_reg.h"
+
+static unsigned int verbose;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
+
+static int devs;
+
+#define DRIVER_NAME     "Mantis"
+
+static char *label[10] = {
+        "DMA",
+        "IRQ-0",
+        "IRQ-1",
+        "OCERR",
+        "PABRT",
+        "RIPRR",
+        "PPERR",
+        "FTRGT",
+        "RISCI",
+        "RACK"
+};
+
+static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
+{
+        u32 stat = 0, mask = 0, lstat = 0, mstat = 0;
+        u32 rst_stat = 0, rst_mask = 0;
+
+        struct mantis_pci *mantis;
+        struct mantis_ca *ca;
+
+        mantis = (struct mantis_pci *) dev_id;
+        if (unlikely(mantis == NULL)) {
+                dprintk(MANTIS_ERROR, 1, "Mantis == NULL");
+                return IRQ_NONE;
+        }
+        ca = mantis->mantis_ca;
+
+        stat = mmread(MANTIS_INT_STAT);
+        mask = mmread(MANTIS_INT_MASK);
+        mstat = lstat = stat & ~MANTIS_INT_RISCSTAT;
+        if (!(stat & mask))
+                return IRQ_NONE;
+
+        rst_mask  = MANTIS_GPIF_WRACK  |
+                    MANTIS_GPIF_OTHERR |
+                    MANTIS_SBUF_WSTO   |
+                    MANTIS_GPIF_EXTIRQ;
+
+        rst_stat  = mmread(MANTIS_GPIF_STATUS);
+        rst_stat &= rst_mask;
+        mmwrite(rst_stat, MANTIS_GPIF_STATUS);
+
+        mantis->mantis_int_stat = stat;
+        mantis->mantis_int_mask = mask;
+        dprintk(MANTIS_DEBUG, 0, "\n-- Stat=<%02x> Mask=<%02x> --", stat, mask);
+        if (stat & MANTIS_INT_RISCEN) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[0]);
+        }
+        if (stat & MANTIS_INT_IRQ0) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[1]);
+                mantis->gpif_status = rst_stat;
+                wake_up(&ca->hif_write_wq);
+                schedule_work(&ca->hif_evm_work);
+        }
+        if (stat & MANTIS_INT_IRQ1) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]);
+                schedule_work(&mantis->uart_work);
+        }
+        if (stat & MANTIS_INT_OCERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[3]);
+        }
+        if (stat & MANTIS_INT_PABORT) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[4]);
+        }
+        if (stat & MANTIS_INT_RIPERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[5]);
+        }
+        if (stat & MANTIS_INT_PPERR) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[6]);
+        }
+        if (stat & MANTIS_INT_FTRGT) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[7]);
+        }
+        if (stat & MANTIS_INT_RISCI) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[8]);
+                mantis->finished_block = (stat & MANTIS_INT_RISCSTAT) >> 28;
+                tasklet_schedule(&mantis->tasklet);
+        }
+        if (stat & MANTIS_INT_I2CDONE) {
+                dprintk(MANTIS_DEBUG, 0, "<%s>", label[9]);
+                wake_up(&mantis->i2c_wq);
+        }
+        mmwrite(stat, MANTIS_INT_STAT);
+        stat &= ~(MANTIS_INT_RISCEN   | MANTIS_INT_I2CDONE |
+                  MANTIS_INT_I2CRACK  | MANTIS_INT_PCMCIA7 |
+                  MANTIS_INT_PCMCIA6  | MANTIS_INT_PCMCIA5 |
+                  MANTIS_INT_PCMCIA4  | MANTIS_INT_PCMCIA3 |
+                  MANTIS_INT_PCMCIA2  | MANTIS_INT_PCMCIA1 |
+                  MANTIS_INT_PCMCIA0  | MANTIS_INT_IRQ1    |
+                  MANTIS_INT_IRQ0     | MANTIS_INT_OCERR   |
+                  MANTIS_INT_PABORT   | MANTIS_INT_RIPERR  |
+                  MANTIS_INT_PPERR    | MANTIS_INT_FTRGT   |
+                  MANTIS_INT_RISCI);
+
+        if (stat)
+                dprintk(MANTIS_DEBUG, 0, "<Unknown> Stat=<%02x> Mask=<%02x>", stat, mask);
+
+        dprintk(MANTIS_DEBUG, 0, "\n");
+        return IRQ_HANDLED;
+}
+
+static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+{
+        struct mantis_pci *mantis;
+        struct mantis_hwconfig *config;
+        int err = 0;
+
+        mantis = kzalloc(sizeof(struct mantis_pci), GFP_KERNEL);
+        if (mantis == NULL) {
+                printk(KERN_ERR "%s ERROR: Out of memory\n", __func__);
+                err = -ENOMEM;
+                goto fail0;
+        }
+
+        mantis->num             = devs;
+        mantis->verbose         = verbose;
+        mantis->pdev            = pdev;
+        config                  = (struct mantis_hwconfig *) pci_id->driver_data;
+        config->irq_handler     = &mantis_irq_handler;
+        mantis->hwconfig        = config;
+
+        err = mantis_pci_init(mantis);
+        if (err) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI initialization failed <%d>", err);
+                goto fail1;
+        }
+
+        err = mantis_stream_control(mantis, STREAM_TO_HIF);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis stream control failed <%d>", err);
+                goto fail1;
+        }
+
+        err = mantis_i2c_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C initialization failed <%d>", err);
+                goto fail2;
+        }
+
+        err = mantis_get_mac(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis MAC address read failed <%d>", err);
+                goto fail2;
+        }
+
+        err = mantis_dma_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA initialization failed <%d>", err);
+                goto fail3;
+        }
+
+        err = mantis_dvb_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB initialization failed <%d>", err);
+                goto fail4;
+        }
+        err = mantis_uart_init(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART initialization failed <%d>", err);
+                goto fail6;
+        }
+
+        devs++;
+
+        return err;
+
+
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART exit! <%d>", err);
+        mantis_uart_exit(mantis);
+
+fail6:
+fail4:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err);
+        mantis_dma_exit(mantis);
+
+fail3:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis I2C exit! <%d>", err);
+        mantis_i2c_exit(mantis);
+
+fail2:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis PCI exit! <%d>", err);
+        mantis_pci_exit(mantis);
+
+fail1:
+        dprintk(MANTIS_ERROR, 1, "ERROR: Mantis free! <%d>", err);
+        kfree(mantis);
+
+fail0:
+        return err;
+}
+
+static void __devexit mantis_pci_remove(struct pci_dev *pdev)
+{
+        struct mantis_pci *mantis = pci_get_drvdata(pdev);
+
+        if (mantis) {
+
+                mantis_uart_exit(mantis);
+                mantis_dvb_exit(mantis);
+                mantis_dma_exit(mantis);
+                mantis_i2c_exit(mantis);
+                mantis_pci_exit(mantis);
+                kfree(mantis);
+        }
+        return;
+}
+
+static struct pci_device_id mantis_pci_table[] = {
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_1033_DVB_S, &vp1033_config),
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_1034_DVB_S, &vp1034_config),
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_1041_DVB_S2, &vp1041_config),
+        MAKE_ENTRY(TECHNISAT, SKYSTAR_HD2_10, &vp1041_config),
+        MAKE_ENTRY(TECHNISAT, SKYSTAR_HD2_20, &vp1041_config),
+        MAKE_ENTRY(TERRATEC, CINERGY_S2_PCI_HD, &vp1041_config),
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
+        MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
+        MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
+        MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
+        { }
+};
+
+static struct pci_driver mantis_pci_driver = {
+        .name           = DRIVER_NAME,
+        .id_table       = mantis_pci_table,
+        .probe          = mantis_pci_probe,
+        .remove         = mantis_pci_remove,
+};
+
+static int __devinit mantis_init(void)
+{
+        return pci_register_driver(&mantis_pci_driver);
+}
+
+static void __devexit mantis_exit(void)
+{
+        return pci_unregister_driver(&mantis_pci_driver);
+}
+
+module_init(mantis_init);
+module_exit(mantis_exit);
+
+MODULE_DESCRIPTION("MANTIS driver");
+MODULE_AUTHOR("Manu Abraham");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
new file mode 100644
index 000000000000..d0b645a483c9
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -0,0 +1,179 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_COMMON_H
+#define __MANTIS_COMMON_H
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+
+#include "mantis_uart.h"
+
+#include "mantis_link.h"
+
+#define MANTIS_ERROR            0
+#define MANTIS_NOTICE           1
+#define MANTIS_INFO             2
+#define MANTIS_DEBUG            3
+#define MANTIS_TMG              9
+
+#define dprintk(y, z, format, arg...) do {                                                              \
+        if (z) {                                                                                        \
+                if      ((mantis->verbose > MANTIS_ERROR) && (mantis->verbose > y))                     \
+                        printk(KERN_ERR "%s (%d): " format "\n" , __func__ , mantis->num , ##arg);      \
+                else if ((mantis->verbose > MANTIS_NOTICE) && (mantis->verbose > y))                    \
+                        printk(KERN_NOTICE "%s (%d): " format "\n" , __func__ , mantis->num , ##arg);   \
+                else if ((mantis->verbose > MANTIS_INFO) && (mantis->verbose > y))                      \
+                        printk(KERN_INFO "%s (%d): " format "\n" , __func__ , mantis->num , ##arg);     \
+                else if ((mantis->verbose > MANTIS_DEBUG) && (mantis->verbose > y))                     \
+                        printk(KERN_DEBUG "%s (%d): " format "\n" , __func__ , mantis->num , ##arg);    \
+                else if ((mantis->verbose > MANTIS_TMG) && (mantis->verbose > y))                       \
+                        printk(KERN_DEBUG "%s (%d): " format "\n" , __func__ , mantis->num , ##arg);    \
+        } else {                                                                                        \
+                if (mantis->verbose > y)                                                                \
+                        printk(format , ##arg);                                                         \
+        }                                                                                               \
+} while(0)
+
+#define mwrite(dat, addr)       writel((dat), addr)
+#define mread(addr)             readl(addr)
+
+#define mmwrite(dat, addr)      mwrite((dat), (mantis->mmio + (addr)))
+#define mmread(addr)            mread(mantis->mmio + (addr))
+
+#define MANTIS_TS_188           0
+#define MANTIS_TS_204           1
+
+#define TWINHAN_TECHNOLOGIES    0x1822
+#define MANTIS                  0x4e35
+
+#define TECHNISAT               0x1ae4
+#define TERRATEC                0x153b
+
+#define MAKE_ENTRY(__subven, __subdev, __configptr) {                   \
+                .vendor         = TWINHAN_TECHNOLOGIES,                 \
+                .device         = MANTIS,                               \
+                .subvendor      = (__subven),                           \
+                .subdevice      = (__subdev),                           \
+                .driver_data    = (unsigned long) (__configptr)         \
+}
+
+enum mantis_i2c_mode {
+        MANTIS_PAGE_MODE = 0,
+        MANTIS_BYTE_MODE,
+};
+
+struct mantis_pci;
+
+struct mantis_hwconfig {
+        char                    *model_name;
+        char                    *dev_type;
+        u32                     ts_size;
+
+        enum mantis_baud        baud_rate;
+        enum mantis_parity      parity;
+        u32                     bytes;
+
+        irqreturn_t (*irq_handler)(int irq, void *dev_id);
+        int (*frontend_init)(struct mantis_pci *mantis, struct dvb_frontend *fe);
+
+        u8                      power;
+        u8                      reset;
+
+        enum mantis_i2c_mode    i2c_mode;
+};
+
+struct mantis_pci {
+        unsigned int            verbose;
+
+        /*      PCI stuff               */
+        u16                     vendor_id;
+        u16                     device_id;
+        u16                     subsystem_vendor;
+        u16                     subsystem_device;
+
+        u8                      latency;
+
+        struct pci_dev          *pdev;
+
+        unsigned long           mantis_addr;
+        void __iomem            *mmio;
+
+        u8                      irq;
+        u8                      revision;
+
+        unsigned int            num;
+
+        /*      RISC Core               */
+        u32                     finished_block;
+        u32                     last_block;
+        u32                     line_bytes;
+        u32                     line_count;
+        u32                     risc_pos;
+        u8                      *buf_cpu;
+        dma_addr_t              buf_dma;
+        u32                     *risc_cpu;
+        dma_addr_t              risc_dma;
+
+        struct tasklet_struct   tasklet;
+
+        struct i2c_adapter      adapter;
+        int                     i2c_rc;
+        wait_queue_head_t       i2c_wq;
+        struct mutex            i2c_lock;
+
+        /*      DVB stuff               */
+        struct dvb_adapter      dvb_adapter;
+        struct dvb_frontend     *fe;
+        struct dvb_demux        demux;
+        struct dmxdev           dmxdev;
+        struct dmx_frontend     fe_hw;
+        struct dmx_frontend     fe_mem;
+        struct dvb_net          dvbnet;
+
+        u8                      feeds;
+
+        struct mantis_hwconfig  *hwconfig;
+
+        u32                     mantis_int_stat;
+        u32                     mantis_int_mask;
+
+        /*      board specific          */
+        u8                      mac_address[8];
+        u32                     sub_vendor_id;
+        u32                     sub_device_id;
+
+         /*     A12 A13 A14             */
+        u32                     gpio_status;
+
+        u32                     gpif_status;
+
+        struct mantis_ca        *mantis_ca;
+
+        wait_queue_head_t       uart_wq;
+        struct work_struct      uart_work;
+        spinlock_t              uart_lock;
+
+        struct input_dev        *rc;
+};
+
+#define MANTIS_HIF_STATUS       (mantis->gpio_status)
+
+#endif /* __MANTIS_COMMON_H */
diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
new file mode 100644
index 000000000000..8113b23ce448
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -0,0 +1,238 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "mantis_common.h"
+#include "mantis_core.h"
+#include "mantis_vp1033.h"
+#include "mantis_vp1034.h"
+#include "mantis_vp1041.h"
+#include "mantis_vp2033.h"
+#include "mantis_vp2040.h"
+#include "mantis_vp3030.h"
+
+static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
+{
+        int err;
+        struct i2c_msg msg[] = {
+                {
+                        .addr = 0x50,
+                        .flags = 0,
+                        .buf = data,
+                        .len = 1
+                }, {
+                        .addr = 0x50,
+                        .flags = I2C_M_RD,
+                        .buf = data,
+                        .len = length
+                },
+        };
+
+        err = i2c_transfer(&mantis->adapter, msg, 2);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1,
+                        "ERROR: i2c read: < err=%i d0=0x%02x d1=0x%02x >",
+                        err, data[0], data[1]);
+
+                return err;
+        }
+
+        return 0;
+}
+
+static int write_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
+{
+        int err;
+
+        struct i2c_msg msg = {
+                .addr = 0x50,
+                .flags = 0,
+                .buf = data,
+                .len = length
+        };
+
+        err = i2c_transfer(&mantis->adapter, &msg, 1);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1,
+                        "ERROR: i2c write: < err=%i length=0x%02x d0=0x%02x, d1=0x%02x >",
+                        err, length, data[0], data[1]);
+
+                return err;
+        }
+
+        return 0;
+}
+
+static int get_mac_address(struct mantis_pci *mantis)
+{
+        int err;
+
+        mantis->mac_address[0] = 0x08;
+        err = read_eeprom_byte(mantis, &mantis->mac_address[0], 6);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1, "Mantis EEPROM read error");
+
+                return err;
+        }
+        dprintk(verbose, MANTIS_ERROR, 0,
+                "    MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]\n",
+                mantis->mac_address[0], mantis->mac_address[1],
+                mantis->mac_address[2], mantis->mac_address[3],
+                mantis->mac_address[4], mantis->mac_address[5]);
+
+        return 0;
+}
+
+#define MANTIS_MODEL_UNKNOWN    "UNKNOWN"
+#define MANTIS_DEV_UNKNOWN      "UNKNOWN"
+
+struct mantis_hwconfig unknown_device = {
+        .model_name     = MANTIS_MODEL_UNKNOWN,
+        .dev_type       = MANTIS_DEV_UNKNOWN,
+};
+
+static void mantis_load_config(struct mantis_pci *mantis)
+{
+        switch (mantis->subsystem_device) {
+        case MANTIS_VP_1033_DVB_S:      /* VP-1033 */
+                mantis->hwconfig = &vp1033_mantis_config;
+                break;
+        case MANTIS_VP_1034_DVB_S:      /* VP-1034 */
+                mantis->hwconfig = &vp1034_mantis_config;
+                break;
+        case MANTIS_VP_1041_DVB_S2:     /* VP-1041 */
+        case TECHNISAT_SKYSTAR_HD2:
+                mantis->hwconfig = &vp1041_mantis_config;
+                break;
+        case MANTIS_VP_2033_DVB_C:      /* VP-2033 */
+                mantis->hwconfig = &vp2033_mantis_config;
+                break;
+        case MANTIS_VP_2040_DVB_C:      /* VP-2040 */
+        case TERRATEC_CINERGY_C_PCI:    /* VP-2040 clone */
+        case TECHNISAT_CABLESTAR_HD2:
+                mantis->hwconfig = &vp2040_mantis_config;
+                break;
+        case MANTIS_VP_3030_DVB_T:      /* VP-3030 */
+                mantis->hwconfig = &vp3030_mantis_config;
+                break;
+        default:
+                mantis->hwconfig = &unknown_device;
+                break;
+        }
+}
+
+int mantis_core_init(struct mantis_pci *mantis)
+{
+        int err = 0;
+
+        mantis_load_config(mantis);
+        dprintk(verbose, MANTIS_ERROR, 0, "found a %s PCI %s device on (%02x:%02x.%x),\n",
+                mantis->hwconfig->model_name, mantis->hwconfig->dev_type,
+                mantis->pdev->bus->number, PCI_SLOT(mantis->pdev->devfn), PCI_FUNC(mantis->pdev->devfn));
+        dprintk(verbose, MANTIS_ERROR, 0, "    Mantis Rev %d [%04x:%04x], ",
+                mantis->revision,
+                mantis->subsystem_vendor, mantis->subsystem_device);
+        dprintk(verbose, MANTIS_ERROR, 0,
+                "irq: %d, latency: %d\n    memory: 0x%lx, mmio: 0x%p\n",
+                mantis->pdev->irq, mantis->latency,
+                mantis->mantis_addr, mantis->mantis_mmio);
+
+        err = mantis_i2c_init(mantis);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1, "Mantis I2C init failed");
+                return err;
+        }
+        err = get_mac_address(mantis);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1, "get MAC address failed");
+                return err;
+        }
+        err = mantis_dma_init(mantis);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_ERROR, 1, "Mantis DMA init failed");
+                return err;
+        }
+        err = mantis_dvb_init(mantis);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_DEBUG, 1, "Mantis DVB init failed");
+                return err;
+        }
+        err = mantis_uart_init(mantis);
+        if (err < 0) {
+                dprintk(verbose, MANTIS_DEBUG, 1, "Mantis UART init failed");
+                return err;
+        }
+
+        return 0;
+}
+
+int mantis_core_exit(struct mantis_pci *mantis)
+{
+        mantis_dma_stop(mantis);
+        dprintk(verbose, MANTIS_ERROR, 1, "DMA engine stopping");
+
+        mantis_uart_exit(mantis);
+        dprintk(verbose, MANTIS_ERROR, 1, "UART exit failed");
+
+        if (mantis_dma_exit(mantis) < 0)
+                dprintk(verbose, MANTIS_ERROR, 1, "DMA exit failed");
+        if (mantis_dvb_exit(mantis) < 0)
+                dprintk(verbose, MANTIS_ERROR, 1, "DVB exit failed");
+        if (mantis_i2c_exit(mantis) < 0)
+                dprintk(verbose, MANTIS_ERROR, 1, "I2C adapter delete.. failed");
+
+        return 0;
+}
+
+/* Turn the given bit on or off. */
+void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
+{
+        u32 cur;
+
+        cur = mmread(MANTIS_GPIF_ADDR);
+        if (value)
+                mantis->gpio_status = cur | (1 << bitpos);
+        else
+                mantis->gpio_status = cur & (~(1 << bitpos));
+
+        mmwrite(mantis->gpio_status, MANTIS_GPIF_ADDR);
+        mmwrite(0x00, MANTIS_GPIF_DOUT);
+        udelay(100);
+}
+
+/* direction = 0 , no CI passthrough ; 1 , CI passthrough */
+void mantis_set_direction(struct mantis_pci *mantis, int direction)
+{
+        u32 reg;
+
+        reg = mmread(0x28);
+        dprintk(verbose, MANTIS_DEBUG, 1, "TS direction setup");
+        if (direction == 0x01) {
+                /* to CI */
+                reg |= 0x04;
+                mmwrite(reg, 0x28);
+                reg &= 0xff - 0x04;
+                mmwrite(reg, 0x28);
+        } else {
+                reg &= 0xff - 0x04;
+                mmwrite(reg, 0x28);
+                reg |= 0x04;
+                mmwrite(reg, 0x28);
+        }
+}
diff --git a/drivers/media/dvb/mantis/mantis_core.h b/drivers/media/dvb/mantis/mantis_core.h
new file mode 100644
index 000000000000..833ee42e694e
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_core.h
@@ -0,0 +1,57 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_CORE_H
+#define __MANTIS_CORE_H
+
+#include "mantis_common.h"
+
+
+#define FE_TYPE_SAT     0
+#define FE_TYPE_CAB     1
+#define FE_TYPE_TER     2
+
+#define FE_TYPE_TS204   0
+#define FE_TYPE_TS188   1
+
+
+struct vendorname {
+        u8  *sub_vendor_name;
+        u32 sub_vendor_id;
+};
+
+struct devicetype {
+        u8  *sub_device_name;
+        u32 sub_device_id;
+        u8  device_type;
+        u32 type_flags;
+};
+
+
+extern int mantis_dma_init(struct mantis_pci *mantis);
+extern int mantis_dma_exit(struct mantis_pci *mantis);
+extern void mantis_dma_start(struct mantis_pci *mantis);
+extern void mantis_dma_stop(struct mantis_pci *mantis);
+extern int mantis_i2c_init(struct mantis_pci *mantis);
+extern int mantis_i2c_exit(struct mantis_pci *mantis);
+extern int mantis_core_init(struct mantis_pci *mantis);
+extern int mantis_core_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_CORE_H */
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
new file mode 100644
index 000000000000..46202a4012aa
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_dma.c
@@ -0,0 +1,256 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+#include <asm/page.h>
+#include <linux/vmalloc.h>
+#include <linux/pci.h>
+
+#include <asm/irq.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_dma.h"
+
+#define RISC_WRITE              (0x01 << 28)
+#define RISC_JUMP               (0x07 << 28)
+#define RISC_IRQ                (0x01 << 24)
+
+#define RISC_STATUS(status)     ((((~status) & 0x0f) << 20) | ((status & 0x0f) << 16))
+#define RISC_FLUSH()            (mantis->risc_pos = 0)
+#define RISC_INSTR(opcode)      (mantis->risc_cpu[mantis->risc_pos++] = cpu_to_le32(opcode))
+
+#define MANTIS_BUF_SIZE         (64 * 1024)
+#define MANTIS_BLOCK_BYTES      (MANTIS_BUF_SIZE >> 4)
+#define MANTIS_BLOCK_COUNT      (1 << 4)
+#define MANTIS_RISC_SIZE        PAGE_SIZE
+
+int mantis_dma_exit(struct mantis_pci *mantis)
+{
+        if (mantis->buf_cpu) {
+                dprintk(MANTIS_ERROR, 1,
+                        "DMA=0x%lx cpu=0x%p size=%d",
+                        (unsigned long) mantis->buf_dma,
+                         mantis->buf_cpu,
+                         MANTIS_BUF_SIZE);
+
+                pci_free_consistent(mantis->pdev, MANTIS_BUF_SIZE,
+                                    mantis->buf_cpu, mantis->buf_dma);
+
+                mantis->buf_cpu = NULL;
+        }
+        if (mantis->risc_cpu) {
+                dprintk(MANTIS_ERROR, 1,
+                        "RISC=0x%lx cpu=0x%p size=%lx",
+                        (unsigned long) mantis->risc_dma,
+                        mantis->risc_cpu,
+                        MANTIS_RISC_SIZE);
+
+                pci_free_consistent(mantis->pdev, MANTIS_RISC_SIZE,
+                                    mantis->risc_cpu, mantis->risc_dma);
+
+                mantis->risc_cpu = NULL;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_dma_exit);
+
+static inline int mantis_alloc_buffers(struct mantis_pci *mantis)
+{
+        if (!mantis->buf_cpu) {
+                mantis->buf_cpu = pci_alloc_consistent(mantis->pdev,
+                                                       MANTIS_BUF_SIZE,
+                                                       &mantis->buf_dma);
+                if (!mantis->buf_cpu) {
+                        dprintk(MANTIS_ERROR, 1,
+                                "DMA buffer allocation failed");
+
+                        goto err;
+                }
+                dprintk(MANTIS_ERROR, 1,
+                        "DMA=0x%lx cpu=0x%p size=%d",
+                        (unsigned long) mantis->buf_dma,
+                        mantis->buf_cpu, MANTIS_BUF_SIZE);
+        }
+        if (!mantis->risc_cpu) {
+                mantis->risc_cpu = pci_alloc_consistent(mantis->pdev,
+                                                        MANTIS_RISC_SIZE,
+                                                        &mantis->risc_dma);
+
+                if (!mantis->risc_cpu) {
+                        dprintk(MANTIS_ERROR, 1,
+                                "RISC program allocation failed");
+
+                        mantis_dma_exit(mantis);
+
+                        goto err;
+                }
+                dprintk(MANTIS_ERROR, 1,
+                        "RISC=0x%lx cpu=0x%p size=%lx",
+                        (unsigned long) mantis->risc_dma,
+                        mantis->risc_cpu, MANTIS_RISC_SIZE);
+        }
+
+        return 0;
+err:
+        dprintk(MANTIS_ERROR, 1, "Out of memory (?) .....");
+        return -ENOMEM;
+}
+
+static inline int mantis_calc_lines(struct mantis_pci *mantis)
+{
+        mantis->line_bytes = MANTIS_BLOCK_BYTES;
+        mantis->line_count = MANTIS_BLOCK_COUNT;
+
+        while (mantis->line_bytes > 4095) {
+                mantis->line_bytes >>= 1;
+                mantis->line_count <<= 1;
+        }
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis RISC block bytes=[%d], line bytes=[%d], line count=[%d]",
+                MANTIS_BLOCK_BYTES, mantis->line_bytes, mantis->line_count);
+
+        if (mantis->line_count > 255) {
+                dprintk(MANTIS_ERROR, 1, "Buffer size error");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+int mantis_dma_init(struct mantis_pci *mantis)
+{
+        int err = 0;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis DMA init");
+        if (mantis_alloc_buffers(mantis) < 0) {
+                dprintk(MANTIS_ERROR, 1, "Error allocating DMA buffer");
+
+                /* Stop RISC Engine */
+                mmwrite(0, MANTIS_DMA_CTL);
+
+                goto err;
+        }
+        err = mantis_calc_lines(mantis);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "Mantis calc lines failed");
+
+                goto err;
+        }
+
+        return 0;
+err:
+        return err;
+}
+EXPORT_SYMBOL_GPL(mantis_dma_init);
+
+static inline void mantis_risc_program(struct mantis_pci *mantis)
+{
+        u32 buf_pos = 0;
+        u32 line;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis create RISC program");
+        RISC_FLUSH();
+
+        dprintk(MANTIS_DEBUG, 1, "risc len lines %u, bytes per line %u",
+                mantis->line_count, mantis->line_bytes);
+
+        for (line = 0; line < mantis->line_count; line++) {
+                dprintk(MANTIS_DEBUG, 1, "RISC PROG line=[%d]", line);
+                if (!(buf_pos % MANTIS_BLOCK_BYTES)) {
+                        RISC_INSTR(RISC_WRITE   |
+                                   RISC_IRQ     |
+                                   RISC_STATUS(((buf_pos / MANTIS_BLOCK_BYTES) +
+                                   (MANTIS_BLOCK_COUNT - 1)) %
+                                    MANTIS_BLOCK_COUNT) |
+                                    mantis->line_bytes);
+                } else {
+                        RISC_INSTR(RISC_WRITE   | mantis->line_bytes);
+                }
+                RISC_INSTR(mantis->buf_dma + buf_pos);
+                buf_pos += mantis->line_bytes;
+        }
+        RISC_INSTR(RISC_JUMP);
+        RISC_INSTR(mantis->risc_dma);
+}
+
+void mantis_dma_start(struct mantis_pci *mantis)
+{
+        dprintk(MANTIS_DEBUG, 1, "Mantis Start DMA engine");
+
+        mantis_risc_program(mantis);
+        mmwrite(mantis->risc_dma, MANTIS_RISC_START);
+        mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_ADDR);
+
+        mmwrite(0, MANTIS_DMA_CTL);
+        mantis->last_block = mantis->finished_block = 0;
+
+        mmwrite(mmread(MANTIS_INT_MASK) | MANTIS_INT_RISCI, MANTIS_INT_MASK);
+
+        mmwrite(MANTIS_FIFO_EN | MANTIS_DCAP_EN
+                               | MANTIS_RISC_EN, MANTIS_DMA_CTL);
+
+}
+
+void mantis_dma_stop(struct mantis_pci *mantis)
+{
+        u32 stat = 0, mask = 0;
+
+        stat = mmread(MANTIS_INT_STAT);
+        mask = mmread(MANTIS_INT_MASK);
+        dprintk(MANTIS_DEBUG, 1, "Mantis Stop DMA engine");
+
+        mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_ADDR);
+
+        mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN |
+                                            MANTIS_DCAP_EN |
+                                            MANTIS_RISC_EN)), MANTIS_DMA_CTL);
+
+        mmwrite(mmread(MANTIS_INT_STAT), MANTIS_INT_STAT);
+
+        mmwrite(mmread(MANTIS_INT_MASK) & ~(MANTIS_INT_RISCI |
+                                            MANTIS_INT_RISCEN), MANTIS_INT_MASK);
+}
+
+
+void mantis_dma_xfer(unsigned long data)
+{
+        struct mantis_pci *mantis = (struct mantis_pci *) data;
+        struct mantis_hwconfig *config = mantis->hwconfig;
+
+        while (mantis->last_block != mantis->finished_block) {
+                dprintk(MANTIS_DEBUG, 1, "last block=[%d] finished block=[%d]",
+                        mantis->last_block, mantis->finished_block);
+
+                (config->ts_size ? dvb_dmx_swfilter_204 : dvb_dmx_swfilter)
+                (&mantis->demux, &mantis->buf_cpu[mantis->last_block * MANTIS_BLOCK_BYTES], MANTIS_BLOCK_BYTES);
+                mantis->last_block = (mantis->last_block + 1) % MANTIS_BLOCK_COUNT;
+        }
+}
diff --git a/drivers/media/dvb/mantis/mantis_dma.h b/drivers/media/dvb/mantis/mantis_dma.h
new file mode 100644
index 000000000000..6be00fa82094
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_dma.h
@@ -0,0 +1,30 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_DMA_H
+#define __MANTIS_DMA_H
+
+extern int mantis_dma_init(struct mantis_pci *mantis);
+extern int mantis_dma_exit(struct mantis_pci *mantis);
+extern void mantis_dma_start(struct mantis_pci *mantis);
+extern void mantis_dma_stop(struct mantis_pci *mantis);
+extern void mantis_dma_xfer(unsigned long data);
+
+#endif /* __MANTIS_DMA_H */
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
new file mode 100644
index 000000000000..99d82eec3b03
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -0,0 +1,296 @@
+/*
+        Mantis PCI bridge driver
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/i2c.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_dma.h"
+#include "mantis_ca.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+int mantis_frontend_power(struct mantis_pci *mantis, enum mantis_power power)
+{
+        struct mantis_hwconfig *config = mantis->hwconfig;
+
+        switch (power) {
+        case POWER_ON:
+                dprintk(MANTIS_DEBUG, 1, "Power ON");
+                gpio_set_bits(mantis, config->power, POWER_ON);
+                msleep(100);
+                gpio_set_bits(mantis, config->power, POWER_ON);
+                msleep(100);
+                break;
+
+        case POWER_OFF:
+                dprintk(MANTIS_DEBUG, 1, "Power OFF");
+                gpio_set_bits(mantis, config->power, POWER_OFF);
+                msleep(100);
+                break;
+
+        default:
+                dprintk(MANTIS_DEBUG, 1, "Unknown state <%02x>", power);
+                return -1;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_frontend_power);
+
+void mantis_frontend_soft_reset(struct mantis_pci *mantis)
+{
+        struct mantis_hwconfig *config = mantis->hwconfig;
+
+        dprintk(MANTIS_DEBUG, 1, "Frontend RESET");
+        gpio_set_bits(mantis, config->reset, 0);
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 0);
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 1);
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 1);
+        msleep(100);
+
+        return;
+}
+EXPORT_SYMBOL_GPL(mantis_frontend_soft_reset);
+
+static int mantis_frontend_shutdown(struct mantis_pci *mantis)
+{
+        int err;
+
+        mantis_frontend_soft_reset(mantis);
+        err = mantis_frontend_power(mantis, POWER_OFF);
+        if (err != 0) {
+                dprintk(MANTIS_ERROR, 1, "Frontend POWER OFF failed! <%d>", err);
+                return 1;
+        }
+
+        return 0;
+}
+
+static int mantis_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
+        struct mantis_pci *mantis = dvbdmx->priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis DVB Start feed");
+        if (!dvbdmx->dmx.frontend) {
+                dprintk(MANTIS_DEBUG, 1, "no frontend ?");
+                return -EINVAL;
+        }
+
+        mantis->feeds++;
+        dprintk(MANTIS_DEBUG, 1, "mantis start feed, feeds=%d", mantis->feeds);
+
+        if (mantis->feeds == 1)  {
+                dprintk(MANTIS_DEBUG, 1, "mantis start feed & dma");
+                mantis_dma_start(mantis);
+        }
+
+        return mantis->feeds;
+}
+
+static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
+        struct mantis_pci *mantis = dvbdmx->priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis DVB Stop feed");
+        if (!dvbdmx->dmx.frontend) {
+                dprintk(MANTIS_DEBUG, 1, "no frontend ?");
+                return -EINVAL;
+        }
+
+        mantis->feeds--;
+        if (mantis->feeds == 0) {
+                dprintk(MANTIS_DEBUG, 1, "mantis stop feed and dma");
+                mantis_dma_stop(mantis);
+        }
+
+        return 0;
+}
+
+int __devinit mantis_dvb_init(struct mantis_pci *mantis)
+{
+        struct mantis_hwconfig *config = mantis->hwconfig;
+        int result = -1;
+
+        dprintk(MANTIS_DEBUG, 1, "dvb_register_adapter");
+
+        result = dvb_register_adapter(&mantis->dvb_adapter,
+                                      "Mantis DVB adapter",
+                                      THIS_MODULE,
+                                      &mantis->pdev->dev,
+                                      adapter_nr);
+
+        if (result < 0) {
+
+                dprintk(MANTIS_ERROR, 1, "Error registering adapter");
+                return -ENODEV;
+        }
+
+        mantis->dvb_adapter.priv        = mantis;
+        mantis->demux.dmx.capabilities  = DMX_TS_FILTERING      |
+                                         DMX_SECTION_FILTERING  |
+                                         DMX_MEMORY_BASED_FILTERING;
+
+        mantis->demux.priv              = mantis;
+        mantis->demux.filternum         = 256;
+        mantis->demux.feednum           = 256;
+        mantis->demux.start_feed        = mantis_dvb_start_feed;
+        mantis->demux.stop_feed         = mantis_dvb_stop_feed;
+        mantis->demux.write_to_decoder  = NULL;
+
+        dprintk(MANTIS_DEBUG, 1, "dvb_dmx_init");
+        result = dvb_dmx_init(&mantis->demux);
+        if (result < 0) {
+                dprintk(MANTIS_ERROR, 1, "dvb_dmx_init failed, ERROR=%d", result);
+
+                goto err0;
+        }
+
+        mantis->dmxdev.filternum        = 256;
+        mantis->dmxdev.demux            = &mantis->demux.dmx;
+        mantis->dmxdev.capabilities     = 0;
+        dprintk(MANTIS_DEBUG, 1, "dvb_dmxdev_init");
+
+        result = dvb_dmxdev_init(&mantis->dmxdev, &mantis->dvb_adapter);
+        if (result < 0) {
+
+                dprintk(MANTIS_ERROR, 1, "dvb_dmxdev_init failed, ERROR=%d", result);
+                goto err1;
+        }
+
+        mantis->fe_hw.source            = DMX_FRONTEND_0;
+        result = mantis->demux.dmx.add_frontend(&mantis->demux.dmx, &mantis->fe_hw);
+        if (result < 0) {
+
+                dprintk(MANTIS_ERROR, 1, "dvb_dmx_init failed, ERROR=%d", result);
+                goto err2;
+        }
+
+        mantis->fe_mem.source           = DMX_MEMORY_FE;
+        result = mantis->demux.dmx.add_frontend(&mantis->demux.dmx, &mantis->fe_mem);
+        if (result < 0) {
+                dprintk(MANTIS_ERROR, 1, "dvb_dmx_init failed, ERROR=%d", result);
+                goto err3;
+        }
+
+        result = mantis->demux.dmx.connect_frontend(&mantis->demux.dmx, &mantis->fe_hw);
+        if (result < 0) {
+                dprintk(MANTIS_ERROR, 1, "dvb_dmx_init failed, ERROR=%d", result);
+                goto err4;
+        }
+
+        dvb_net_init(&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx);
+        tasklet_init(&mantis->tasklet, mantis_dma_xfer, (unsigned long) mantis);
+        if (mantis->hwconfig) {
+                result = config->frontend_init(mantis, mantis->fe);
+                if (result < 0) {
+                        dprintk(MANTIS_ERROR, 1, "!!! NO Frontends found !!!");
+                        goto err5;
+                } else {
+                        if (mantis->fe == NULL) {
+                                dprintk(MANTIS_ERROR, 1, "FE <NULL>");
+                                goto err5;
+                        }
+
+                        if (dvb_register_frontend(&mantis->dvb_adapter, mantis->fe)) {
+                                dprintk(MANTIS_ERROR, 1, "ERROR: Frontend registration failed");
+
+                                if (mantis->fe->ops.release)
+                                        mantis->fe->ops.release(mantis->fe);
+
+                                mantis->fe = NULL;
+                                goto err5;
+                        }
+                }
+        }
+
+        return 0;
+
+        /* Error conditions ..  */
+err5:
+        tasklet_kill(&mantis->tasklet);
+        dvb_net_release(&mantis->dvbnet);
+        dvb_unregister_frontend(mantis->fe);
+        dvb_frontend_detach(mantis->fe);
+err4:
+        mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
+
+err3:
+        mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_hw);
+
+err2:
+        dvb_dmxdev_release(&mantis->dmxdev);
+
+err1:
+        dvb_dmx_release(&mantis->demux);
+
+err0:
+        dvb_unregister_adapter(&mantis->dvb_adapter);
+
+        return result;
+}
+EXPORT_SYMBOL_GPL(mantis_dvb_init);
+
+int __devexit mantis_dvb_exit(struct mantis_pci *mantis)
+{
+        int err;
+
+        if (mantis->fe) {
+                /* mantis_ca_exit(mantis); */
+                err = mantis_frontend_shutdown(mantis);
+                if (err != 0)
+                        dprintk(MANTIS_ERROR, 1, "Frontend exit while POWER ON! <%d>", err);
+                dvb_unregister_frontend(mantis->fe);
+                dvb_frontend_detach(mantis->fe);
+        }
+
+        tasklet_kill(&mantis->tasklet);
+        dvb_net_release(&mantis->dvbnet);
+
+        mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
+        mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_hw);
+
+        dvb_dmxdev_release(&mantis->dmxdev);
+        dvb_dmx_release(&mantis->demux);
+
+        dprintk(MANTIS_DEBUG, 1, "dvb_unregister_adapter");
+        dvb_unregister_adapter(&mantis->dvb_adapter);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_dvb_exit);
diff --git a/drivers/media/dvb/mantis/mantis_dvb.h b/drivers/media/dvb/mantis/mantis_dvb.h
new file mode 100644
index 000000000000..464199db304e
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_dvb.h
@@ -0,0 +1,35 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_DVB_H
+#define __MANTIS_DVB_H
+
+enum mantis_power {
+        POWER_OFF       = 0,
+        POWER_ON        = 1
+};
+
+extern int mantis_frontend_power(struct mantis_pci *mantis, enum mantis_power power);
+extern void mantis_frontend_soft_reset(struct mantis_pci *mantis);
+
+extern int mantis_dvb_init(struct mantis_pci *mantis);
+extern int mantis_dvb_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_DVB_H */
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
new file mode 100644
index 000000000000..a7b369a439d6
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -0,0 +1,117 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_link.h"
+#include "mantis_hif.h"
+#include "mantis_reg.h"
+
+static void mantis_hifevm_work(struct work_struct *work)
+{
+        struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        u32 gpif_stat, gpif_mask;
+
+        gpif_stat = mmread(MANTIS_GPIF_STATUS);
+        gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
+
+        if (gpif_stat & MANTIS_GPIF_DETSTAT) {
+                if (gpif_stat & MANTIS_CARD_PLUGIN) {
+                        dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Plugin", mantis->num);
+                        mmwrite(0xdada0000, MANTIS_CARD_RESET);
+                        mantis_event_cam_plugin(ca);
+                        dvb_ca_en50221_camchange_irq(&ca->en50221,
+                                                     0,
+                                                     DVB_CA_EN50221_CAMCHANGE_INSERTED);
+                }
+        } else {
+                if (gpif_stat & MANTIS_CARD_PLUGOUT) {
+                        dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Unplug", mantis->num);
+                        mmwrite(0xdada0000, MANTIS_CARD_RESET);
+                        mantis_event_cam_unplug(ca);
+                        dvb_ca_en50221_camchange_irq(&ca->en50221,
+                                                     0,
+                                                     DVB_CA_EN50221_CAMCHANGE_REMOVED);
+                }
+        }
+
+        if (mantis->gpif_status & MANTIS_GPIF_EXTIRQ)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Ext IRQ", mantis->num);
+
+        if (mantis->gpif_status & MANTIS_SBUF_WSTO)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Timeout", mantis->num);
+
+        if (mantis->gpif_status & MANTIS_GPIF_OTHERR)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Alignment Error", mantis->num);
+
+        if (gpif_stat & MANTIS_SBUF_OVFLW)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Overflow", mantis->num);
+
+        if (gpif_stat & MANTIS_GPIF_BRRDY)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Read Ready", mantis->num);
+
+        if (gpif_stat & MANTIS_GPIF_INTSTAT)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): GPIF IRQ", mantis->num);
+
+        if (gpif_stat & MANTIS_SBUF_EMPTY)
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Empty", mantis->num);
+
+        if (gpif_stat & MANTIS_SBUF_OPDONE) {
+                dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num);
+                ca->sbuf_status = MANTIS_SBUF_DATA_AVAIL;
+                ca->hif_event = MANTIS_SBUF_OPDONE;
+                wake_up(&ca->hif_opdone_wq);
+        }
+}
+
+int mantis_evmgr_init(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Initializing Mantis Host I/F Event manager");
+        INIT_WORK(&ca->hif_evm_work, mantis_hifevm_work);
+        mantis_pcmcia_init(ca);
+        schedule_work(&ca->hif_evm_work);
+        mantis_hif_init(ca);
+        return 0;
+}
+
+void mantis_evmgr_exit(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        dprintk(MANTIS_DEBUG, 1, "Mantis Host I/F Event manager exiting");
+        flush_scheduled_work();
+        mantis_hif_exit(ca);
+        mantis_pcmcia_exit(ca);
+}
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
new file mode 100644
index 000000000000..7477dac628b4
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -0,0 +1,240 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+
+#include "mantis_hif.h"
+#include "mantis_link.h" /* temporary due to physical layer stuff */
+
+#include "mantis_reg.h"
+
+
+static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        int rc = 0;
+
+        if (wait_event_timeout(ca->hif_opdone_wq,
+                               ca->hif_event & MANTIS_SBUF_OPDONE,
+                               msecs_to_jiffies(500)) == -ERESTARTSYS) {
+
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Smart buffer operation timeout !", mantis->num);
+                rc = -EREMOTEIO;
+        }
+        dprintk(MANTIS_DEBUG, 1, "Smart Buffer Operation complete");
+        ca->hif_event &= ~MANTIS_SBUF_OPDONE;
+        return rc;
+}
+
+static int mantis_hif_write_wait(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 opdone = 0, timeout = 0;
+        int rc = 0;
+
+        if (wait_event_timeout(ca->hif_write_wq,
+                               mantis->gpif_status & MANTIS_GPIF_WRACK,
+                               msecs_to_jiffies(500)) == -ERESTARTSYS) {
+
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Write ACK timed out !", mantis->num);
+                rc = -EREMOTEIO;
+        }
+        dprintk(MANTIS_DEBUG, 1, "Write Acknowledged");
+        mantis->gpif_status &= ~MANTIS_GPIF_WRACK;
+        while (!opdone) {
+                opdone = (mmread(MANTIS_GPIF_STATUS) & MANTIS_SBUF_OPDONE);
+                udelay(500);
+                timeout++;
+                if (timeout > 100) {
+                        dprintk(MANTIS_ERROR, 1, "Adater(%d) Slot(0): Write operation timed out!", mantis->num);
+                        rc = -ETIMEDOUT;
+                        break;
+                }
+        }
+        dprintk(MANTIS_DEBUG, 1, "HIF Write success");
+        return rc;
+}
+
+
+int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 hif_addr = 0, data, count = 4;
+
+        dprintk(MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF Mem Read", mantis->num);
+        mutex_lock(&ca->ca_lock);
+        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
+        hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
+        hif_addr |=  MANTIS_HIF_STATUS;
+        hif_addr |=  addr;
+
+        mmwrite(hif_addr, MANTIS_GPIF_BRADDR);
+        mmwrite(count, MANTIS_GPIF_BRBYTES);
+        udelay(20);
+        mmwrite(hif_addr | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_ADDR);
+
+        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num);
+                mutex_unlock(&ca->ca_lock);
+                return -EREMOTEIO;
+        }
+        data = mmread(MANTIS_GPIF_DIN);
+        mutex_unlock(&ca->ca_lock);
+        dprintk(MANTIS_DEBUG, 1, "Mem Read: 0x%02x", data);
+        return (data >> 24) & 0xff;
+}
+
+int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
+{
+        struct mantis_slot *slot = ca->slot;
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 hif_addr = 0;
+
+        dprintk(MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF Mem Write", mantis->num);
+        mutex_lock(&ca->ca_lock);
+        hif_addr &= ~MANTIS_GPIF_HIFRDWRN;
+        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
+        hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
+        hif_addr |=  MANTIS_HIF_STATUS;
+        hif_addr |=  addr;
+
+        mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
+        mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+        mmwrite(data, MANTIS_GPIF_DOUT);
+
+        if (mantis_hif_write_wait(ca) != 0) {
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
+                mutex_unlock(&ca->ca_lock);
+                return -EREMOTEIO;
+        }
+        dprintk(MANTIS_DEBUG, 1, "Mem Write: (0x%02x to 0x%02x)", data, addr);
+        mutex_unlock(&ca->ca_lock);
+
+        return 0;
+}
+
+int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 data, hif_addr = 0;
+
+        dprintk(MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF I/O Read", mantis->num);
+        mutex_lock(&ca->ca_lock);
+        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
+        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
+        hif_addr |=  MANTIS_HIF_STATUS;
+        hif_addr |=  addr;
+
+        mmwrite(hif_addr, MANTIS_GPIF_BRADDR);
+        mmwrite(1, MANTIS_GPIF_BRBYTES);
+        udelay(20);
+        mmwrite(hif_addr | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_ADDR);
+
+        if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
+                mutex_unlock(&ca->ca_lock);
+                return -EREMOTEIO;
+        }
+        data = mmread(MANTIS_GPIF_DIN);
+        dprintk(MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
+        udelay(50);
+        mutex_unlock(&ca->ca_lock);
+
+        return (u8) data;
+}
+
+int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 hif_addr = 0;
+
+        dprintk(MANTIS_DEBUG, 1, "Adapter(%d) Slot(0): Request HIF I/O Write", mantis->num);
+        mutex_lock(&ca->ca_lock);
+        hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
+        hif_addr &= ~MANTIS_GPIF_HIFRDWRN;
+        hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
+        hif_addr |=  MANTIS_HIF_STATUS;
+        hif_addr |=  addr;
+
+        mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+        mmwrite(data, MANTIS_GPIF_DOUT);
+
+        if (mantis_hif_write_wait(ca) != 0) {
+                dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num);
+                mutex_unlock(&ca->ca_lock);
+                return -EREMOTEIO;
+        }
+        dprintk(MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
+        mutex_unlock(&ca->ca_lock);
+        udelay(50);
+
+        return 0;
+}
+
+int mantis_hif_init(struct mantis_ca *ca)
+{
+        struct mantis_slot *slot = ca->slot;
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 irqcfg;
+
+        slot[0].slave_cfg = 0x70773028;
+        dprintk(MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num);
+
+        mutex_lock(&ca->ca_lock);
+        irqcfg = mmread(MANTIS_GPIF_IRQCFG);
+        irqcfg = MANTIS_MASK_BRRDY      |
+                 MANTIS_MASK_WRACK      |
+                 MANTIS_MASK_EXTIRQ     |
+                 MANTIS_MASK_WSTO       |
+                 MANTIS_MASK_OTHERR     |
+                 MANTIS_MASK_OVFLW;
+
+        mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
+        mutex_unlock(&ca->ca_lock);
+
+        return 0;
+}
+
+void mantis_hif_exit(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+        u32 irqcfg;
+
+        dprintk(MANTIS_ERROR, 1, "Adapter(%d) Exiting Mantis Host Interface", mantis->num);
+        mutex_lock(&ca->ca_lock);
+        irqcfg = mmread(MANTIS_GPIF_IRQCFG);
+        irqcfg &= ~MANTIS_MASK_BRRDY;
+        mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
+        mutex_unlock(&ca->ca_lock);
+}
diff --git a/drivers/media/dvb/mantis/mantis_hif.h b/drivers/media/dvb/mantis/mantis_hif.h
new file mode 100644
index 000000000000..9094f9ed2362
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_hif.h
@@ -0,0 +1,29 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_HIF_H
+#define __MANTIS_HIF_H
+
+#define MANTIS_HIF_MEMRD                1
+#define MANTIS_HIF_MEMWR                2
+#define MANTIS_HIF_IOMRD                3
+#define MANTIS_HIF_IOMWR                4
+
+#endif /* __MANTIS_HIF_H */
diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c
new file mode 100644
index 000000000000..7870bcf9689a
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_i2c.c
@@ -0,0 +1,267 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <asm/io.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/i2c.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_i2c.h"
+
+#define TRIALS                  10000
+
+static int mantis_i2c_read(struct mantis_pci *mantis, const struct i2c_msg *msg)
+{
+        u32 rxd, i, stat, trials;
+
+        dprintk(MANTIS_INFO, 0, "        %s:  Address=[0x%02x] <R>[ ",
+                __func__, msg->addr);
+
+        for (i = 0; i < msg->len; i++) {
+                rxd = (msg->addr << 25) | (1 << 24)
+                                        | MANTIS_I2C_RATE_3
+                                        | MANTIS_I2C_STOP
+                                        | MANTIS_I2C_PGMODE;
+
+                if (i == (msg->len - 1))
+                        rxd &= ~MANTIS_I2C_STOP;
+
+                mmwrite(MANTIS_INT_I2CDONE, MANTIS_INT_STAT);
+                mmwrite(rxd, MANTIS_I2CDATA_CTL);
+
+                /* wait for xfer completion */
+                for (trials = 0; trials < TRIALS; trials++) {
+                        stat = mmread(MANTIS_INT_STAT);
+                        if (stat & MANTIS_INT_I2CDONE)
+                                break;
+                }
+
+                dprintk(MANTIS_TMG, 0, "I2CDONE: trials=%d\n", trials);
+
+                /* wait for xfer completion */
+                for (trials = 0; trials < TRIALS; trials++) {
+                        stat = mmread(MANTIS_INT_STAT);
+                        if (stat & MANTIS_INT_I2CRACK)
+                                break;
+                }
+
+                dprintk(MANTIS_TMG, 0, "I2CRACK: trials=%d\n", trials);
+
+                rxd = mmread(MANTIS_I2CDATA_CTL);
+                msg->buf[i] = (u8)((rxd >> 8) & 0xFF);
+                dprintk(MANTIS_INFO, 0, "%02x ", msg->buf[i]);
+        }
+        dprintk(MANTIS_INFO, 0, "]\n");
+
+        return 0;
+}
+
+static int mantis_i2c_write(struct mantis_pci *mantis, const struct i2c_msg *msg)
+{
+        int i;
+        u32 txd = 0, stat, trials;
+
+        dprintk(MANTIS_INFO, 0, "        %s: Address=[0x%02x] <W>[ ",
+                __func__, msg->addr);
+
+        for (i = 0; i < msg->len; i++) {
+                dprintk(MANTIS_INFO, 0, "%02x ", msg->buf[i]);
+                txd = (msg->addr << 25) | (msg->buf[i] << 8)
+                                        | MANTIS_I2C_RATE_3
+                                        | MANTIS_I2C_STOP
+                                        | MANTIS_I2C_PGMODE;
+
+                if (i == (msg->len - 1))
+                        txd &= ~MANTIS_I2C_STOP;
+
+                mmwrite(MANTIS_INT_I2CDONE, MANTIS_INT_STAT);
+                mmwrite(txd, MANTIS_I2CDATA_CTL);
+
+                /* wait for xfer completion */
+                for (trials = 0; trials < TRIALS; trials++) {
+                        stat = mmread(MANTIS_INT_STAT);
+                        if (stat & MANTIS_INT_I2CDONE)
+                                break;
+                }
+
+                dprintk(MANTIS_TMG, 0, "I2CDONE: trials=%d\n", trials);
+
+                /* wait for xfer completion */
+                for (trials = 0; trials < TRIALS; trials++) {
+                        stat = mmread(MANTIS_INT_STAT);
+                        if (stat & MANTIS_INT_I2CRACK)
+                                break;
+                }
+
+                dprintk(MANTIS_TMG, 0, "I2CRACK: trials=%d\n", trials);
+        }
+        dprintk(MANTIS_INFO, 0, "]\n");
+
+        return 0;
+}
+
+static int mantis_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
+{
+        int ret = 0, i = 0, trials;
+        u32 stat, data, txd;
+        struct mantis_pci *mantis;
+        struct mantis_hwconfig *config;
+
+        mantis = i2c_get_adapdata(adapter);
+        BUG_ON(!mantis);
+        config = mantis->hwconfig;
+        BUG_ON(!config);
+
+        dprintk(MANTIS_DEBUG, 1, "Messages:%d", num);
+        mutex_lock(&mantis->i2c_lock);
+
+        while (i < num) {
+                /* Byte MODE */
+                if ((config->i2c_mode & MANTIS_BYTE_MODE) &&
+                    ((i + 1) < num)                     &&
+                    (msgs[i].len < 2)                   &&
+                    (msgs[i + 1].len < 2)               &&
+                    (msgs[i + 1].flags & I2C_M_RD)) {
+
+                        dprintk(MANTIS_DEBUG, 0, "        Byte MODE:\n");
+
+                        /* Read operation */
+                        txd = msgs[i].addr << 25 | (0x1 << 24)
+                                                 | (msgs[i].buf[0] << 16)
+                                                 | MANTIS_I2C_RATE_3;
+
+                        mmwrite(txd, MANTIS_I2CDATA_CTL);
+                        /* wait for xfer completion */
+                        for (trials = 0; trials < TRIALS; trials++) {
+                                stat = mmread(MANTIS_INT_STAT);
+                                if (stat & MANTIS_INT_I2CDONE)
+                                        break;
+                        }
+
+                        /* check for xfer completion */
+                        if (stat & MANTIS_INT_I2CDONE) {
+                                /* check xfer was acknowledged */
+                                if (stat & MANTIS_INT_I2CRACK) {
+                                        data = mmread(MANTIS_I2CDATA_CTL);
+                                        msgs[i + 1].buf[0] = (data >> 8) & 0xff;
+                                        dprintk(MANTIS_DEBUG, 0, "        Byte <%d> RXD=0x%02x  [%02x]\n", 0x0, data, msgs[i + 1].buf[0]);
+                                } else {
+                                        /* I/O error */
+                                        dprintk(MANTIS_ERROR, 1, "        I/O error, LINE:%d", __LINE__);
+                                        ret = -EIO;
+                                        break;
+                                }
+                        } else {
+                                /* I/O error */
+                                dprintk(MANTIS_ERROR, 1, "        I/O error, LINE:%d", __LINE__);
+                                ret = -EIO;
+                                break;
+                        }
+                        i += 2; /* Write/Read operation in one go */
+                }
+
+                if (i < num) {
+                        if (msgs[i].flags & I2C_M_RD)
+                                ret = mantis_i2c_read(mantis, &msgs[i]);
+                        else
+                                ret = mantis_i2c_write(mantis, &msgs[i]);
+
+                        i++;
+                        if (ret < 0)
+                                goto bail_out;
+                }
+
+        }
+
+        mutex_unlock(&mantis->i2c_lock);
+
+        return num;
+
+bail_out:
+        mutex_unlock(&mantis->i2c_lock);
+        return ret;
+}
+
+static u32 mantis_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_SMBUS_EMUL;
+}
+
+static struct i2c_algorithm mantis_algo = {
+        .master_xfer            = mantis_i2c_xfer,
+        .functionality          = mantis_i2c_func,
+};
+
+int __devinit mantis_i2c_init(struct mantis_pci *mantis)
+{
+        u32 intstat, intmask;
+        struct i2c_adapter *i2c_adapter = &mantis->adapter;
+        struct pci_dev *pdev            = mantis->pdev;
+
+        init_waitqueue_head(&mantis->i2c_wq);
+        mutex_init(&mantis->i2c_lock);
+        strncpy(i2c_adapter->name, "Mantis I2C", sizeof(i2c_adapter->name));
+        i2c_set_adapdata(i2c_adapter, mantis);
+
+        i2c_adapter->owner      = THIS_MODULE;
+        i2c_adapter->class      = I2C_CLASS_TV_DIGITAL;
+        i2c_adapter->algo       = &mantis_algo;
+        i2c_adapter->algo_data  = NULL;
+        i2c_adapter->timeout    = 500;
+        i2c_adapter->retries    = 3;
+        i2c_adapter->dev.parent = &pdev->dev;
+
+        mantis->i2c_rc          = i2c_add_adapter(i2c_adapter);
+        if (mantis->i2c_rc < 0)
+                return mantis->i2c_rc;
+
+        dprintk(MANTIS_DEBUG, 1, "Initializing I2C ..");
+
+        intstat = mmread(MANTIS_INT_STAT);
+        intmask = mmread(MANTIS_INT_MASK);
+        mmwrite(intstat, MANTIS_INT_STAT);
+        dprintk(MANTIS_DEBUG, 1, "Disabling I2C interrupt");
+        intmask = mmread(MANTIS_INT_MASK);
+        mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_i2c_init);
+
+int mantis_i2c_exit(struct mantis_pci *mantis)
+{
+        u32 intmask;
+
+        dprintk(MANTIS_DEBUG, 1, "Disabling I2C interrupt");
+        intmask = mmread(MANTIS_INT_MASK);
+        mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK);
+
+        dprintk(MANTIS_DEBUG, 1, "Removing I2C adapter");
+        return i2c_del_adapter(&mantis->adapter);
+}
+EXPORT_SYMBOL_GPL(mantis_i2c_exit);
diff --git a/drivers/media/dvb/mantis/mantis_i2c.h b/drivers/media/dvb/mantis/mantis_i2c.h
new file mode 100644
index 000000000000..1342df2faed8
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_i2c.h
@@ -0,0 +1,30 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_I2C_H
+#define __MANTIS_I2C_H
+
+#define I2C_STOP                (1 <<  0)
+#define I2C_READ                (1 <<  1)
+
+extern int mantis_i2c_init(struct mantis_pci *mantis);
+extern int mantis_i2c_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_I2C_H */
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
new file mode 100644
index 000000000000..6a9df779441f
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -0,0 +1,148 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/input.h>
+#include <media/ir-common.h>
+#include <linux/pci.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_uart.h"
+
+static struct ir_scancode mantis_ir_table[] = {
+        { 0x29, KEY_POWER       },
+        { 0x28, KEY_FAVORITES   },
+        { 0x30, KEY_TEXT        },
+        { 0x17, KEY_INFO        }, /* Preview */
+        { 0x23, KEY_EPG         },
+        { 0x3b, KEY_F22         }, /* Record List */
+        { 0x3c, KEY_1           },
+        { 0x3e, KEY_2           },
+        { 0x39, KEY_3           },
+        { 0x36, KEY_4           },
+        { 0x22, KEY_5           },
+        { 0x20, KEY_6           },
+        { 0x32, KEY_7           },
+        { 0x26, KEY_8           },
+        { 0x24, KEY_9           },
+        { 0x2a, KEY_0           },
+
+        { 0x33, KEY_CANCEL      },
+        { 0x2c, KEY_BACK        },
+        { 0x15, KEY_CLEAR       },
+        { 0x3f, KEY_TAB         },
+        { 0x10, KEY_ENTER       },
+        { 0x14, KEY_UP          },
+        { 0x0d, KEY_RIGHT       },
+        { 0x0e, KEY_DOWN        },
+        { 0x11, KEY_LEFT        },
+
+        { 0x21, KEY_VOLUMEUP    },
+        { 0x35, KEY_VOLUMEDOWN  },
+        { 0x3d, KEY_CHANNELDOWN },
+        { 0x3a, KEY_CHANNELUP   },
+        { 0x2e, KEY_RECORD      },
+        { 0x2b, KEY_PLAY        },
+        { 0x13, KEY_PAUSE       },
+        { 0x25, KEY_STOP        },
+
+        { 0x1f, KEY_REWIND      },
+        { 0x2d, KEY_FASTFORWARD },
+        { 0x1e, KEY_PREVIOUS    }, /* Replay |< */
+        { 0x1d, KEY_NEXT        }, /* Skip   >| */
+
+        { 0x0b, KEY_CAMERA      }, /* Capture */
+        { 0x0f, KEY_LANGUAGE    }, /* SAP */
+        { 0x18, KEY_MODE        }, /* PIP */
+        { 0x12, KEY_ZOOM        }, /* Full screen */
+        { 0x1c, KEY_SUBTITLE    },
+        { 0x2f, KEY_MUTE        },
+        { 0x16, KEY_F20         }, /* L/R */
+        { 0x38, KEY_F21         }, /* Hibernate */
+
+        { 0x37, KEY_SWITCHVIDEOMODE }, /* A/V */
+        { 0x31, KEY_AGAIN       }, /* Recall */
+        { 0x1a, KEY_KPPLUS      }, /* Zoom+ */
+        { 0x19, KEY_KPMINUS     }, /* Zoom- */
+        { 0x27, KEY_RED         },
+        { 0x0C, KEY_GREEN       },
+        { 0x01, KEY_YELLOW      },
+        { 0x00, KEY_BLUE        },
+};
+
+struct ir_scancode_table ir_mantis = {
+        .scan = mantis_ir_table,
+        .size = ARRAY_SIZE(mantis_ir_table),
+};
+EXPORT_SYMBOL_GPL(ir_mantis);
+
+int mantis_input_init(struct mantis_pci *mantis)
+{
+        struct input_dev *rc;
+        struct ir_input_state rc_state;
+        char name[80], dev[80];
+        int err;
+
+        rc = input_allocate_device();
+        if (!rc) {
+                dprintk(MANTIS_ERROR, 1, "Input device allocate failed");
+                return -ENOMEM;
+        }
+
+        sprintf(name, "Mantis %s IR receiver", mantis->hwconfig->model_name);
+        sprintf(dev, "pci-%s/ir0", pci_name(mantis->pdev));
+
+        rc->name = name;
+        rc->phys = dev;
+
+        ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
+
+        rc->id.bustype  = BUS_PCI;
+        rc->id.vendor   = mantis->vendor_id;
+        rc->id.product  = mantis->device_id;
+        rc->id.version  = 1;
+        rc->dev         = mantis->pdev->dev;
+
+        err = ir_input_register(rc, &ir_mantis);
+        if (err) {
+                dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
+                input_free_device(rc);
+                return -ENODEV;
+        }
+
+        mantis->rc = rc;
+
+        return 0;
+}
+
+int mantis_exit(struct mantis_pci *mantis)
+{
+        struct input_dev *rc = mantis->rc;
+
+        ir_input_unregister(rc);
+
+        return 0;
+}
diff --git a/drivers/media/dvb/mantis/mantis_ioc.c b/drivers/media/dvb/mantis/mantis_ioc.c
new file mode 100644
index 000000000000..de148ded52d8
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_ioc.c
@@ -0,0 +1,130 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_ioc.h"
+
+static int read_eeprom_bytes(struct mantis_pci *mantis, u8 reg, u8 *data, u8 length)
+{
+        struct i2c_adapter *adapter = &mantis->adapter;
+        int err;
+        u8 buf = reg;
+
+        struct i2c_msg msg[] = {
+                { .addr = 0x50, .flags = 0, .buf = &buf, .len = 1 },
+                { .addr = 0x50, .flags = I2C_M_RD, .buf = data, .len = length },
+        };
+
+        err = i2c_transfer(adapter, msg, 2);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: i2c read: < err=%i d0=0x%02x d1=0x%02x >",
+                        err, data[0], data[1]);
+
+                return err;
+        }
+
+        return 0;
+}
+int mantis_get_mac(struct mantis_pci *mantis)
+{
+        int err;
+        u8 mac_addr[6] = {0};
+
+        err = read_eeprom_bytes(mantis, 0x08, mac_addr, 6);
+        if (err < 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Mantis EEPROM read error <%d>", err);
+
+                return err;
+        }
+
+        dprintk(MANTIS_ERROR, 0,
+                "    MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]\n",
+                mac_addr[0],
+                mac_addr[1],
+                mac_addr[2],
+                mac_addr[3],
+                mac_addr[4],
+                mac_addr[5]);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_get_mac);
+
+/* Turn the given bit on or off. */
+void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
+{
+        u32 cur;
+
+        dprintk(MANTIS_DEBUG, 1, "Set Bit <%d> to <%d>", bitpos, value);
+        cur = mmread(MANTIS_GPIF_ADDR);
+        if (value)
+                mantis->gpio_status = cur | (1 << bitpos);
+        else
+                mantis->gpio_status = cur & (~(1 << bitpos));
+
+        dprintk(MANTIS_DEBUG, 1, "GPIO Value <%02x>", mantis->gpio_status);
+        mmwrite(mantis->gpio_status, MANTIS_GPIF_ADDR);
+        mmwrite(0x00, MANTIS_GPIF_DOUT);
+}
+EXPORT_SYMBOL_GPL(gpio_set_bits);
+
+int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl)
+{
+        u32 reg;
+
+        reg = mmread(MANTIS_CONTROL);
+        switch (stream_ctl) {
+        case STREAM_TO_HIF:
+                dprintk(MANTIS_DEBUG, 1, "Set stream to HIF");
+                reg &= 0xff - MANTIS_BYPASS;
+                mmwrite(reg, MANTIS_CONTROL);
+                reg |= MANTIS_BYPASS;
+                mmwrite(reg, MANTIS_CONTROL);
+                break;
+
+        case STREAM_TO_CAM:
+                dprintk(MANTIS_DEBUG, 1, "Set stream to CAM");
+                reg |= MANTIS_BYPASS;
+                mmwrite(reg, MANTIS_CONTROL);
+                reg &= 0xff - MANTIS_BYPASS;
+                mmwrite(reg, MANTIS_CONTROL);
+                break;
+        default:
+                dprintk(MANTIS_ERROR, 1, "Unknown MODE <%02x>", stream_ctl);
+                return -1;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_stream_control);
diff --git a/drivers/media/dvb/mantis/mantis_ioc.h b/drivers/media/dvb/mantis/mantis_ioc.h
new file mode 100644
index 000000000000..188fe5a81614
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_ioc.h
@@ -0,0 +1,51 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_IOC_H
+#define __MANTIS_IOC_H
+
+#define GPIF_A00                0x00
+#define GPIF_A01                0x01
+#define GPIF_A02                0x02
+#define GPIF_A03                0x03
+#define GPIF_A04                0x04
+#define GPIF_A05                0x05
+#define GPIF_A06                0x06
+#define GPIF_A07                0x07
+#define GPIF_A08                0x08
+#define GPIF_A09                0x09
+#define GPIF_A10                0x0a
+#define GPIF_A11                0x0b
+
+#define GPIF_A12                0x0c
+#define GPIF_A13                0x0d
+#define GPIF_A14                0x0e
+
+enum mantis_stream_control {
+        STREAM_TO_HIF = 0,
+        STREAM_TO_CAM
+};
+
+extern int mantis_get_mac(struct mantis_pci *mantis);
+extern void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value);
+
+extern int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl);
+
+#endif /* __MANTIS_IOC_H */
diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h
new file mode 100644
index 000000000000..2a814774a001
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_link.h
@@ -0,0 +1,83 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_LINK_H
+#define __MANTIS_LINK_H
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+#include "dvb_ca_en50221.h"
+
+enum mantis_sbuf_status {
+        MANTIS_SBUF_DATA_AVAIL          = 1,
+        MANTIS_SBUF_DATA_EMPTY          = 2,
+        MANTIS_SBUF_DATA_OVFLW          = 3
+};
+
+struct mantis_slot {
+        u32                             timeout;
+        u32                             slave_cfg;
+        u32                             bar;
+};
+
+/* Physical layer */
+enum mantis_slot_state {
+        MODULE_INSERTED                 = 3,
+        MODULE_XTRACTED                 = 4
+};
+
+struct mantis_ca {
+        struct mantis_slot              slot[4];
+
+        struct work_struct              hif_evm_work;
+
+        u32                             hif_event;
+        wait_queue_head_t               hif_opdone_wq;
+        wait_queue_head_t               hif_brrdyw_wq;
+        wait_queue_head_t               hif_data_wq;
+        wait_queue_head_t               hif_write_wq; /* HIF Write op */
+
+        enum mantis_sbuf_status         sbuf_status;
+
+        enum mantis_slot_state          slot_state;
+
+        void                            *ca_priv;
+
+        struct dvb_ca_en50221           en50221;
+        struct mutex                    ca_lock;
+};
+
+/* CA */
+extern void mantis_event_cam_plugin(struct mantis_ca *ca);
+extern void mantis_event_cam_unplug(struct mantis_ca *ca);
+extern int mantis_pcmcia_init(struct mantis_ca *ca);
+extern void mantis_pcmcia_exit(struct mantis_ca *ca);
+extern int mantis_evmgr_init(struct mantis_ca *ca);
+extern void mantis_evmgr_exit(struct mantis_ca *ca);
+
+/* HIF */
+extern int mantis_hif_init(struct mantis_ca *ca);
+extern void mantis_hif_exit(struct mantis_ca *ca);
+extern int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr);
+extern int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data);
+extern int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr);
+extern int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data);
+
+#endif /* __MANTIS_LINK_H */
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
new file mode 100644
index 000000000000..6c7534af6b44
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_pci.c
@@ -0,0 +1,177 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <asm/io.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <linux/kmod.h>
+#include <linux/vmalloc.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+
+#include <asm/irq.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include <asm/irq.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_pci.h"
+
+#define DRIVER_NAME             "Mantis Core"
+
+int __devinit mantis_pci_init(struct mantis_pci *mantis)
+{
+        u8 revision, latency;
+        struct mantis_hwconfig *config  = mantis->hwconfig;
+        struct pci_dev *pdev            = mantis->pdev;
+        int err, ret = 0;
+
+        dprintk(MANTIS_ERROR, 0, "found a %s PCI %s device on (%02x:%02x.%x),\n",
+                config->model_name,
+                config->dev_type,
+                mantis->pdev->bus->number,
+                PCI_SLOT(mantis->pdev->devfn),
+                PCI_FUNC(mantis->pdev->devfn));
+
+        err = pci_enable_device(pdev);
+        if (err != 0) {
+                ret = -ENODEV;
+                dprintk(MANTIS_ERROR, 1, "ERROR: PCI enable failed <%i>", err);
+                goto fail0;
+        }
+
+        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (err != 0) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: Unable to obtain 32 bit DMA <%i>", err);
+                ret = -ENOMEM;
+                goto fail1;
+        }
+
+        pci_set_master(pdev);
+
+        if (!request_mem_region(pci_resource_start(pdev, 0),
+                                pci_resource_len(pdev, 0),
+                                DRIVER_NAME)) {
+
+                dprintk(MANTIS_ERROR, 1, "ERROR: BAR0 Request failed !");
+                ret = -ENODEV;
+                goto fail1;
+        }
+
+        mantis->mmio = ioremap(pci_resource_start(pdev, 0),
+                               pci_resource_len(pdev, 0));
+
+        if (!mantis->mmio) {
+                dprintk(MANTIS_ERROR, 1, "ERROR: BAR0 remap failed !");
+                ret = -ENODEV;
+                goto fail2;
+        }
+
+        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency);
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+        mantis->latency = latency;
+        mantis->revision = revision;
+
+        dprintk(MANTIS_ERROR, 0, "    Mantis Rev %d [%04x:%04x], ",
+                mantis->revision,
+                mantis->pdev->subsystem_vendor,
+                mantis->pdev->subsystem_device);
+
+        dprintk(MANTIS_ERROR, 0,
+                "irq: %d, latency: %d\n    memory: 0x%lx, mmio: 0x%p\n",
+                mantis->pdev->irq,
+                mantis->latency,
+                mantis->mantis_addr,
+                mantis->mmio);
+
+        err = request_irq(pdev->irq,
+                          config->irq_handler,
+                          IRQF_SHARED,
+                          DRIVER_NAME,
+                          mantis);
+
+        if (err != 0) {
+
+                dprintk(MANTIS_ERROR, 1, "ERROR: IRQ registration failed ! <%d>", err);
+                ret = -ENODEV;
+                goto fail3;
+        }
+
+        pci_set_drvdata(pdev, mantis);
+        return ret;
+
+        /* Error conditions */
+fail3:
+        dprintk(MANTIS_ERROR, 1, "ERROR: <%d> I/O unmap", ret);
+        if (mantis->mmio)
+                iounmap(mantis->mmio);
+
+fail2:
+        dprintk(MANTIS_ERROR, 1, "ERROR: <%d> releasing regions", ret);
+        release_mem_region(pci_resource_start(pdev, 0),
+                           pci_resource_len(pdev, 0));
+
+fail1:
+        dprintk(MANTIS_ERROR, 1, "ERROR: <%d> disabling device", ret);
+        pci_disable_device(pdev);
+
+fail0:
+        dprintk(MANTIS_ERROR, 1, "ERROR: <%d> exiting", ret);
+        pci_set_drvdata(pdev, NULL);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mantis_pci_init);
+
+void mantis_pci_exit(struct mantis_pci *mantis)
+{
+        struct pci_dev *pdev = mantis->pdev;
+
+        dprintk(MANTIS_NOTICE, 1, " mem: 0x%p", mantis->mmio);
+        free_irq(pdev->irq, mantis);
+        if (mantis->mmio) {
+                iounmap(mantis->mmio);
+                release_mem_region(pci_resource_start(pdev, 0),
+                                   pci_resource_len(pdev, 0));
+        }
+
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+}
+EXPORT_SYMBOL_GPL(mantis_pci_exit);
+
+MODULE_DESCRIPTION("Mantis PCI DTV bridge driver");
+MODULE_AUTHOR("Manu Abraham");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/mantis/mantis_pci.h b/drivers/media/dvb/mantis/mantis_pci.h
new file mode 100644
index 000000000000..65f004519086
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_pci.h
@@ -0,0 +1,27 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_PCI_H
+#define __MANTIS_PCI_H
+
+extern int mantis_pci_init(struct mantis_pci *mantis);
+extern void mantis_pci_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_PCI_H */
diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/dvb/mantis/mantis_pcmcia.c
new file mode 100644
index 000000000000..5cb545b913f6
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_pcmcia.c
@@ -0,0 +1,120 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_link.h" /* temporary due to physical layer stuff */
+#include "mantis_reg.h"
+
+/*
+ * If Slot state is already PLUG_IN event and we are called
+ * again, definitely it is jitter alone
+ */
+void mantis_event_cam_plugin(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        u32 gpif_irqcfg;
+
+        if (ca->slot_state == MODULE_XTRACTED) {
+                dprintk(MANTIS_DEBUG, 1, "Event: CAM Plugged IN: Adapter(%d) Slot(0)", mantis->num);
+                udelay(50);
+                mmwrite(0xda000000, MANTIS_CARD_RESET);
+                gpif_irqcfg  = mmread(MANTIS_GPIF_IRQCFG);
+                gpif_irqcfg |= MANTIS_MASK_PLUGOUT;
+                gpif_irqcfg &= ~MANTIS_MASK_PLUGIN;
+                mmwrite(gpif_irqcfg, MANTIS_GPIF_IRQCFG);
+                udelay(500);
+                ca->slot_state = MODULE_INSERTED;
+        }
+        udelay(100);
+}
+
+/*
+ * If Slot state is already UN_PLUG event and we are called
+ * again, definitely it is jitter alone
+ */
+void mantis_event_cam_unplug(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        u32 gpif_irqcfg;
+
+        if (ca->slot_state == MODULE_INSERTED) {
+                dprintk(MANTIS_DEBUG, 1, "Event: CAM Unplugged: Adapter(%d) Slot(0)", mantis->num);
+                udelay(50);
+                mmwrite(0x00da0000, MANTIS_CARD_RESET);
+                gpif_irqcfg  = mmread(MANTIS_GPIF_IRQCFG);
+                gpif_irqcfg |= MANTIS_MASK_PLUGIN;
+                gpif_irqcfg &= ~MANTIS_MASK_PLUGOUT;
+                mmwrite(gpif_irqcfg, MANTIS_GPIF_IRQCFG);
+                udelay(500);
+                ca->slot_state = MODULE_XTRACTED;
+        }
+        udelay(100);
+}
+
+int mantis_pcmcia_init(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        u32 gpif_stat, card_stat;
+
+        mmwrite(mmread(MANTIS_INT_MASK) | MANTIS_INT_IRQ0, MANTIS_INT_MASK);
+        gpif_stat = mmread(MANTIS_GPIF_STATUS);
+        card_stat = mmread(MANTIS_GPIF_IRQCFG);
+
+        if (gpif_stat & MANTIS_GPIF_DETSTAT) {
+                dprintk(MANTIS_DEBUG, 1, "CAM found on Adapter(%d) Slot(0)", mantis->num);
+                mmwrite(card_stat | MANTIS_MASK_PLUGOUT, MANTIS_GPIF_IRQCFG);
+                ca->slot_state = MODULE_INSERTED;
+                dvb_ca_en50221_camchange_irq(&ca->en50221,
+                                             0,
+                                             DVB_CA_EN50221_CAMCHANGE_INSERTED);
+        } else {
+                dprintk(MANTIS_DEBUG, 1, "Empty Slot on Adapter(%d) Slot(0)", mantis->num);
+                mmwrite(card_stat | MANTIS_MASK_PLUGIN, MANTIS_GPIF_IRQCFG);
+                ca->slot_state = MODULE_XTRACTED;
+                dvb_ca_en50221_camchange_irq(&ca->en50221,
+                                             0,
+                                             DVB_CA_EN50221_CAMCHANGE_REMOVED);
+        }
+
+        return 0;
+}
+
+void mantis_pcmcia_exit(struct mantis_ca *ca)
+{
+        struct mantis_pci *mantis = ca->ca_priv;
+
+        mmwrite(mmread(MANTIS_GPIF_STATUS) & (~MANTIS_CARD_PLUGOUT | ~MANTIS_CARD_PLUGIN), MANTIS_GPIF_STATUS);
+        mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ0, MANTIS_INT_MASK);
+}
diff --git a/drivers/media/dvb/mantis/mantis_reg.h b/drivers/media/dvb/mantis/mantis_reg.h
new file mode 100644
index 000000000000..7761f9dc7fe0
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_reg.h
@@ -0,0 +1,197 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_REG_H
+#define __MANTIS_REG_H
+
+/* Interrupts */
+#define MANTIS_INT_STAT                 0x00
+#define MANTIS_INT_MASK                 0x04
+
+#define MANTIS_INT_RISCSTAT             (0x0f << 28)
+#define MANTIS_INT_RISCEN               (0x01 << 27)
+#define MANTIS_INT_I2CRACK              (0x01 << 26)
+
+/* #define MANTIS_INT_GPIF                      (0xff << 12) */
+
+#define MANTIS_INT_PCMCIA7              (0x01 << 19)
+#define MANTIS_INT_PCMCIA6              (0x01 << 18)
+#define MANTIS_INT_PCMCIA5              (0x01 << 17)
+#define MANTIS_INT_PCMCIA4              (0x01 << 16)
+#define MANTIS_INT_PCMCIA3              (0x01 << 15)
+#define MANTIS_INT_PCMCIA2              (0x01 << 14)
+#define MANTIS_INT_PCMCIA1              (0x01 << 13)
+#define MANTIS_INT_PCMCIA0              (0x01 << 12)
+#define MANTIS_INT_IRQ1                 (0x01 << 11)
+#define MANTIS_INT_IRQ0                 (0x01 << 10)
+#define MANTIS_INT_OCERR                (0x01 <<  8)
+#define MANTIS_INT_PABORT               (0x01 <<  7)
+#define MANTIS_INT_RIPERR               (0x01 <<  6)
+#define MANTIS_INT_PPERR                (0x01 <<  5)
+#define MANTIS_INT_FTRGT                (0x01 <<  3)
+#define MANTIS_INT_RISCI                (0x01 <<  1)
+#define MANTIS_INT_I2CDONE              (0x01 <<  0)
+
+/* DMA */
+#define MANTIS_DMA_CTL                  0x08
+#define MANTIS_GPIF_RD                  (0xff << 24)
+#define MANTIS_GPIF_WR                  (0xff << 16)
+#define MANTIS_CPU_DO                   (0x01 << 10)
+#define MANTIS_DRV_DO                   (0x01 <<  9)
+#define MANTIS_I2C_RD                   (0x01 <<  7)
+#define MANTIS_I2C_WR                   (0x01 <<  6)
+#define MANTIS_DCAP_MODE                (0x01 <<  5)
+#define MANTIS_FIFO_TP_4                (0x00 <<  3)
+#define MANTIS_FIFO_TP_8                (0x01 <<  3)
+#define MANTIS_FIFO_TP_16               (0x02 <<  3)
+#define MANTIS_FIFO_EN                  (0x01 <<  2)
+#define MANTIS_DCAP_EN                  (0x01 <<  1)
+#define MANTIS_RISC_EN                  (0x01 <<  0)
+
+/* DEBUG */
+#define MANTIS_DEBUGREG                 0x0c
+#define MANTIS_DATINV                   (0x0e <<  7)
+#define MANTIS_TOP_DEBUGSEL             (0x07 <<  4)
+#define MANTIS_PCMCIA_DEBUGSEL          (0x0f <<  0)
+
+#define MANTIS_RISC_START               0x10
+#define MANTIS_RISC_PC                  0x14
+
+/* I2C */
+#define MANTIS_I2CDATA_CTL              0x18
+#define MANTIS_I2C_RATE_1               (0x00 <<  6)
+#define MANTIS_I2C_RATE_2               (0x01 <<  6)
+#define MANTIS_I2C_RATE_3               (0x02 <<  6)
+#define MANTIS_I2C_RATE_4               (0x03 <<  6)
+#define MANTIS_I2C_STOP                 (0x01 <<  5)
+#define MANTIS_I2C_PGMODE               (0x01 <<  3)
+
+/* DATA */
+#define MANTIS_CMD_DATA_R1              0x20
+#define MANTIS_CMD_DATA_3               (0xff << 24)
+#define MANTIS_CMD_DATA_2               (0xff << 16)
+#define MANTIS_CMD_DATA_1               (0xff <<  8)
+#define MANTIS_CMD_DATA_0               (0xff <<  0)
+
+#define MANTIS_CMD_DATA_R2              0x24
+#define MANTIS_CMD_DATA_7               (0xff << 24)
+#define MANTIS_CMD_DATA_6               (0xff << 16)
+#define MANTIS_CMD_DATA_5               (0xff <<  8)
+#define MANTIS_CMD_DATA_4               (0xff <<  0)
+
+#define MANTIS_CONTROL                  0x28
+#define MANTIS_DET                      (0x01 <<  7)
+#define MANTIS_DAT_CF_EN                (0x01 <<  6)
+#define MANTIS_ACS                      (0x03 <<  4)
+#define MANTIS_VCCEN                    (0x01 <<  3)
+#define MANTIS_BYPASS                   (0x01 <<  2)
+#define MANTIS_MRST                     (0x01 <<  1)
+#define MANTIS_CRST_INT                 (0x01 <<  0)
+
+#define MANTIS_GPIF_CFGSLA              0x84
+#define MANTIS_GPIF_WAITSMPL            (0x07 << 28)
+#define MANTIS_GPIF_BYTEADDRSUB         (0x01 << 25)
+#define MANTIS_GPIF_WAITPOL             (0x01 << 24)
+#define MANTIS_GPIF_NCDELAY             (0x07 << 20)
+#define MANTIS_GPIF_RW2CSDELAY          (0x07 << 16)
+#define MANTIS_GPIF_SLFTIMEDMODE        (0x01 << 15)
+#define MANTIS_GPIF_SLFTIMEDDELY        (0x7f <<  8)
+#define MANTIS_GPIF_DEVTYPE             (0x07 <<  4)
+#define MANTIS_GPIF_BIGENDIAN           (0x01 <<  3)
+#define MANTIS_GPIF_FETCHCMD            (0x03 <<  1)
+#define MANTIS_GPIF_HWORDDEV            (0x01 <<  0)
+
+#define MANTIS_GPIF_WSTOPER             0x90
+#define MANTIS_GPIF_WSTOPERWREN3        (0x01 << 31)
+#define MANTIS_GPIF_PARBOOTN            (0x01 << 29)
+#define MANTIS_GPIF_WSTOPERSLID3        (0x1f << 24)
+#define MANTIS_GPIF_WSTOPERWREN2        (0x01 << 23)
+#define MANTIS_GPIF_WSTOPERSLID2        (0x1f << 16)
+#define MANTIS_GPIF_WSTOPERWREN1        (0x01 << 15)
+#define MANTIS_GPIF_WSTOPERSLID1        (0x1f <<  8)
+#define MANTIS_GPIF_WSTOPERWREN0        (0x01 <<  7)
+#define MANTIS_GPIF_WSTOPERSLID0        (0x1f <<  0)
+
+#define MANTIS_GPIF_CS2RW               0x94
+#define MANTIS_GPIF_CS2RWWREN3          (0x01 << 31)
+#define MANTIS_GPIF_CS2RWDELY3          (0x3f << 24)
+#define MANTIS_GPIF_CS2RWWREN2          (0x01 << 23)
+#define MANTIS_GPIF_CS2RWDELY2          (0x3f << 16)
+#define MANTIS_GPIF_CS2RWWREN1          (0x01 << 15)
+#define MANTIS_GPIF_CS2RWDELY1          (0x3f <<  8)
+#define MANTIS_GPIF_CS2RWWREN0          (0x01 <<  7)
+#define MANTIS_GPIF_CS2RWDELY0          (0x3f <<  0)
+
+#define MANTIS_GPIF_IRQCFG              0x98
+#define MANTIS_GPIF_IRQPOL              (0x01 <<  8)
+#define MANTIS_MASK_WRACK               (0x01 <<  7)
+#define MANTIS_MASK_BRRDY               (0x01 <<  6)
+#define MANTIS_MASK_OVFLW               (0x01 <<  5)
+#define MANTIS_MASK_OTHERR              (0x01 <<  4)
+#define MANTIS_MASK_WSTO                (0x01 <<  3)
+#define MANTIS_MASK_EXTIRQ              (0x01 <<  2)
+#define MANTIS_MASK_PLUGIN              (0x01 <<  1)
+#define MANTIS_MASK_PLUGOUT             (0x01 <<  0)
+
+#define MANTIS_GPIF_STATUS              0x9c
+#define MANTIS_SBUF_KILLOP              (0x01 << 15)
+#define MANTIS_SBUF_OPDONE              (0x01 << 14)
+#define MANTIS_SBUF_EMPTY               (0x01 << 13)
+#define MANTIS_GPIF_DETSTAT             (0x01 <<  9)
+#define MANTIS_GPIF_INTSTAT             (0x01 <<  8)
+#define MANTIS_GPIF_WRACK               (0x01 <<  7)
+#define MANTIS_GPIF_BRRDY               (0x01 <<  6)
+#define MANTIS_SBUF_OVFLW               (0x01 <<  5)
+#define MANTIS_GPIF_OTHERR              (0x01 <<  4)
+#define MANTIS_SBUF_WSTO                (0x01 <<  3)
+#define MANTIS_GPIF_EXTIRQ              (0x01 <<  2)
+#define MANTIS_CARD_PLUGIN              (0x01 <<  1)
+#define MANTIS_CARD_PLUGOUT             (0x01 <<  0)
+
+#define MANTIS_GPIF_BRADDR              0xa0
+#define MANTIS_GPIF_PCMCIAREG           (0x01           << 27)
+#define MANTIS_GPIF_PCMCIAIOM           (0x01           << 26)
+#define MANTIS_GPIF_BR_ADDR             (0xfffffff      <<  0)
+
+#define MANTIS_GPIF_BRBYTES             0xa4
+#define MANTIS_GPIF_BRCNT               (0xfff          <<  0)
+
+#define MANTIS_PCMCIA_RESET             0xa8
+#define MANTIS_PCMCIA_RSTVAL            (0xff << 0)
+
+#define MANTIS_CARD_RESET               0xac
+
+#define MANTIS_GPIF_ADDR                0xb0
+#define MANTIS_GPIF_HIFRDWRN            (0x01           << 31)
+#define MANTIS_GPIF_PCMCIAREG           (0x01           << 27)
+#define MANTIS_GPIF_PCMCIAIOM           (0x01           << 26)
+#define MANTIS_GPIF_HIFADDR             (0xfffffff      <<  0)
+
+#define MANTIS_GPIF_DOUT                0xb4
+#define MANTIS_GPIF_HIFDOUT             (0xfffffff      <<  0)
+
+#define MANTIS_GPIF_DIN                 0xb8
+#define MANTIS_GPIF_HIFDIN              (0xfffffff      <<  0)
+
+#define MANTIS_GPIF_SPARE               0xbc
+#define MANTIS_GPIF_LOGICRD             (0xffff         << 16)
+#define MANTIS_GPIF_LOGICRW             (0xffff         <<  0)
+
+#endif /* __MANTIS_REG_H */
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c
new file mode 100644
index 000000000000..7d2f2398fa8b
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_uart.c
@@ -0,0 +1,186 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_reg.h"
+#include "mantis_uart.h"
+
+struct mantis_uart_params {
+        enum mantis_baud        baud_rate;
+        enum mantis_parity      parity;
+};
+
+static struct {
+        char string[7];
+} rates[5] = {
+        { "9600" },
+        { "19200" },
+        { "38400" },
+        { "57600" },
+        { "115200" }
+};
+
+static struct {
+        char string[5];
+} parity[3] = {
+        { "NONE" },
+        { "ODD" },
+        { "EVEN" }
+};
+
+#define UART_MAX_BUF                    16
+
+int mantis_uart_read(struct mantis_pci *mantis, u8 *data)
+{
+        struct mantis_hwconfig *config = mantis->hwconfig;
+        u32 stat = 0, i;
+
+        /* get data */
+        for (i = 0; i < (config->bytes + 1); i++) {
+
+                stat = mmread(MANTIS_UART_STAT);
+
+                if (stat & MANTIS_UART_RXFIFO_FULL) {
+                        dprintk(MANTIS_ERROR, 1, "RX Fifo FULL");
+                }
+                data[i] = mmread(MANTIS_UART_RXD) & 0x3f;
+
+                dprintk(MANTIS_DEBUG, 1, "Reading ... <%02x>", data[i] & 0x3f);
+
+                if (data[i] & (1 << 7)) {
+                        dprintk(MANTIS_ERROR, 1, "UART framing error");
+                        return -EINVAL;
+                }
+                if (data[i] & (1 << 6)) {
+                        dprintk(MANTIS_ERROR, 1, "UART parity error");
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+static void mantis_uart_work(struct work_struct *work)
+{
+        struct mantis_pci *mantis = container_of(work, struct mantis_pci, uart_work);
+        struct mantis_hwconfig *config = mantis->hwconfig;
+        u8 buf[16];
+        int i;
+
+        mantis_uart_read(mantis, buf);
+
+        for (i = 0; i < (config->bytes + 1); i++)
+                dprintk(MANTIS_INFO, 1, "UART BUF:%d <%02x> ", i, buf[i]);
+
+        dprintk(MANTIS_DEBUG, 0, "\n");
+}
+
+static int mantis_uart_setup(struct mantis_pci *mantis,
+                             struct mantis_uart_params *params)
+{
+        u32 reg;
+
+        mmwrite((mmread(MANTIS_UART_CTL) | (params->parity & 0x3)), MANTIS_UART_CTL);
+
+        reg = mmread(MANTIS_UART_BAUD);
+
+        switch (params->baud_rate) {
+        case MANTIS_BAUD_9600:
+                reg |= 0xd8;
+                break;
+        case MANTIS_BAUD_19200:
+                reg |= 0x6c;
+                break;
+        case MANTIS_BAUD_38400:
+                reg |= 0x36;
+                break;
+        case MANTIS_BAUD_57600:
+                reg |= 0x23;
+                break;
+        case MANTIS_BAUD_115200:
+                reg |= 0x11;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        mmwrite(reg, MANTIS_UART_BAUD);
+
+        return 0;
+}
+
+int mantis_uart_init(struct mantis_pci *mantis)
+{
+        struct mantis_hwconfig *config = mantis->hwconfig;
+        struct mantis_uart_params params;
+
+        /* default parity: */
+        params.baud_rate = config->baud_rate;
+        params.parity = config->parity;
+        dprintk(MANTIS_INFO, 1, "Initializing UART @ %sbps parity:%s",
+                rates[params.baud_rate].string,
+                parity[params.parity].string);
+
+        init_waitqueue_head(&mantis->uart_wq);
+        spin_lock_init(&mantis->uart_lock);
+
+        INIT_WORK(&mantis->uart_work, mantis_uart_work);
+
+        /* disable interrupt */
+        mmwrite(mmread(MANTIS_UART_CTL) & 0xffef, MANTIS_UART_CTL);
+
+        mantis_uart_setup(mantis, &params);
+
+        /* default 1 byte */
+        mmwrite((mmread(MANTIS_UART_BAUD) | (config->bytes << 8)), MANTIS_UART_BAUD);
+
+        /* flush buffer */
+        mmwrite((mmread(MANTIS_UART_CTL) | MANTIS_UART_RXFLUSH), MANTIS_UART_CTL);
+
+        /* enable interrupt */
+        mmwrite(mmread(MANTIS_INT_MASK) | 0x800, MANTIS_INT_MASK);
+        mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL);
+
+        schedule_work(&mantis->uart_work);
+        dprintk(MANTIS_DEBUG, 1, "UART succesfully initialized");
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mantis_uart_init);
+
+void mantis_uart_exit(struct mantis_pci *mantis)
+{
+        /* disable interrupt */
+        mmwrite(mmread(MANTIS_UART_CTL) & 0xffef, MANTIS_UART_CTL);
+}
+EXPORT_SYMBOL_GPL(mantis_uart_exit);
diff --git a/drivers/media/dvb/mantis/mantis_uart.h b/drivers/media/dvb/mantis/mantis_uart.h
new file mode 100644
index 000000000000..ffb62a0a5a13
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_uart.h
@@ -0,0 +1,58 @@
+/*
+        Mantis PCI bridge driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_UART_H
+#define __MANTIS_UART_H
+
+#define MANTIS_UART_CTL                 0xe0
+#define MANTIS_UART_RXINT               (1 << 4)
+#define MANTIS_UART_RXFLUSH             (1 << 2)
+
+#define MANTIS_UART_RXD                 0xe8
+#define MANTIS_UART_BAUD                0xec
+
+#define MANTIS_UART_STAT                0xf0
+#define MANTIS_UART_RXFIFO_DATA         (1 << 7)
+#define MANTIS_UART_RXFIFO_EMPTY        (1 << 6)
+#define MANTIS_UART_RXFIFO_FULL         (1 << 3)
+#define MANTIS_UART_FRAME_ERR           (1 << 2)
+#define MANTIS_UART_PARITY_ERR          (1 << 1)
+#define MANTIS_UART_RXTHRESH_INT        (1 << 0)
+
+enum mantis_baud {
+        MANTIS_BAUD_9600        = 0,
+        MANTIS_BAUD_19200,
+        MANTIS_BAUD_38400,
+        MANTIS_BAUD_57600,
+        MANTIS_BAUD_115200
+};
+
+enum mantis_parity {
+        MANTIS_PARITY_NONE      = 0,
+        MANTIS_PARITY_EVEN,
+        MANTIS_PARITY_ODD,
+};
+
+struct mantis_pci;
+
+extern int mantis_uart_init(struct mantis_pci *mantis);
+extern void mantis_uart_exit(struct mantis_pci *mantis);
+
+#endif /* __MANTIS_UART_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
new file mode 100644
index 000000000000..4a723bda0031
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -0,0 +1,212 @@
+/*
+        Mantis VP-1033 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "stv0299.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp1033.h"
+#include "mantis_reg.h"
+
+u8 lgtdqcs001f_inittab[] = {
+        0x01, 0x15,
+        0x02, 0x00,
+        0x03, 0x00,
+        0x04, 0x2a,
+        0x05, 0x85,
+        0x06, 0x02,
+        0x07, 0x00,
+        0x08, 0x00,
+        0x0c, 0x01,
+        0x0d, 0x81,
+        0x0e, 0x44,
+        0x0f, 0x94,
+        0x10, 0x3c,
+        0x11, 0x84,
+        0x12, 0xb9,
+        0x13, 0xb5,
+        0x14, 0x4f,
+        0x15, 0xc9,
+        0x16, 0x80,
+        0x17, 0x36,
+        0x18, 0xfb,
+        0x19, 0xcf,
+        0x1a, 0xbc,
+        0x1c, 0x2b,
+        0x1d, 0x27,
+        0x1e, 0x00,
+        0x1f, 0x0b,
+        0x20, 0xa1,
+        0x21, 0x60,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x28, 0x00,
+        0x29, 0x28,
+        0x2a, 0x14,
+        0x2b, 0x0f,
+        0x2c, 0x09,
+        0x2d, 0x05,
+        0x31, 0x1f,
+        0x32, 0x19,
+        0x33, 0xfc,
+        0x34, 0x13,
+        0xff, 0xff,
+};
+
+#define MANTIS_MODEL_NAME       "VP-1033"
+#define MANTIS_DEV_TYPE         "DVB-S/DSS"
+
+int lgtdqcs001f_tuner_set(struct dvb_frontend *fe,
+                          struct dvb_frontend_parameters *params)
+{
+        struct mantis_pci *mantis       = fe->dvb->priv;
+        struct i2c_adapter *adapter     = &mantis->adapter;
+
+        u8 buf[4];
+        u32 div;
+
+
+        struct i2c_msg msg = {.addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf)};
+
+        div = params->frequency / 250;
+
+        buf[0] = (div >> 8) & 0x7f;
+        buf[1] =  div & 0xff;
+        buf[2] =  0x83;
+        buf[3] =  0xc0;
+
+        if (params->frequency < 1531000)
+                buf[3] |= 0x04;
+        else
+                buf[3] &= ~0x04;
+        if (i2c_transfer(adapter, &msg, 1) < 0) {
+                dprintk(MANTIS_ERROR, 1, "Write: I2C Transfer failed");
+                return -EIO;
+        }
+        msleep_interruptible(100);
+
+        return 0;
+}
+
+int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe,
+                                u32 srate, u32 ratio)
+{
+        u8 aclk = 0;
+        u8 bclk = 0;
+
+        if (srate < 1500000) {
+                aclk = 0xb7;
+                bclk = 0x47;
+        } else if (srate < 3000000) {
+                aclk = 0xb7;
+                bclk = 0x4b;
+        } else if (srate < 7000000) {
+                aclk = 0xb7;
+                bclk = 0x4f;
+        } else if (srate < 14000000) {
+                aclk = 0xb7;
+                bclk = 0x53;
+        } else if (srate < 30000000) {
+                aclk = 0xb6;
+                bclk = 0x53;
+        } else if (srate < 45000000) {
+                aclk = 0xb4;
+                bclk = 0x51;
+        }
+        stv0299_writereg(fe, 0x13, aclk);
+        stv0299_writereg(fe, 0x14, bclk);
+
+        stv0299_writereg(fe, 0x1f, (ratio >> 16) & 0xff);
+        stv0299_writereg(fe, 0x20, (ratio >>  8) & 0xff);
+        stv0299_writereg(fe, 0x21,  ratio & 0xf0);
+
+        return 0;
+}
+
+struct stv0299_config lgtdqcs001f_config = {
+        .demod_address          = 0x68,
+        .inittab                = lgtdqcs001f_inittab,
+        .mclk                   = 88000000UL,
+        .invert                 = 0,
+        .skip_reinit            = 0,
+        .volt13_op0_op1         = STV0299_VOLT13_OP0,
+        .min_delay_ms           = 100,
+        .set_symbol_rate        = lgtdqcs001f_set_symbol_rate,
+};
+
+static int vp1033_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter     = &mantis->adapter;
+
+        int err = 0;
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                mantis_frontend_soft_reset(mantis);
+                msleep(250);
+
+                dprintk(MANTIS_ERROR, 1, "Probing for STV0299 (DVB-S)");
+                fe = stv0299_attach(&lgtdqcs001f_config, adapter);
+
+                if (fe) {
+                        fe->ops.tuner_ops.set_params = lgtdqcs001f_tuner_set;
+                        dprintk(MANTIS_ERROR, 1, "found STV0299 DVB-S frontend @ 0x%02x",
+                                lgtdqcs001f_config.demod_address);
+
+                        dprintk(MANTIS_ERROR, 1, "Mantis DVB-S STV0299 frontend attach success");
+                } else {
+                        return -1;
+                }
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+        mantis->fe = fe;
+        dprintk(MANTIS_ERROR, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp1033_config = {
+        .model_name             = MANTIS_MODEL_NAME,
+        .dev_type               = MANTIS_DEV_TYPE,
+        .ts_size                = MANTIS_TS_204,
+
+        .baud_rate              = MANTIS_BAUD_9600,
+        .parity                 = MANTIS_PARITY_NONE,
+        .bytes                  = 0,
+
+        .frontend_init          = vp1033_frontend_init,
+        .power                  = GPIF_A12,
+        .reset                  = GPIF_A13,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.h b/drivers/media/dvb/mantis/mantis_vp1033.h
new file mode 100644
index 000000000000..7daaa1bf127d
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1033.h
@@ -0,0 +1,30 @@
+/*
+        Mantis VP-1033 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP1033_H
+#define __MANTIS_VP1033_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_1033_DVB_S    0x0016
+
+extern struct mantis_hwconfig vp1033_config;
+
+#endif /* __MANTIS_VP1033_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/dvb/mantis/mantis_vp1034.c
new file mode 100644
index 000000000000..8e6ae558ee57
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1034.c
@@ -0,0 +1,119 @@
+/*
+        Mantis VP-1034 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mb86a16.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp1034.h"
+#include "mantis_reg.h"
+
+struct mb86a16_config vp1034_mb86a16_config = {
+        .demod_address  = 0x08,
+        .set_voltage    = vp1034_set_voltage,
+};
+
+#define MANTIS_MODEL_NAME       "VP-1034"
+#define MANTIS_DEV_TYPE         "DVB-S/DSS"
+
+int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+        struct mantis_pci *mantis = fe->dvb->priv;
+
+        switch (voltage) {
+        case SEC_VOLTAGE_13:
+                dprintk(MANTIS_ERROR, 1, "Polarization=[13V]");
+                gpio_set_bits(mantis, 13, 1);
+                gpio_set_bits(mantis, 14, 0);
+                break;
+        case SEC_VOLTAGE_18:
+                dprintk(MANTIS_ERROR, 1, "Polarization=[18V]");
+                gpio_set_bits(mantis, 13, 1);
+                gpio_set_bits(mantis, 14, 1);
+                break;
+        case SEC_VOLTAGE_OFF:
+                dprintk(MANTIS_ERROR, 1, "Frontend (dummy) POWERDOWN");
+                break;
+        default:
+                dprintk(MANTIS_ERROR, 1, "Invalid = (%d)", (u32) voltage);
+                return -EINVAL;
+        }
+        mmwrite(0x00, MANTIS_GPIF_DOUT);
+
+        return 0;
+}
+
+static int vp1034_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter     = &mantis->adapter;
+
+        int err = 0;
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                mantis_frontend_soft_reset(mantis);
+                msleep(250);
+
+                dprintk(MANTIS_ERROR, 1, "Probing for MB86A16 (DVB-S/DSS)");
+                fe = mb86a16_attach(&vp1034_mb86a16_config, adapter);
+                if (fe) {
+                        dprintk(MANTIS_ERROR, 1,
+                        "found MB86A16 DVB-S/DSS frontend @0x%02x",
+                        vp1034_mb86a16_config.demod_address);
+
+                } else {
+                        return -1;
+                }
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+        mantis->fe = fe;
+        dprintk(MANTIS_ERROR, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp1034_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_204,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp1034_frontend_init,
+        .power          = GPIF_A12,
+        .reset          = GPIF_A13,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.h b/drivers/media/dvb/mantis/mantis_vp1034.h
new file mode 100644
index 000000000000..323f38ef8e3d
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1034.h
@@ -0,0 +1,33 @@
+/*
+        Mantis VP-1034 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP1034_H
+#define __MANTIS_VP1034_H
+
+#include "dvb_frontend.h"
+#include "mantis_common.h"
+
+
+#define MANTIS_VP_1034_DVB_S    0x0014
+
+extern struct mantis_hwconfig vp1034_config;
+extern int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
+
+#endif /* __MANTIS_VP1034_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/dvb/mantis/mantis_vp1041.c
new file mode 100644
index 000000000000..515346dd31d0
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1041.c
@@ -0,0 +1,358 @@
+/*
+        Mantis VP-1041 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp1041.h"
+#include "stb0899_reg.h"
+#include "stb0899_drv.h"
+#include "stb0899_cfg.h"
+#include "stb6100_cfg.h"
+#include "stb6100.h"
+#include "lnbp21.h"
+
+#define MANTIS_MODEL_NAME       "VP-1041"
+#define MANTIS_DEV_TYPE         "DSS/DVB-S/DVB-S2"
+
+static const struct stb0899_s1_reg vp1041_stb0899_s1_init_1[] = {
+
+        /* 0x0000000b, *//* SYSREG */
+        { STB0899_DEV_ID                , 0x30 },
+        { STB0899_DISCNTRL1             , 0x32 },
+        { STB0899_DISCNTRL2             , 0x80 },
+        { STB0899_DISRX_ST0             , 0x04 },
+        { STB0899_DISRX_ST1             , 0x00 },
+        { STB0899_DISPARITY             , 0x00 },
+        { STB0899_DISFIFO               , 0x00 },
+        { STB0899_DISSTATUS             , 0x20 },
+        { STB0899_DISF22                , 0x99 },
+        { STB0899_DISF22RX              , 0xa8 },
+        /* SYSREG ? */
+        { STB0899_ACRPRESC              , 0x11 },
+        { STB0899_ACRDIV1               , 0x0a },
+        { STB0899_ACRDIV2               , 0x05 },
+        { STB0899_DACR1                 , 0x00 },
+        { STB0899_DACR2                 , 0x00 },
+        { STB0899_OUTCFG                , 0x00 },
+        { STB0899_MODECFG               , 0x00 },
+        { STB0899_IRQSTATUS_3           , 0xfe },
+        { STB0899_IRQSTATUS_2           , 0x03 },
+        { STB0899_IRQSTATUS_1           , 0x7c },
+        { STB0899_IRQSTATUS_0           , 0xf4 },
+        { STB0899_IRQMSK_3              , 0xf3 },
+        { STB0899_IRQMSK_2              , 0xfc },
+        { STB0899_IRQMSK_1              , 0xff },
+        { STB0899_IRQMSK_0              , 0xff },
+        { STB0899_IRQCFG                , 0x00 },
+        { STB0899_I2CCFG                , 0x88 },
+        { STB0899_I2CRPT                , 0x58 },
+        { STB0899_IOPVALUE5             , 0x00 },
+        { STB0899_IOPVALUE4             , 0x33 },
+        { STB0899_IOPVALUE3             , 0x6d },
+        { STB0899_IOPVALUE2             , 0x90 },
+        { STB0899_IOPVALUE1             , 0x60 },
+        { STB0899_IOPVALUE0             , 0x00 },
+        { STB0899_GPIO00CFG             , 0x82 },
+        { STB0899_GPIO01CFG             , 0x82 },
+        { STB0899_GPIO02CFG             , 0x82 },
+        { STB0899_GPIO03CFG             , 0x82 },
+        { STB0899_GPIO04CFG             , 0x82 },
+        { STB0899_GPIO05CFG             , 0x82 },
+        { STB0899_GPIO06CFG             , 0x82 },
+        { STB0899_GPIO07CFG             , 0x82 },
+        { STB0899_GPIO08CFG             , 0x82 },
+        { STB0899_GPIO09CFG             , 0x82 },
+        { STB0899_GPIO10CFG             , 0x82 },
+        { STB0899_GPIO11CFG             , 0x82 },
+        { STB0899_GPIO12CFG             , 0x82 },
+        { STB0899_GPIO13CFG             , 0x82 },
+        { STB0899_GPIO14CFG             , 0x82 },
+        { STB0899_GPIO15CFG             , 0x82 },
+        { STB0899_GPIO16CFG             , 0x82 },
+        { STB0899_GPIO17CFG             , 0x82 },
+        { STB0899_GPIO18CFG             , 0x82 },
+        { STB0899_GPIO19CFG             , 0x82 },
+        { STB0899_GPIO20CFG             , 0x82 },
+        { STB0899_SDATCFG               , 0xb8 },
+        { STB0899_SCLTCFG               , 0xba },
+        { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
+        { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
+        { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
+        { STB0899_DIRCLKCFG             , 0x82 },
+        { STB0899_CLKOUT27CFG           , 0x7e },
+        { STB0899_STDBYCFG              , 0x82 },
+        { STB0899_CS0CFG                , 0x82 },
+        { STB0899_CS1CFG                , 0x82 },
+        { STB0899_DISEQCOCFG            , 0x20 },
+        { STB0899_GPIO32CFG             , 0x82 },
+        { STB0899_GPIO33CFG             , 0x82 },
+        { STB0899_GPIO34CFG             , 0x82 },
+        { STB0899_GPIO35CFG             , 0x82 },
+        { STB0899_GPIO36CFG             , 0x82 },
+        { STB0899_GPIO37CFG             , 0x82 },
+        { STB0899_GPIO38CFG             , 0x82 },
+        { STB0899_GPIO39CFG             , 0x82 },
+        { STB0899_NCOARSE               , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
+        { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
+        { STB0899_FILTCTRL              , 0x00 },
+        { STB0899_SYSCTRL               , 0x01 },
+        { STB0899_STOPCLK1              , 0x20 },
+        { STB0899_STOPCLK2              , 0x00 },
+        { STB0899_INTBUFSTATUS          , 0x00 },
+        { STB0899_INTBUFCTRL            , 0x0a },
+        { 0xffff                        , 0xff },
+};
+
+static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
+        { STB0899_DEMOD                 , 0x00 },
+        { STB0899_RCOMPC                , 0xc9 },
+        { STB0899_AGC1CN                , 0x01 },
+        { STB0899_AGC1REF               , 0x10 },
+        { STB0899_RTC                   , 0x23 },
+        { STB0899_TMGCFG                , 0x4e },
+        { STB0899_AGC2REF               , 0x34 },
+        { STB0899_TLSR                  , 0x84 },
+        { STB0899_CFD                   , 0xf7 },
+        { STB0899_ACLC                  , 0x87 },
+        { STB0899_BCLC                  , 0x94 },
+        { STB0899_EQON                  , 0x41 },
+        { STB0899_LDT                   , 0xf1 },
+        { STB0899_LDT2                  , 0xe3 },
+        { STB0899_EQUALREF              , 0xb4 },
+        { STB0899_TMGRAMP               , 0x10 },
+        { STB0899_TMGTHD                , 0x30 },
+        { STB0899_IDCCOMP               , 0xfd },
+        { STB0899_QDCCOMP               , 0xff },
+        { STB0899_POWERI                , 0x0c },
+        { STB0899_POWERQ                , 0x0f },
+        { STB0899_RCOMP                 , 0x6c },
+        { STB0899_AGCIQIN               , 0x80 },
+        { STB0899_AGC2I1                , 0x06 },
+        { STB0899_AGC2I2                , 0x00 },
+        { STB0899_TLIR                  , 0x30 },
+        { STB0899_RTF                   , 0x7f },
+        { STB0899_DSTATUS               , 0x00 },
+        { STB0899_LDI                   , 0xbc },
+        { STB0899_CFRM                  , 0xea },
+        { STB0899_CFRL                  , 0x31 },
+        { STB0899_NIRM                  , 0x2b },
+        { STB0899_NIRL                  , 0x80 },
+        { STB0899_ISYMB                 , 0x1d },
+        { STB0899_QSYMB                 , 0xa6 },
+        { STB0899_SFRH                  , 0x2f },
+        { STB0899_SFRM                  , 0x68 },
+        { STB0899_SFRL                  , 0x40 },
+        { STB0899_SFRUPH                , 0x2f },
+        { STB0899_SFRUPM                , 0x68 },
+        { STB0899_SFRUPL                , 0x40 },
+        { STB0899_EQUAI1                , 0x02 },
+        { STB0899_EQUAQ1                , 0xff },
+        { STB0899_EQUAI2                , 0x04 },
+        { STB0899_EQUAQ2                , 0x05 },
+        { STB0899_EQUAI3                , 0x02 },
+        { STB0899_EQUAQ3                , 0xfd },
+        { STB0899_EQUAI4                , 0x03 },
+        { STB0899_EQUAQ4                , 0x07 },
+        { STB0899_EQUAI5                , 0x08 },
+        { STB0899_EQUAQ5                , 0xf5 },
+        { STB0899_DSTATUS2              , 0x00 },
+        { STB0899_VSTATUS               , 0x00 },
+        { STB0899_VERROR                , 0x86 },
+        { STB0899_IQSWAP                , 0x2a },
+        { STB0899_ECNT1M                , 0x00 },
+        { STB0899_ECNT1L                , 0x00 },
+        { STB0899_ECNT2M                , 0x00 },
+        { STB0899_ECNT2L                , 0x00 },
+        { STB0899_ECNT3M                , 0x0a },
+        { STB0899_ECNT3L                , 0xad },
+        { STB0899_FECAUTO1              , 0x06 },
+        { STB0899_FECM                  , 0x01 },
+        { STB0899_VTH12                 , 0xb0 },
+        { STB0899_VTH23                 , 0x7a },
+        { STB0899_VTH34                 , 0x58 },
+        { STB0899_VTH56                 , 0x38 },
+        { STB0899_VTH67                 , 0x34 },
+        { STB0899_VTH78                 , 0x24 },
+        { STB0899_PRVIT                 , 0xff },
+        { STB0899_VITSYNC               , 0x19 },
+        { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
+        { STB0899_TSULC                 , 0x42 },
+        { STB0899_RSLLC                 , 0x41 },
+        { STB0899_TSLPL                 , 0x12 },
+        { STB0899_TSCFGH                , 0x0c },
+        { STB0899_TSCFGM                , 0x00 },
+        { STB0899_TSCFGL                , 0x00 },
+        { STB0899_TSOUT                 , 0x69 }, /* 0x0d for CAM */
+        { STB0899_RSSYNCDEL             , 0x00 },
+        { STB0899_TSINHDELH             , 0x02 },
+        { STB0899_TSINHDELM             , 0x00 },
+        { STB0899_TSINHDELL             , 0x00 },
+        { STB0899_TSLLSTKM              , 0x1b },
+        { STB0899_TSLLSTKL              , 0xb3 },
+        { STB0899_TSULSTKM              , 0x00 },
+        { STB0899_TSULSTKL              , 0x00 },
+        { STB0899_PCKLENUL              , 0xbc },
+        { STB0899_PCKLENLL              , 0xcc },
+        { STB0899_RSPCKLEN              , 0xbd },
+        { STB0899_TSSTATUS              , 0x90 },
+        { STB0899_ERRCTRL1              , 0xb6 },
+        { STB0899_ERRCTRL2              , 0x95 },
+        { STB0899_ERRCTRL3              , 0x8d },
+        { STB0899_DMONMSK1              , 0x27 },
+        { STB0899_DMONMSK0              , 0x03 },
+        { STB0899_DEMAPVIT              , 0x5c },
+        { STB0899_PLPARM                , 0x19 },
+        { STB0899_PDELCTRL              , 0x48 },
+        { STB0899_PDELCTRL2             , 0x00 },
+        { STB0899_BBHCTRL1              , 0x00 },
+        { STB0899_BBHCTRL2              , 0x00 },
+        { STB0899_HYSTTHRESH            , 0x77 },
+        { STB0899_MATCSTM               , 0x00 },
+        { STB0899_MATCSTL               , 0x00 },
+        { STB0899_UPLCSTM               , 0x00 },
+        { STB0899_UPLCSTL               , 0x00 },
+        { STB0899_DFLCSTM               , 0x00 },
+        { STB0899_DFLCSTL               , 0x00 },
+        { STB0899_SYNCCST               , 0x00 },
+        { STB0899_SYNCDCSTM             , 0x00 },
+        { STB0899_SYNCDCSTL             , 0x00 },
+        { STB0899_ISI_ENTRY             , 0x00 },
+        { STB0899_ISI_BIT_EN            , 0x00 },
+        { STB0899_MATSTRM               , 0xf0 },
+        { STB0899_MATSTRL               , 0x02 },
+        { STB0899_UPLSTRM               , 0x45 },
+        { STB0899_UPLSTRL               , 0x60 },
+        { STB0899_DFLSTRM               , 0xe3 },
+        { STB0899_DFLSTRL               , 0x00 },
+        { STB0899_SYNCSTR               , 0x47 },
+        { STB0899_SYNCDSTRM             , 0x05 },
+        { STB0899_SYNCDSTRL             , 0x18 },
+        { STB0899_CFGPDELSTATUS1        , 0x19 },
+        { STB0899_CFGPDELSTATUS2        , 0x2b },
+        { STB0899_BBFERRORM             , 0x00 },
+        { STB0899_BBFERRORL             , 0x01 },
+        { STB0899_UPKTERRORM            , 0x00 },
+        { STB0899_UPKTERRORL            , 0x00 },
+        { 0xffff                        , 0xff },
+};
+
+struct stb0899_config vp1041_stb0899_config = {
+        .init_dev               = vp1041_stb0899_s1_init_1,
+        .init_s2_demod          = stb0899_s2_init_2,
+        .init_s1_demod          = vp1041_stb0899_s1_init_3,
+        .init_s2_fec            = stb0899_s2_init_4,
+        .init_tst               = stb0899_s1_init_5,
+
+        .demod_address          = 0x68, /*  0xd0 >> 1 */
+
+        .xtal_freq              = 27000000,
+        .inversion              = IQ_SWAP_ON, /* 1 */
+
+        .lo_clk                 = 76500000,
+        .hi_clk                 = 99000000,
+
+        .esno_ave               = STB0899_DVBS2_ESNO_AVE,
+        .esno_quant             = STB0899_DVBS2_ESNO_QUANT,
+        .avframes_coarse        = STB0899_DVBS2_AVFRAMES_COARSE,
+        .avframes_fine          = STB0899_DVBS2_AVFRAMES_FINE,
+        .miss_threshold         = STB0899_DVBS2_MISS_THRESHOLD,
+        .uwp_threshold_acq      = STB0899_DVBS2_UWP_THRESHOLD_ACQ,
+        .uwp_threshold_track    = STB0899_DVBS2_UWP_THRESHOLD_TRACK,
+        .uwp_threshold_sof      = STB0899_DVBS2_UWP_THRESHOLD_SOF,
+        .sof_search_timeout     = STB0899_DVBS2_SOF_SEARCH_TIMEOUT,
+
+        .btr_nco_bits           = STB0899_DVBS2_BTR_NCO_BITS,
+        .btr_gain_shift_offset  = STB0899_DVBS2_BTR_GAIN_SHIFT_OFFSET,
+        .crl_nco_bits           = STB0899_DVBS2_CRL_NCO_BITS,
+        .ldpc_max_iter          = STB0899_DVBS2_LDPC_MAX_ITER,
+
+        .tuner_get_frequency    = stb6100_get_frequency,
+        .tuner_set_frequency    = stb6100_set_frequency,
+        .tuner_set_bandwidth    = stb6100_set_bandwidth,
+        .tuner_get_bandwidth    = stb6100_get_bandwidth,
+        .tuner_set_rfsiggain    = NULL,
+};
+
+struct stb6100_config vp1041_stb6100_config = {
+        .tuner_address  = 0x60,
+        .refclock       = 27000000,
+};
+
+static int vp1041_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter     = &mantis->adapter;
+
+        int err = 0;
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                mantis_frontend_soft_reset(mantis);
+                msleep(250);
+                mantis->fe = stb0899_attach(&vp1041_stb0899_config, adapter);
+                if (mantis->fe) {
+                        dprintk(MANTIS_ERROR, 1,
+                                "found STB0899 DVB-S/DVB-S2 frontend @0x%02x",
+                                vp1041_stb0899_config.demod_address);
+
+                        if (stb6100_attach(mantis->fe, &vp1041_stb6100_config, adapter)) {
+                                if (!lnbp21_attach(mantis->fe, adapter, 0, 0))
+                                        dprintk(MANTIS_ERROR, 1, "No LNBP21 found!");
+                        }
+                } else {
+                        return -EREMOTEIO;
+                }
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+
+
+        dprintk(MANTIS_ERROR, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp1041_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_188,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp1041_frontend_init,
+        .power          = GPIF_A12,
+        .reset          = GPIF_A13,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.h b/drivers/media/dvb/mantis/mantis_vp1041.h
new file mode 100644
index 000000000000..1ae5b3de8081
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp1041.h
@@ -0,0 +1,33 @@
+/*
+        Mantis VP-1041 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP1041_H
+#define __MANTIS_VP1041_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_1041_DVB_S2   0x0031
+#define SKYSTAR_HD2_10          0x0001
+#define SKYSTAR_HD2_20          0x0003
+#define CINERGY_S2_PCI_HD       0x1179
+
+extern struct mantis_hwconfig vp1041_config;
+
+#endif /* __MANTIS_VP1041_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c
new file mode 100644
index 000000000000..10ce81790a8c
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -0,0 +1,187 @@
+/*
+        Mantis VP-2033 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "tda1002x.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp2033.h"
+
+#define MANTIS_MODEL_NAME       "VP-2033"
+#define MANTIS_DEV_TYPE         "DVB-C"
+
+struct tda1002x_config vp2033_tda1002x_cu1216_config = {
+        .demod_address = 0x18 >> 1,
+        .invert = 1,
+};
+
+struct tda10023_config vp2033_tda10023_cu1216_config = {
+        .demod_address = 0x18 >> 1,
+        .invert = 1,
+};
+
+static u8 read_pwm(struct mantis_pci *mantis)
+{
+        struct i2c_adapter *adapter = &mantis->adapter;
+
+        u8 b = 0xff;
+        u8 pwm;
+        struct i2c_msg msg[] = {
+                {.addr = 0x50, .flags = 0, .buf = &b, .len = 1},
+                {.addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1}
+        };
+
+        if ((i2c_transfer(adapter, msg, 2) != 2)
+            || (pwm == 0xff))
+                pwm = 0x48;
+
+        return pwm;
+}
+
+static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        struct mantis_pci *mantis = fe->dvb->priv;
+        struct i2c_adapter *adapter = &mantis->adapter;
+
+        u8 buf[6];
+        struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf)};
+        int i;
+
+#define CU1216_IF 36125000
+#define TUNER_MUL 62500
+
+        u32 div = (params->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
+
+        buf[0] = (div >> 8) & 0x7f;
+        buf[1] = div & 0xff;
+        buf[2] = 0xce;
+        buf[3] = (params->frequency < 150000000 ? 0x01 :
+                  params->frequency < 445000000 ? 0x02 : 0x04);
+        buf[4] = 0xde;
+        buf[5] = 0x20;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        if (i2c_transfer(adapter, &msg, 1) != 1)
+                return -EIO;
+
+        /* wait for the pll lock */
+        msg.flags = I2C_M_RD;
+        msg.len = 1;
+        for (i = 0; i < 20; i++) {
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                if (i2c_transfer(adapter, &msg, 1) == 1 && (buf[0] & 0x40))
+                        break;
+
+                msleep(10);
+        }
+
+        /* switch the charge pump to the lower current */
+        msg.flags = 0;
+        msg.len = 2;
+        msg.buf = &buf[2];
+        buf[2] &= ~0x40;
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        if (i2c_transfer(adapter, &msg, 1) != 1)
+                return -EIO;
+
+        return 0;
+}
+
+static int vp2033_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter = &mantis->adapter;
+
+        int err = 0;
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                mantis_frontend_soft_reset(mantis);
+                msleep(250);
+
+                dprintk(MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
+                fe = tda10021_attach(&vp2033_tda1002x_cu1216_config,
+                                     adapter,
+                                     read_pwm(mantis));
+
+                if (fe) {
+                        dprintk(MANTIS_ERROR, 1,
+                                "found Philips CU1216 DVB-C frontend (TDA10021) @ 0x%02x",
+                                vp2033_tda1002x_cu1216_config.demod_address);
+                } else {
+                        fe = tda10023_attach(&vp2033_tda10023_cu1216_config,
+                                             adapter,
+                                             read_pwm(mantis));
+
+                        if (fe) {
+                                dprintk(MANTIS_ERROR, 1,
+                                        "found Philips CU1216 DVB-C frontend (TDA10023) @ 0x%02x",
+                                        vp2033_tda1002x_cu1216_config.demod_address);
+                        }
+                }
+
+                if (fe) {
+                        fe->ops.tuner_ops.set_params = tda1002x_cu1216_tuner_set;
+                        dprintk(MANTIS_ERROR, 1, "Mantis DVB-C Philips CU1216 frontend attach success");
+                } else {
+                        return -1;
+                }
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+
+        mantis->fe = fe;
+        dprintk(MANTIS_DEBUG, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp2033_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_204,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp2033_frontend_init,
+        .power          = GPIF_A12,
+        .reset          = GPIF_A13,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.h b/drivers/media/dvb/mantis/mantis_vp2033.h
new file mode 100644
index 000000000000..c55242b79d54
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp2033.h
@@ -0,0 +1,30 @@
+/*
+        Mantis VP-2033 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP2033_H
+#define __MANTIS_VP2033_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_2033_DVB_C    0x0008
+
+extern struct mantis_hwconfig vp2033_config;
+
+#endif /* __MANTIS_VP2033_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c
new file mode 100644
index 000000000000..a7ca233e800b
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -0,0 +1,186 @@
+/*
+        Mantis VP-2040 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "tda1002x.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp2040.h"
+
+#define MANTIS_MODEL_NAME       "VP-2040"
+#define MANTIS_DEV_TYPE         "DVB-C"
+
+struct tda1002x_config vp2040_tda1002x_cu1216_config = {
+        .demod_address  = 0x18 >> 1,
+        .invert         = 1,
+};
+
+struct tda10023_config vp2040_tda10023_cu1216_config = {
+        .demod_address  = 0x18 >> 1,
+        .invert         = 1,
+};
+
+static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        struct mantis_pci *mantis       = fe->dvb->priv;
+        struct i2c_adapter *adapter     = &mantis->adapter;
+
+        u8 buf[6];
+        struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf)};
+        int i;
+
+#define CU1216_IF 36125000
+#define TUNER_MUL 62500
+
+        u32 div = (params->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
+
+        buf[0] = (div >> 8) & 0x7f;
+        buf[1] = div & 0xff;
+        buf[2] = 0xce;
+        buf[3] = (params->frequency < 150000000 ? 0x01 :
+                  params->frequency < 445000000 ? 0x02 : 0x04);
+        buf[4] = 0xde;
+        buf[5] = 0x20;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        if (i2c_transfer(adapter, &msg, 1) != 1)
+                return -EIO;
+
+        /* wait for the pll lock */
+        msg.flags = I2C_M_RD;
+        msg.len = 1;
+        for (i = 0; i < 20; i++) {
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                if (i2c_transfer(adapter, &msg, 1) == 1 && (buf[0] & 0x40))
+                        break;
+
+                msleep(10);
+        }
+
+        /* switch the charge pump to the lower current */
+        msg.flags = 0;
+        msg.len = 2;
+        msg.buf = &buf[2];
+        buf[2] &= ~0x40;
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        if (i2c_transfer(adapter, &msg, 1) != 1)
+                return -EIO;
+
+        return 0;
+}
+
+static u8 read_pwm(struct mantis_pci *mantis)
+{
+        struct i2c_adapter *adapter = &mantis->adapter;
+
+        u8 b = 0xff;
+        u8 pwm;
+        struct i2c_msg msg[] = {
+                {.addr = 0x50, .flags = 0, .buf = &b, .len = 1},
+                {.addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1}
+        };
+
+        if ((i2c_transfer(adapter, msg, 2) != 2)
+            || (pwm == 0xff))
+                pwm = 0x48;
+
+        return pwm;
+}
+
+static int vp2040_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter = &mantis->adapter;
+
+        int err = 0;
+
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                mantis_frontend_soft_reset(mantis);
+                msleep(250);
+
+                dprintk(MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
+                fe = tda10021_attach(&vp2040_tda1002x_cu1216_config,
+                                     adapter,
+                                     read_pwm(mantis));
+
+                if (fe) {
+                        dprintk(MANTIS_ERROR, 1,
+                                "found Philips CU1216 DVB-C frontend (TDA10021) @ 0x%02x",
+                                vp2040_tda1002x_cu1216_config.demod_address);
+                } else {
+                        fe = tda10023_attach(&vp2040_tda10023_cu1216_config,
+                                             adapter,
+                                             read_pwm(mantis));
+
+                        if (fe) {
+                                dprintk(MANTIS_ERROR, 1,
+                                        "found Philips CU1216 DVB-C frontend (TDA10023) @ 0x%02x",
+                                        vp2040_tda1002x_cu1216_config.demod_address);
+                        }
+                }
+
+                if (fe) {
+                        fe->ops.tuner_ops.set_params = tda1002x_cu1216_tuner_set;
+                        dprintk(MANTIS_ERROR, 1, "Mantis DVB-C Philips CU1216 frontend attach success");
+                } else {
+                        return -1;
+                }
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
+        mantis->fe = fe;
+        dprintk(MANTIS_DEBUG, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp2040_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_204,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp2040_frontend_init,
+        .power          = GPIF_A12,
+        .reset          = GPIF_A13,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.h b/drivers/media/dvb/mantis/mantis_vp2040.h
new file mode 100644
index 000000000000..d125e219b685
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp2040.h
@@ -0,0 +1,32 @@
+/*
+        Mantis VP-2040 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP2040_H
+#define __MANTIS_VP2040_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_2040_DVB_C    0x0043
+#define CINERGY_C               0x1178
+#define CABLESTAR_HD2           0x0002
+
+extern struct mantis_hwconfig vp2040_config;
+
+#endif /* __MANTIS_VP2040_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp3028.c b/drivers/media/dvb/mantis/mantis_vp3028.c
new file mode 100644
index 000000000000..4155c838a18a
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp3028.c
@@ -0,0 +1,38 @@
+/*
+        Mantis VP-3028 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "mantis_common.h"
+#include "mantis_vp3028.h"
+
+struct zl10353_config mantis_vp3028_config = {
+        .demod_address  = 0x0f,
+};
+
+#define MANTIS_MODEL_NAME       "VP-3028"
+#define MANTIS_DEV_TYPE         "DVB-T"
+
+struct mantis_hwconfig vp3028_mantis_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_188,
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp3028.h b/drivers/media/dvb/mantis/mantis_vp3028.h
new file mode 100644
index 000000000000..b07be6adc522
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp3028.h
@@ -0,0 +1,33 @@
+/*
+        Mantis VP-3028 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP3028_H
+#define __MANTIS_VP3028_H
+
+#include "dvb_frontend.h"
+#include "mantis_common.h"
+#include "zl10353.h"
+
+#define MANTIS_VP_3028_DVB_T    0x0028
+
+extern struct zl10353_config mantis_vp3028_config;
+extern struct mantis_hwconfig vp3028_mantis_config;
+
+#endif /* __MANTIS_VP3028_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/dvb/mantis/mantis_vp3030.c
new file mode 100644
index 000000000000..1f4334214953
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp3030.c
@@ -0,0 +1,105 @@
+/*
+        Mantis VP-3030 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+
+#include "dmxdev.h"
+#include "dvbdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+
+#include "zl10353.h"
+#include "tda665x.h"
+#include "mantis_common.h"
+#include "mantis_ioc.h"
+#include "mantis_dvb.h"
+#include "mantis_vp3030.h"
+
+struct zl10353_config mantis_vp3030_config = {
+        .demod_address          = 0x0f,
+};
+
+struct tda665x_config env57h12d5_config = {
+        .name                   = "ENV57H12D5 (ET-50DT)",
+        .addr                   = 0x60,
+        .frequency_min          =  47000000,
+        .frequency_max          = 862000000,
+        .frequency_offst        =   3616667,
+        .ref_multiplier         = 6, /* 1/6 MHz */
+        .ref_divider            = 100000, /* 1/6 MHz */
+};
+
+#define MANTIS_MODEL_NAME       "VP-3030"
+#define MANTIS_DEV_TYPE         "DVB-T"
+
+
+static int vp3030_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
+{
+        struct i2c_adapter *adapter     = &mantis->adapter;
+        struct mantis_hwconfig *config  = mantis->hwconfig;
+        int err = 0;
+
+        gpio_set_bits(mantis, config->reset, 0);
+        msleep(100);
+        err = mantis_frontend_power(mantis, POWER_ON);
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 1);
+
+        if (err == 0) {
+                msleep(250);
+                dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
+                fe = zl10353_attach(&mantis_vp3030_config, adapter);
+
+                if (!fe)
+                        return -1;
+
+                tda665x_attach(fe, &env57h12d5_config, adapter);
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+
+        }
+        mantis->fe = fe;
+        dprintk(MANTIS_ERROR, 1, "Done!");
+
+        return 0;
+}
+
+struct mantis_hwconfig vp3030_config = {
+        .model_name     = MANTIS_MODEL_NAME,
+        .dev_type       = MANTIS_DEV_TYPE,
+        .ts_size        = MANTIS_TS_188,
+
+        .baud_rate      = MANTIS_BAUD_9600,
+        .parity         = MANTIS_PARITY_NONE,
+        .bytes          = 0,
+
+        .frontend_init  = vp3030_frontend_init,
+        .power          = GPIF_A12,
+        .reset          = GPIF_A13,
+
+        .i2c_mode       = MANTIS_BYTE_MODE
+};
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.h b/drivers/media/dvb/mantis/mantis_vp3030.h
new file mode 100644
index 000000000000..5f12c4266277
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_vp3030.h
@@ -0,0 +1,30 @@
+/*
+        Mantis VP-3030 driver
+
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __MANTIS_VP3030_H
+#define __MANTIS_VP3030_H
+
+#include "mantis_common.h"
+
+#define MANTIS_VP_3030_DVB_T    0x0024
+
+extern struct mantis_hwconfig vp3030_config;
+
+#endif /* __MANTIS_VP3030_H */
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index e930a67d526b..bd6214d4ab3b 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1815,6 +1815,8 @@ static int vidioc_qbuf(struct file *file, void *priv,
         /* put the buffer in the 'queued' queue */
         i = gspca_dev->fr_q;
         gspca_dev->fr_queue[i] = index;
+        if (gspca_dev->fr_i == i)
+                gspca_dev->cur_frame = frame;
         gspca_dev->fr_q = (i + 1) % gspca_dev->nframes;
         PDEBUG(D_FRAM, "qbuf q:%d i:%d o:%d",
                 gspca_dev->fr_q,
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index aa2f3c7e2cb5..1b536f7d30cf 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -48,6 +48,12 @@ static
                         DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
                 }
         }, {
+                .ident = "Fujitsu-Siemens Amilo Xi 2428",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2428")
+                }
+        }, {
                 .ident = "Fujitsu-Siemens Amilo Xi 2528",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 4dbb882c83dc..0a6b8f07a69d 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -1533,7 +1533,7 @@ static void setexposure_96(struct gspca_dev *gspca_dev)
 static void setsharpness_96(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        u8 val;
+        s8 val;
 
         val = sd->sharpness;
         if (val < 0) {                          /* auto */
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 4cff8035614f..0ca1c06652b1 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -2319,7 +2319,7 @@ static void do_autogain(struct gspca_dev *gspca_dev, u16 avg_lum)
                 }
         }
         if (avg_lum > MAX_AVG_LUM) {
-                if (sd->gain - 1 >= 0) {
+                if (sd->gain >= 1) {
                         sd->gain--;
                         set_gain(gspca_dev);
                 }
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
index 487d40555343..96c61926d372 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
+++ b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h
@@ -228,6 +228,7 @@ static const struct stv_init stv_bridge_init[] = {
         /* This reg is written twice. Some kind of reset? */
         {NULL,  0x1620, 0x80},
         {NULL,  0x1620, 0x00},
+        {NULL,  0x1443, 0x00},
         {NULL,  0x1423, 0x04},
         {x1500, 0x1500, ARRAY_SIZE(x1500)},
         {x1536, 0x1536, ARRAY_SIZE(x1536)},
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 716df6b15fc5..306b7d75b4aa 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -709,7 +709,7 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
                 spca504B_PollingDataReady(gspca_dev);
 
                 /* Init the cam width height with some values get on init ? */
-                reg_w_riv(gspca_dev, 0x31, 0, 0x04);
+                reg_w_riv(gspca_dev, 0x31, 0x0004, 0x00);
                 spca504B_WaitCmdStatus(gspca_dev);
                 spca504B_PollingDataReady(gspca_dev);
                 break;
@@ -807,14 +807,14 @@ static void init_ctl_reg(struct gspca_dev *gspca_dev)
         default:
 /*      case BRIDGE_SPCA533: */
 /*      case BRIDGE_SPCA504B: */
-                reg_w_riv(gspca_dev, 0, 0x00, 0x21ad);  /* hue */
-                reg_w_riv(gspca_dev, 0, 0x01, 0x21ac);  /* sat/hue */
-                reg_w_riv(gspca_dev, 0, 0x00, 0x21a3);  /* gamma */
+                reg_w_riv(gspca_dev, 0, 0x21ad, 0x00);  /* hue */
+                reg_w_riv(gspca_dev, 0, 0x21ac, 0x01);  /* sat/hue */
+                reg_w_riv(gspca_dev, 0, 0x21a3, 0x00);  /* gamma */
                 break;
         case BRIDGE_SPCA536:
-                reg_w_riv(gspca_dev, 0, 0x40, 0x20f5);
-                reg_w_riv(gspca_dev, 0, 0x01, 0x20f4);
-                reg_w_riv(gspca_dev, 0, 0x00, 0x2089);
+                reg_w_riv(gspca_dev, 0, 0x20f5, 0x40);
+                reg_w_riv(gspca_dev, 0, 0x20f4, 0x01);
+                reg_w_riv(gspca_dev, 0, 0x2089, 0x00);
                 break;
         }
         if (pollreg)
@@ -887,11 +887,11 @@ static int sd_init(struct gspca_dev *gspca_dev)
         switch (sd->bridge) {
         case BRIDGE_SPCA504B:
                 reg_w_riv(gspca_dev, 0x1d, 0x00, 0);
-                reg_w_riv(gspca_dev, 0, 0x01, 0x2306);
-                reg_w_riv(gspca_dev, 0, 0x00, 0x0d04);
-                reg_w_riv(gspca_dev, 0, 0x00, 0x2000);
-                reg_w_riv(gspca_dev, 0, 0x13, 0x2301);
-                reg_w_riv(gspca_dev, 0, 0x00, 0x2306);
+                reg_w_riv(gspca_dev, 0x00, 0x2306, 0x01);
+                reg_w_riv(gspca_dev, 0x00, 0x0d04, 0x00);
+                reg_w_riv(gspca_dev, 0x00, 0x2000, 0x00);
+                reg_w_riv(gspca_dev, 0x00, 0x2301, 0x13);
+                reg_w_riv(gspca_dev, 0x00, 0x2306, 0x00);
                 /* fall thru */
         case BRIDGE_SPCA533:
                 spca504B_PollingDataReady(gspca_dev);
@@ -1000,7 +1000,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                         spca504B_WaitCmdStatus(gspca_dev);
                         break;
                 default:
-                        reg_w_riv(gspca_dev, 0x31, 0, 0x04);
+                        reg_w_riv(gspca_dev, 0x31, 0x0004, 0x00);
                         spca504B_WaitCmdStatus(gspca_dev);
                         spca504B_PollingDataReady(gspca_dev);
                         break;
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index c090efcd8045..71921c878424 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -3009,6 +3009,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                 int l;
 
                 frame = gspca_get_i_frame(gspca_dev);
+                if (frame == NULL) {
+                        gspca_dev->last_packet_type = DISCARD_PACKET;
+                        return;
+                }
                 l = frame->data_end - frame->data;
                 if (len > frame->v4l2_buf.length - l)
                         len = frame->v4l2_buf.length - l;
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 2ba14fb5b031..c167cc3de492 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -718,7 +718,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
-        if (!res || !irq) {
+        if (!res || (int)irq <= 0) {
                 err = -ENODEV;
                 goto exit;
         }
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
index 7e42989ce0e4..805226e0d9c1 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@ -563,7 +563,7 @@ static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         struct i2c_client *client = sd->priv;
         struct rj54n1 *rj54n1 = to_rj54n1(client);
         struct v4l2_rect *rect = &a->c;
-        unsigned int dummy, output_w, output_h,
+        unsigned int dummy = 0, output_w, output_h,
                 input_w = rect->width, input_h = rect->height;
         int ret;
 
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 9f85e917f9f3..a7ad7810fddc 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -420,19 +420,6 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)
                 ctrl |= SAA7134_MAIN_CTRL_TE5;
                 irq  |= SAA7134_IRQ1_INTE_RA2_1 |
                         SAA7134_IRQ1_INTE_RA2_0;
-
-                /* dma: setup channel 5 (= TS) */
-
-                saa_writeb(SAA7134_TS_DMA0, (dev->ts.nr_packets - 1) & 0xff);
-                saa_writeb(SAA7134_TS_DMA1,
-                        ((dev->ts.nr_packets - 1) >> 8) & 0xff);
-                /* TSNOPIT=0, TSCOLAP=0 */
-                saa_writeb(SAA7134_TS_DMA2,
-                        (((dev->ts.nr_packets - 1) >> 16) & 0x3f) | 0x00);
-                saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);
-                saa_writel(SAA7134_RS_CONTROL(5), SAA7134_RS_CONTROL_BURST_16 |
-                                                  SAA7134_RS_CONTROL_ME |
-                                                  (dev->ts.pt_ts.dma >> 12));
         }
 
         /* set task conditions + field handling */
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 03488ba4c99c..b9817d74943f 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -250,6 +250,19 @@ int saa7134_ts_start(struct saa7134_dev *dev)
 
         BUG_ON(dev->ts_started);
 
+        /* dma: setup channel 5 (= TS) */
+        saa_writeb(SAA7134_TS_DMA0, (dev->ts.nr_packets - 1) & 0xff);
+        saa_writeb(SAA7134_TS_DMA1,
+                ((dev->ts.nr_packets - 1) >> 8) & 0xff);
+        /* TSNOPIT=0, TSCOLAP=0 */
+        saa_writeb(SAA7134_TS_DMA2,
+                (((dev->ts.nr_packets - 1) >> 16) & 0x3f) | 0x00);
+        saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);
+        saa_writel(SAA7134_RS_CONTROL(5), SAA7134_RS_CONTROL_BURST_16 |
+                                          SAA7134_RS_CONTROL_ME |
+                                          (dev->ts.pt_ts.dma >> 12));
+
+        /* reset hardware TS buffers */
         saa_writeb(SAA7134_TS_SERIAL1, 0x00);
         saa_writeb(SAA7134_TS_SERIAL1, 0x03);
         saa_writeb(SAA7134_TS_SERIAL1, 0x00);
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index d69363f0d8c9..f09c7140d6b2 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -1827,7 +1827,7 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
-        if (!res || !irq) {
+        if (!res || (int)irq <= 0) {
                 dev_err(&pdev->dev, "Not enough CEU platform resources.\n");
                 err = -ENODEV;
                 goto exit;
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 0469d7a876a8..ec8ef8c5560a 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1393,7 +1393,7 @@ uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity)
         size = entity->processing.bControlSize;
 
         for (i = 0; i < ARRAY_SIZE(blacklist); ++i) {
-                if (!usb_match_id(dev->intf, &blacklist[i].id))
+                if (!usb_match_one_id(dev->intf, &blacklist[i].id))
                         continue;
 
                 if (blacklist[i].index >= 8 * size ||
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index f854698c4061..ea11839cba4a 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -59,9 +59,9 @@
  *    returns immediately.
  *
  *    When the buffer is full, the completion handler removes it from the irq
- *    queue, marks it as ready (UVC_BUF_STATE_DONE) and wakes its wait queue.
+ *    queue, marks it as done (UVC_BUF_STATE_DONE) and wakes its wait queue.
  *    At that point, any process waiting on the buffer will be woken up. If a
- *    process tries to dequeue a buffer after it has been marked ready, the
+ *    process tries to dequeue a buffer after it has been marked done, the
  *    dequeing will succeed immediately.
  *
  * 2. Buffers are queued, user is waiting on a buffer and the device gets
@@ -201,6 +201,7 @@ static void __uvc_query_buffer(struct uvc_buffer *buf,
                 break;
         case UVC_BUF_STATE_QUEUED:
         case UVC_BUF_STATE_ACTIVE:
+        case UVC_BUF_STATE_READY:
                 v4l2_buf->flags |= V4L2_BUF_FLAG_QUEUED;
                 break;
         case UVC_BUF_STATE_IDLE:
@@ -295,13 +296,15 @@ static int uvc_queue_waiton(struct uvc_buffer *buf, int nonblocking)
 {
         if (nonblocking) {
                 return (buf->state != UVC_BUF_STATE_QUEUED &&
-                        buf->state != UVC_BUF_STATE_ACTIVE)
+                        buf->state != UVC_BUF_STATE_ACTIVE &&
+                        buf->state != UVC_BUF_STATE_READY)
                         ? 0 : -EAGAIN;
         }
 
         return wait_event_interruptible(buf->wait,
                 buf->state != UVC_BUF_STATE_QUEUED &&
-                buf->state != UVC_BUF_STATE_ACTIVE);
+                buf->state != UVC_BUF_STATE_ACTIVE &&
+                buf->state != UVC_BUF_STATE_READY);
 }
 
 /*
@@ -348,6 +351,7 @@ int uvc_dequeue_buffer(struct uvc_video_queue *queue,
         case UVC_BUF_STATE_IDLE:
         case UVC_BUF_STATE_QUEUED:
         case UVC_BUF_STATE_ACTIVE:
+        case UVC_BUF_STATE_READY:
         default:
                 uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer state %u "
                         "(driver bug?).\n", buf->state);
@@ -489,6 +493,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
 
         spin_lock_irqsave(&queue->irqlock, flags);
         list_del(&buf->queue);
+        buf->state = UVC_BUF_STATE_DONE;
         if (!list_empty(&queue->irqqueue))
                 nextbuf = list_first_entry(&queue->irqqueue, struct uvc_buffer,
                                            queue);
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 9a9802830d41..7dcf534a0cf3 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -441,7 +441,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,
         if (fid != stream->last_fid && buf->buf.bytesused != 0) {
                 uvc_trace(UVC_TRACE_FRAME, "Frame complete (FID bit "
                                 "toggled).\n");
-                buf->state = UVC_BUF_STATE_DONE;
+                buf->state = UVC_BUF_STATE_READY;
                 return -EAGAIN;
         }
 
@@ -470,7 +470,7 @@ static void uvc_video_decode_data(struct uvc_streaming *stream,
         /* Complete the current frame if the buffer size was exceeded. */
         if (len > maxlen) {
                 uvc_trace(UVC_TRACE_FRAME, "Frame complete (overflow).\n");
-                buf->state = UVC_BUF_STATE_DONE;
+                buf->state = UVC_BUF_STATE_READY;
         }
 }
 
@@ -482,7 +482,7 @@ static void uvc_video_decode_end(struct uvc_streaming *stream,
                 uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
                 if (data[0] == len)
                         uvc_trace(UVC_TRACE_FRAME, "EOF in empty payload.\n");
-                buf->state = UVC_BUF_STATE_DONE;
+                buf->state = UVC_BUF_STATE_READY;
                 if (stream->dev->quirks & UVC_QUIRK_STREAM_NO_FID)
                         stream->last_fid ^= UVC_STREAM_FID;
         }
@@ -568,8 +568,7 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream,
                 uvc_video_decode_end(stream, buf, mem,
                         urb->iso_frame_desc[i].actual_length);
 
-                if (buf->state == UVC_BUF_STATE_DONE ||
-                    buf->state == UVC_BUF_STATE_ERROR)
+                if (buf->state == UVC_BUF_STATE_READY)
                         buf = uvc_queue_next_buffer(&stream->queue, buf);
         }
 }
@@ -627,8 +626,7 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream,
                 if (!stream->bulk.skip_payload && buf != NULL) {
                         uvc_video_decode_end(stream, buf, stream->bulk.header,
                                 stream->bulk.payload_size);
-                        if (buf->state == UVC_BUF_STATE_DONE ||
-                            buf->state == UVC_BUF_STATE_ERROR)
+                        if (buf->state == UVC_BUF_STATE_READY)
                                 buf = uvc_queue_next_buffer(&stream->queue,
                                                             buf);
                 }
@@ -669,7 +667,7 @@ static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream,
             stream->bulk.payload_size == stream->bulk.max_payload_size) {
                 if (buf->buf.bytesused == stream->queue.buf_used) {
                         stream->queue.buf_used = 0;
-                        buf->state = UVC_BUF_STATE_DONE;
+                        buf->state = UVC_BUF_STATE_READY;
                         uvc_queue_next_buffer(&stream->queue, buf);
                         stream->last_fid ^= UVC_STREAM_FID;
                 }
@@ -924,10 +922,8 @@ static int uvc_init_video_bulk(struct uvc_streaming *stream,
 static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
 {
         struct usb_interface *intf = stream->intf;
-        struct usb_host_interface *alts;
-        struct usb_host_endpoint *ep = NULL;
-        int intfnum = stream->intfnum;
-        unsigned int bandwidth, psize, i;
+        struct usb_host_endpoint *ep;
+        unsigned int i;
         int ret;
 
         stream->last_fid = -1;
@@ -936,6 +932,12 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
         stream->bulk.payload_size = 0;
 
         if (intf->num_altsetting > 1) {
+                struct usb_host_endpoint *best_ep = NULL;
+                unsigned int best_psize = 3 * 1024;
+                unsigned int bandwidth;
+                unsigned int uninitialized_var(altsetting);
+                int intfnum = stream->intfnum;
+
                 /* Isochronous endpoint, select the alternate setting. */
                 bandwidth = stream->ctrl.dwMaxPayloadTransferSize;
 
@@ -949,6 +951,9 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
                 }
 
                 for (i = 0; i < intf->num_altsetting; ++i) {
+                        struct usb_host_interface *alts;
+                        unsigned int psize;
+
                         alts = &intf->altsetting[i];
                         ep = uvc_find_endpoint(alts,
                                 stream->header.bEndpointAddress);
@@ -958,21 +963,27 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
                         /* Check if the bandwidth is high enough. */
                         psize = le16_to_cpu(ep->desc.wMaxPacketSize);
                         psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
-                        if (psize >= bandwidth)
-                                break;
+                        if (psize >= bandwidth && psize <= best_psize) {
+                                altsetting = i;
+                                best_psize = psize;
+                                best_ep = ep;
+                        }
                 }
 
-                if (i >= intf->num_altsetting) {
+                if (best_ep == NULL) {
                         uvc_trace(UVC_TRACE_VIDEO, "No fast enough alt setting "
                                 "for requested bandwidth.\n");
                         return -EIO;
                 }
 
-                ret = usb_set_interface(stream->dev->udev, intfnum, i);
+                uvc_trace(UVC_TRACE_VIDEO, "Selecting alternate setting %u "
+                        "(%u B/frame bandwidth).\n", altsetting, best_psize);
+
+                ret = usb_set_interface(stream->dev->udev, intfnum, altsetting);
                 if (ret < 0)
                         return ret;
 
-                ret = uvc_init_video_isoc(stream, ep, gfp_flags);
+                ret = uvc_init_video_isoc(stream, best_ep, gfp_flags);
         } else {
                 /* Bulk endpoint, proceed to URB initialization. */
                 ep = uvc_find_endpoint(&intf->altsetting[0],
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 7ec9a04ced50..2337585001ea 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -365,8 +365,9 @@ enum uvc_buffer_state {
         UVC_BUF_STATE_IDLE      = 0,
         UVC_BUF_STATE_QUEUED    = 1,
         UVC_BUF_STATE_ACTIVE    = 2,
-        UVC_BUF_STATE_DONE      = 3,
-        UVC_BUF_STATE_ERROR     = 4,
+        UVC_BUF_STATE_READY     = 3,
+        UVC_BUF_STATE_DONE      = 4,
+        UVC_BUF_STATE_ERROR     = 5,
 };
 
 struct uvc_buffer {
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 85bc6a685e36..44d2037e9e56 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -4330,6 +4330,8 @@ initChainBuffers(MPT_ADAPTER *ioc)
 
         if (ioc->bus_type == SPI)
                 num_chain *= MPT_SCSI_CAN_QUEUE;
+        else if (ioc->bus_type == SAS)
+                num_chain *= MPT_SAS_CAN_QUEUE;
         else
                 num_chain *= MPT_FC_CAN_QUEUE;
 
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index ca2f2c4ff05e..e09eb4870db6 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-$(CONFIG_MFD_SM501)         += sm501.o
-obj-$(CONFIG_MFD_ASIC3)         += asic3.o
+obj-$(CONFIG_MFD_ASIC3)         += asic3.o tmio_core.o
 obj-$(CONFIG_MFD_SH_MOBILE_SDHI)                += sh_mobile_sdhi.o
 
 obj-$(CONFIG_HTC_EGPIO)         += htc-egpio.o
@@ -11,9 +11,9 @@ obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o
 
 obj-$(CONFIG_MFD_DM355EVM_MSP)  += dm355evm_msp.o
 
-obj-$(CONFIG_MFD_T7L66XB)       += t7l66xb.o
-obj-$(CONFIG_MFD_TC6387XB)      += tc6387xb.o
-obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o
+obj-$(CONFIG_MFD_T7L66XB)       += t7l66xb.o tmio_core.o
+obj-$(CONFIG_MFD_TC6387XB)      += tc6387xb.o tmio_core.o
+obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o tmio_core.o
 
 obj-$(CONFIG_MFD_WM8400)        += wm8400-core.o
 wm831x-objs                     := wm831x-core.o wm831x-irq.o wm831x-otp.o
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index e22128c3e9a8..95c1e6bd1729 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -80,6 +80,7 @@ struct asic3 {
         u16 irq_bothedge[4];
         struct gpio_chip gpio;
         struct device *dev;
+        void __iomem *tmio_cnf;
 
         struct asic3_clk clocks[ARRAY_SIZE(asic3_clk_init)];
 };
@@ -685,8 +686,24 @@ static struct mfd_cell asic3_cell_ds1wm = {
         .resources     = ds1wm_resources,
 };
 
+static void asic3_mmc_pwr(struct platform_device *pdev, int state)
+{
+        struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+        tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
+}
+
+static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
+{
+        struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+        tmio_core_mmc_clk_div(asic->tmio_cnf, 1 - asic->bus_shift, state);
+}
+
 static struct tmio_mmc_data asic3_mmc_data = {
-        .hclk = 24576000,
+        .hclk           = 24576000,
+        .set_pwr        = asic3_mmc_pwr,
+        .set_clk_div    = asic3_mmc_clk_div,
 };
 
 static struct resource asic3_mmc_resources[] = {
@@ -696,11 +713,6 @@ static struct resource asic3_mmc_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         {
-                .start = ASIC3_SD_CONFIG_BASE,
-                .end   = ASIC3_SD_CONFIG_BASE + 0x1ff,
-                .flags = IORESOURCE_MEM,
-        },
-        {
                 .start = 0,
                 .end   = 0,
                 .flags = IORESOURCE_IRQ,
@@ -743,6 +755,10 @@ static int asic3_mmc_enable(struct platform_device *pdev)
         asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
                            ASIC3_SDHWCTRL_SDPWR, 1);
 
+        /* ASIC3_SD_CTRL_BASE assumes 32-bit addressing, TMIO is 16-bit */
+        tmio_core_mmc_enable(asic->tmio_cnf, 1 - asic->bus_shift,
+                             ASIC3_SD_CTRL_BASE >> 1);
+
         return 0;
 }
 
@@ -797,10 +813,15 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
         asic3_cell_ds1wm.data_size = sizeof(asic3_cell_ds1wm);
 
         /* MMC */
+        asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +
+                                 mem_sdio->start, 0x400 >> asic->bus_shift);
+        if (!asic->tmio_cnf) {
+                ret = -ENOMEM;
+                dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");
+                goto out;
+        }
         asic3_mmc_resources[0].start >>= asic->bus_shift;
         asic3_mmc_resources[0].end   >>= asic->bus_shift;
-        asic3_mmc_resources[1].start >>= asic->bus_shift;
-        asic3_mmc_resources[1].end   >>= asic->bus_shift;
 
         asic3_cell_mmc.platform_data = &asic3_cell_mmc;
         asic3_cell_mmc.data_size = sizeof(asic3_cell_mmc);
@@ -820,7 +841,10 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
 
 static void asic3_mfd_remove(struct platform_device *pdev)
 {
+        struct asic3 *asic = platform_get_drvdata(pdev);
+
         mfd_remove_devices(&pdev->dev);
+        iounmap(asic->tmio_cnf);
 }
 
 /* Core */
diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c
index a1ade2324ea9..735c8a4d164f 100644
--- a/drivers/mfd/mc13783-core.c
+++ b/drivers/mfd/mc13783-core.c
@@ -619,6 +619,8 @@ err_revision:
         }
         /* This should go away (END) */
 
+        mc13783_unlock(mc13783);
+
         if (pdata->flags & MC13783_USE_ADC)
                 mc13783_add_subdevice(mc13783, "mc13783-adc");
 
@@ -641,8 +643,6 @@ err_revision:
         if (pdata->flags & MC13783_USE_TOUCHSCREEN)
                 mc13783_add_subdevice(mc13783, "mc13783-ts");
 
-        mc13783_unlock(mc13783);
-
         return 0;
 }
 
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 0a255c1f1ce7..bcf4687d4af5 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -38,6 +38,19 @@ enum {
         T7L66XB_CELL_MMC,
 };
 
+static const struct resource t7l66xb_mmc_resources[] = {
+        {
+                .start = 0x800,
+                .end    = 0x9ff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = IRQ_T7L66XB_MMC,
+                .end    = IRQ_T7L66XB_MMC,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
 #define SCR_REVID       0x08            /* b Revision ID        */
 #define SCR_IMR         0x42            /* b Interrupt Mask     */
 #define SCR_DEV_CTL     0xe0            /* b Device control     */
@@ -83,6 +96,9 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc)
 
         spin_unlock_irqrestore(&t7l66xb->lock, flags);
 
+        tmio_core_mmc_enable(t7l66xb->scr + 0x200, 0,
+                t7l66xb_mmc_resources[0].start & 0xfffe);
+
         return 0;
 }
 
@@ -106,28 +122,28 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)
         return 0;
 }
 
+static void t7l66xb_mmc_pwr(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_pwr(t7l66xb->scr + 0x200, 0, state);
+}
+
+static void t7l66xb_mmc_clk_div(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_clk_div(t7l66xb->scr + 0x200, 0, state);
+}
+
 /*--------------------------------------------------------------------------*/
 
 static struct tmio_mmc_data t7166xb_mmc_data = {
         .hclk = 24000000,
-};
-
-static const struct resource t7l66xb_mmc_resources[] = {
-        {
-                .start = 0x800,
-                .end    = 0x9ff,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = 0x200,
-                .end    = 0x2ff,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = IRQ_T7L66XB_MMC,
-                .end    = IRQ_T7L66XB_MMC,
-                .flags = IORESOURCE_IRQ,
-        },
+        .set_pwr = t7l66xb_mmc_pwr,
+        .set_clk_div = t7l66xb_mmc_clk_div,
 };
 
 static const struct resource t7l66xb_nand_resources[] = {
@@ -282,6 +298,9 @@ static int t7l66xb_resume(struct platform_device *dev)
         if (pdata && pdata->resume)
                 pdata->resume(dev);
 
+        tmio_core_mmc_enable(t7l66xb->scr + 0x200, 0,
+                t7l66xb_mmc_resources[0].start & 0xfffe);
+
         return 0;
 }
 #else
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 3280ab33f88a..5c7f04343d5c 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -22,28 +22,52 @@ enum {
         TC6387XB_CELL_MMC,
 };
 
+struct tc6387xb {
+        void __iomem *scr;
+        struct clk *clk32k;
+        struct resource rscr;
+};
+
+static struct resource tc6387xb_mmc_resources[] = {
+        {
+                .start = 0x800,
+                .end   = 0x9ff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0,
+                .end   = 0,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+/*--------------------------------------------------------------------------*/
+
 #ifdef CONFIG_PM
 static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct clk *clk32k = platform_get_drvdata(dev);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
         struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
 
         if (pdata && pdata->suspend)
                 pdata->suspend(dev);
-        clk_disable(clk32k);
+        clk_disable(tc6387xb->clk32k);
 
         return 0;
 }
 
 static int tc6387xb_resume(struct platform_device *dev)
 {
-        struct clk *clk32k = platform_get_drvdata(dev);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
         struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
 
-        clk_enable(clk32k);
+        clk_enable(tc6387xb->clk32k);
         if (pdata && pdata->resume)
                 pdata->resume(dev);
 
+        tmio_core_mmc_resume(tc6387xb->scr + 0x200, 0,
+                tc6387xb_mmc_resources[0].start & 0xfffe);
+
         return 0;
 }
 #else
@@ -53,12 +77,32 @@ static int tc6387xb_resume(struct platform_device *dev)
 
 /*--------------------------------------------------------------------------*/
 
+static void tc6387xb_mmc_pwr(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_pwr(tc6387xb->scr + 0x200, 0, state);
+}
+
+static void tc6387xb_mmc_clk_div(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_clk_div(tc6387xb->scr + 0x200, 0, state);
+}
+
+
 static int tc6387xb_mmc_enable(struct platform_device *mmc)
 {
         struct platform_device *dev      = to_platform_device(mmc->dev.parent);
-        struct clk *clk32k = platform_get_drvdata(dev);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
 
-        clk_enable(clk32k);
+        clk_enable(tc6387xb->clk32k);
+
+        tmio_core_mmc_enable(tc6387xb->scr + 0x200, 0,
+                tc6387xb_mmc_resources[0].start & 0xfffe);
 
         return 0;
 }
@@ -66,36 +110,20 @@ static int tc6387xb_mmc_enable(struct platform_device *mmc)
 static int tc6387xb_mmc_disable(struct platform_device *mmc)
 {
         struct platform_device *dev      = to_platform_device(mmc->dev.parent);
-        struct clk *clk32k = platform_get_drvdata(dev);
+        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
 
-        clk_disable(clk32k);
+        clk_disable(tc6387xb->clk32k);
 
         return 0;
 }
 
-/*--------------------------------------------------------------------------*/
-
 static struct tmio_mmc_data tc6387xb_mmc_data = {
         .hclk = 24000000,
+        .set_pwr = tc6387xb_mmc_pwr,
+        .set_clk_div = tc6387xb_mmc_clk_div,
 };
 
-static struct resource tc6387xb_mmc_resources[] = {
-        {
-                .start = 0x800,
-                .end   = 0x9ff,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = 0x200,
-                .end   = 0x2ff,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = 0,
-                .end   = 0,
-                .flags = IORESOURCE_IRQ,
-        },
-};
+/*--------------------------------------------------------------------------*/
 
 static struct mfd_cell tc6387xb_cells[] = {
         [TC6387XB_CELL_MMC] = {
@@ -111,8 +139,9 @@ static struct mfd_cell tc6387xb_cells[] = {
 static int tc6387xb_probe(struct platform_device *dev)
 {
         struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
-        struct resource *iomem;
+        struct resource *iomem, *rscr;
         struct clk *clk32k;
+        struct tc6387xb *tc6387xb;
         int irq, ret;
 
         iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
@@ -120,18 +149,40 @@ static int tc6387xb_probe(struct platform_device *dev)
                 return -EINVAL;
         }
 
+        tc6387xb = kzalloc(sizeof *tc6387xb, GFP_KERNEL);
+        if (!tc6387xb)
+                return -ENOMEM;
+
         ret  = platform_get_irq(dev, 0);
         if (ret >= 0)
                 irq = ret;
         else
-                goto err_resource;
+                goto err_no_irq;
 
         clk32k = clk_get(&dev->dev, "CLK_CK32K");
         if (IS_ERR(clk32k)) {
                 ret = PTR_ERR(clk32k);
+                goto err_no_clk;
+        }
+
+        rscr = &tc6387xb->rscr;
+        rscr->name = "tc6387xb-core";
+        rscr->start = iomem->start;
+        rscr->end = iomem->start + 0xff;
+        rscr->flags = IORESOURCE_MEM;
+
+        ret = request_resource(iomem, rscr);
+        if (ret)
                 goto err_resource;
+
+        tc6387xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1);
+        if (!tc6387xb->scr) {
+                ret = -ENOMEM;
+                goto err_ioremap;
         }
-        platform_set_drvdata(dev, clk32k);
+
+        tc6387xb->clk32k = clk32k;
+        platform_set_drvdata(dev, tc6387xb);
 
         if (pdata && pdata->enable)
                 pdata->enable(dev);
@@ -149,8 +200,13 @@ static int tc6387xb_probe(struct platform_device *dev)
         if (!ret)
                 return 0;
 
-        clk_put(clk32k);
+err_ioremap:
+        release_resource(&tc6387xb->rscr);
 err_resource:
+        clk_put(clk32k);
+err_no_clk:
+err_no_irq:
+        kfree(tc6387xb);
         return ret;
 }
 
@@ -195,3 +251,4 @@ MODULE_DESCRIPTION("Toshiba TC6387XB core driver");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Ian Molton");
 MODULE_ALIAS("platform:tc6387xb");
+
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 1429a7341a9a..4bc5a08a2b09 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -136,10 +136,6 @@ static int tc6393xb_nand_enable(struct platform_device *nand)
         return 0;
 }
 
-static struct tmio_mmc_data tc6393xb_mmc_data = {
-        .hclk = 24000000,
-};
-
 static struct resource __devinitdata tc6393xb_nand_resources[] = {
         {
                 .start  = 0x1000,
@@ -165,11 +161,6 @@ static struct resource __devinitdata tc6393xb_mmc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = 0x200,
-                .end    = 0x2ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        {
                 .start  = IRQ_TC6393_MMC,
                 .end    = IRQ_TC6393_MMC,
                 .flags  = IORESOURCE_IRQ,
@@ -346,6 +337,50 @@ int tc6393xb_lcd_mode(struct platform_device *fb,
 }
 EXPORT_SYMBOL(tc6393xb_lcd_mode);
 
+static int tc6393xb_mmc_enable(struct platform_device *mmc)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_enable(tc6393xb->scr + 0x200, 0,
+                tc6393xb_mmc_resources[0].start & 0xfffe);
+
+        return 0;
+}
+
+static int tc6393xb_mmc_resume(struct platform_device *mmc)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_resume(tc6393xb->scr + 0x200, 0,
+                tc6393xb_mmc_resources[0].start & 0xfffe);
+
+        return 0;
+}
+
+static void tc6393xb_mmc_pwr(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_pwr(tc6393xb->scr + 0x200, 0, state);
+}
+
+static void tc6393xb_mmc_clk_div(struct platform_device *mmc, int state)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+        tmio_core_mmc_clk_div(tc6393xb->scr + 0x200, 0, state);
+}
+
+static struct tmio_mmc_data tc6393xb_mmc_data = {
+        .hclk = 24000000,
+        .set_pwr = tc6393xb_mmc_pwr,
+        .set_clk_div = tc6393xb_mmc_clk_div,
+};
+
 static struct mfd_cell __devinitdata tc6393xb_cells[] = {
         [TC6393XB_CELL_NAND] = {
                 .name = "tmio-nand",
@@ -355,6 +390,8 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
         },
         [TC6393XB_CELL_MMC] = {
                 .name = "tmio-mmc",
+                .enable = tc6393xb_mmc_enable,
+                .resume = tc6393xb_mmc_resume,
                 .driver_data = &tc6393xb_mmc_data,
                 .num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),
                 .resources = tc6393xb_mmc_resources,
@@ -836,3 +873,4 @@ MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Ian Molton, Dmitry Baryshkov and Dirk Opfer");
 MODULE_DESCRIPTION("tc6393xb Toshiba Mobile IO Controller");
 MODULE_ALIAS("platform:tc6393xb");
+
diff --git a/drivers/mfd/tmio_core.c b/drivers/mfd/tmio_core.c
new file mode 100644
index 000000000000..eddc19ae464b
--- /dev/null
+++ b/drivers/mfd/tmio_core.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright(c) 2009 Ian Molton <spyro@f2s.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mfd/tmio.h>
+
+int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base)
+{
+        /* Enable the MMC/SD Control registers */
+        sd_config_write16(cnf, shift, CNF_CMD, SDCREN);
+        sd_config_write32(cnf, shift, CNF_CTL_BASE, base & 0xfffe);
+
+        /* Disable SD power during suspend */
+        sd_config_write8(cnf, shift, CNF_PWR_CTL_3, 0x01);
+
+        /* The below is required but why? FIXME */
+        sd_config_write8(cnf, shift, CNF_STOP_CLK_CTL, 0x1f);
+
+        /* Power down SD bus */
+        sd_config_write8(cnf, shift, CNF_PWR_CTL_2, 0x00);
+
+        return 0;
+}
+EXPORT_SYMBOL(tmio_core_mmc_enable);
+
+int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base)
+{
+
+        /* Enable the MMC/SD Control registers */
+        sd_config_write16(cnf, shift, CNF_CMD, SDCREN);
+        sd_config_write32(cnf, shift, CNF_CTL_BASE, base & 0xfffe);
+
+        return 0;
+}
+EXPORT_SYMBOL(tmio_core_mmc_resume);
+
+void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state)
+{
+        sd_config_write8(cnf, shift, CNF_PWR_CTL_2, state ? 0x02 : 0x00);
+}
+EXPORT_SYMBOL(tmio_core_mmc_pwr);
+
+void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state)
+{
+        sd_config_write8(cnf, shift, CNF_SD_CLK_MODE, state ? 1 : 0);
+}
+EXPORT_SYMBOL(tmio_core_mmc_clk_div);
+
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index 8485a7018060..9a970bd68775 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -134,8 +134,7 @@ static inline int is_reg_locked(struct wm8350 *wm8350, u8 reg)
             wm8350->reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY)
                 return 0;
 
-        if ((reg == WM8350_GPIO_CONFIGURATION_I_O) ||
-            (reg >= WM8350_GPIO_FUNCTION_SELECT_1 &&
+        if ((reg >= WM8350_GPIO_FUNCTION_SELECT_1 &&
              reg <= WM8350_GPIO_FUNCTION_SELECT_4) ||
             (reg >= WM8350_BATTERY_CHARGER_CONTROL_1 &&
              reg <= WM8350_BATTERY_CHARGER_CONTROL_3))
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index c8df547c4747..9025f29e2707 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -434,7 +434,7 @@ int wm8350_register_irq(struct wm8350 *wm8350, int irq,
                         irq_handler_t handler, unsigned long flags,
                         const char *name, void *data)
 {
-        if (irq < 0 || irq > WM8350_NUM_IRQ || !handler)
+        if (irq < 0 || irq >= WM8350_NUM_IRQ || !handler)
                 return -EINVAL;
 
         if (wm8350->irq[irq].handler)
@@ -453,7 +453,7 @@ EXPORT_SYMBOL_GPL(wm8350_register_irq);
 
 int wm8350_free_irq(struct wm8350 *wm8350, int irq)
 {
-        if (irq < 0 || irq > WM8350_NUM_IRQ)
+        if (irq < 0 || irq >= WM8350_NUM_IRQ)
                 return -EINVAL;
 
         wm8350_mask_irq(wm8350, irq);
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 85f0e8cd875b..1f552c6e7579 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -85,7 +85,14 @@ static void mmc_blk_put(struct mmc_blk_data *md)
         mutex_lock(&open_lock);
         md->usage--;
         if (md->usage == 0) {
+                int devmaj = MAJOR(disk_devt(md->disk));
                 int devidx = MINOR(disk_devt(md->disk)) >> MMC_SHIFT;
+
+                if (!devmaj)
+                        devidx = md->disk->first_minor >> MMC_SHIFT;
+
+                blk_cleanup_queue(md->queue.queue);
+
                 __clear_bit(devidx, dev_use);
 
                 put_disk(md->disk);
@@ -613,6 +620,7 @@ static int mmc_blk_probe(struct mmc_card *card)
         return 0;
 
  out:
+        mmc_cleanup_queue(&md->queue);
         mmc_blk_put(md);
 
         return err;
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 49e582356c65..c5a7a855f4b1 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -90,9 +90,10 @@ static void mmc_request(struct request_queue *q)
         struct request *req;
 
         if (!mq) {
-                printk(KERN_ERR "MMC: killing requests for dead queue\n");
-                while ((req = blk_fetch_request(q)) != NULL)
+                while ((req = blk_fetch_request(q)) != NULL) {
+                        req->cmd_flags |= REQ_QUIET;
                         __blk_end_request_all(req, -EIO);
+                }
                 return;
         }
 
@@ -223,17 +224,18 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
         struct request_queue *q = mq->queue;
         unsigned long flags;
 
-        /* Mark that we should start throwing out stragglers */
-        spin_lock_irqsave(q->queue_lock, flags);
-        q->queuedata = NULL;
-        spin_unlock_irqrestore(q->queue_lock, flags);
-
         /* Make sure the queue isn't suspended, as that will deadlock */
         mmc_queue_resume(mq);
 
         /* Then terminate our worker thread */
         kthread_stop(mq->thread);
 
+        /* Empty the queue */
+        spin_lock_irqsave(q->queue_lock, flags);
+        q->queuedata = NULL;
+        blk_start_queue(q);
+        spin_unlock_irqrestore(q->queue_lock, flags);
+
         if (mq->bounce_sg)
                 kfree(mq->bounce_sg);
         mq->bounce_sg = NULL;
@@ -245,8 +247,6 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
                 kfree(mq->bounce_buf);
         mq->bounce_buf = NULL;
 
-        blk_cleanup_queue(mq->queue);
-
         mq->card = NULL;
 }
 EXPORT_SYMBOL(mmc_cleanup_queue);
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c11189446a1f..0eac6c814904 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -207,7 +207,7 @@ static int mmc_read_ext_csd(struct mmc_card *card)
         }
 
         card->ext_csd.rev = ext_csd[EXT_CSD_REV];
-        if (card->ext_csd.rev > 3) {
+        if (card->ext_csd.rev > 5) {
                 printk(KERN_ERR "%s: unrecognised EXT_CSD structure "
                         "version %d\n", mmc_hostname(card->host),
                         card->ext_csd.rev);
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 7cccc8523747..e22c3fa3516a 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -46,7 +46,9 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock)
                 clk |= 0x100;
         }
 
-        sd_config_write8(host, CNF_SD_CLK_MODE, clk >> 22);
+        if (host->set_clk_div)
+                host->set_clk_div(host->pdev, (clk>>22) & 1);
+
         sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & 0x1ff);
 }
 
@@ -427,12 +429,13 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         /* Power sequence - OFF -> ON -> UP */
         switch (ios->power_mode) {
         case MMC_POWER_OFF: /* power down SD bus */
-                sd_config_write8(host, CNF_PWR_CTL_2, 0x00);
+                if (host->set_pwr)
+                        host->set_pwr(host->pdev, 0);
                 tmio_mmc_clk_stop(host);
                 break;
         case MMC_POWER_ON: /* power up SD bus */
-
-                sd_config_write8(host, CNF_PWR_CTL_2, 0x02);
+                if (host->set_pwr)
+                        host->set_pwr(host->pdev, 1);
                 break;
         case MMC_POWER_UP: /* start bus clock */
                 tmio_mmc_clk_start(host);
@@ -485,21 +488,15 @@ static int tmio_mmc_resume(struct platform_device *dev)
 {
         struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
         struct mmc_host *mmc = platform_get_drvdata(dev);
-        struct tmio_mmc_host *host = mmc_priv(mmc);
         int ret = 0;
 
         /* Tell the MFD core we are ready to be enabled */
-        if (cell->enable) {
-                ret = cell->enable(dev);
+        if (cell->resume) {
+                ret = cell->resume(dev);
                 if (ret)
                         goto out;
         }
 
-        /* Enable the MMC/SD Control registers */
-        sd_config_write16(host, CNF_CMD, SDCREN);
-        sd_config_write32(host, CNF_CTL_BASE,
-                (dev->resource[0].start >> host->bus_shift) & 0xfffe);
-
         mmc_resume_host(mmc);
 
 out:
@@ -514,17 +511,16 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
 {
         struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
         struct tmio_mmc_data *pdata;
-        struct resource *res_ctl, *res_cnf;
+        struct resource *res_ctl;
         struct tmio_mmc_host *host;
         struct mmc_host *mmc;
         int ret = -EINVAL;
 
-        if (dev->num_resources != 3)
+        if (dev->num_resources != 2)
                 goto out;
 
         res_ctl = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        res_cnf = platform_get_resource(dev, IORESOURCE_MEM, 1);
-        if (!res_ctl || !res_cnf)
+        if (!res_ctl)
                 goto out;
 
         pdata = cell->driver_data;
@@ -539,8 +535,12 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
 
         host = mmc_priv(mmc);
         host->mmc = mmc;
+        host->pdev = dev;
         platform_set_drvdata(dev, mmc);
 
+        host->set_pwr = pdata->set_pwr;
+        host->set_clk_div = pdata->set_clk_div;
+
         /* SD control register space size is 0x200, 0x400 for bus_shift=1 */
         host->bus_shift = resource_size(res_ctl) >> 10;
 
@@ -548,10 +548,6 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
         if (!host->ctl)
                 goto host_free;
 
-        host->cnf = ioremap(res_cnf->start, resource_size(res_cnf));
-        if (!host->cnf)
-                goto unmap_ctl;
-
         mmc->ops = &tmio_mmc_ops;
         mmc->caps = MMC_CAP_4_BIT_DATA;
         mmc->f_max = pdata->hclk;
@@ -562,23 +558,9 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
         if (cell->enable) {
                 ret = cell->enable(dev);
                 if (ret)
-                        goto unmap_cnf;
+                        goto unmap_ctl;
         }
 
-        /* Enable the MMC/SD Control registers */
-        sd_config_write16(host, CNF_CMD, SDCREN);
-        sd_config_write32(host, CNF_CTL_BASE,
-                (dev->resource[0].start >> host->bus_shift) & 0xfffe);
-
-        /* Disable SD power during suspend */
-        sd_config_write8(host, CNF_PWR_CTL_3, 0x01);
-
-        /* The below is required but why? FIXME */
-        sd_config_write8(host, CNF_STOP_CLK_CTL, 0x1f);
-
-        /* Power down SD bus*/
-        sd_config_write8(host, CNF_PWR_CTL_2, 0x00);
-
         tmio_mmc_clk_stop(host);
         reset(host);
 
@@ -586,14 +568,14 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
         if (ret >= 0)
                 host->irq = ret;
         else
-                goto unmap_cnf;
+                goto unmap_ctl;
 
         disable_mmc_irqs(host, TMIO_MASK_ALL);
 
         ret = request_irq(host->irq, tmio_mmc_irq, IRQF_DISABLED |
                 IRQF_TRIGGER_FALLING, dev_name(&dev->dev), host);
         if (ret)
-                goto unmap_cnf;
+                goto unmap_ctl;
 
         mmc_add_host(mmc);
 
@@ -605,8 +587,6 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
 
         return 0;
 
-unmap_cnf:
-        iounmap(host->cnf);
 unmap_ctl:
         iounmap(host->ctl);
 host_free:
@@ -626,7 +606,6 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
                 mmc_remove_host(mmc);
                 free_irq(host->irq, host);
                 iounmap(host->ctl);
-                iounmap(host->cnf);
                 mmc_free_host(mmc);
         }
 
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 9fa998594974..692dc23363b9 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -11,26 +11,6 @@
 
 #include <linux/highmem.h>
 
-#define CNF_CMD     0x04
-#define CNF_CTL_BASE   0x10
-#define CNF_INT_PIN  0x3d
-#define CNF_STOP_CLK_CTL 0x40
-#define CNF_GCLK_CTL 0x41
-#define CNF_SD_CLK_MODE 0x42
-#define CNF_PIN_STATUS 0x44
-#define CNF_PWR_CTL_1 0x48
-#define CNF_PWR_CTL_2 0x49
-#define CNF_PWR_CTL_3 0x4a
-#define CNF_CARD_DETECT_MODE 0x4c
-#define CNF_SD_SLOT 0x50
-#define CNF_EXT_GCLK_CTL_1 0xf0
-#define CNF_EXT_GCLK_CTL_2 0xf1
-#define CNF_EXT_GCLK_CTL_3 0xf9
-#define CNF_SD_LED_EN_1 0xfa
-#define CNF_SD_LED_EN_2 0xfe
-
-#define   SDCREN 0x2   /* Enable access to MMC CTL regs. (flag in COMMAND_REG)*/
-
 #define CTL_SD_CMD 0x00
 #define CTL_ARG_REG 0x04
 #define CTL_STOP_INTERNAL_ACTION 0x08
@@ -110,7 +90,6 @@
 
 
 struct tmio_mmc_host {
-        void __iomem *cnf;
         void __iomem *ctl;
         unsigned long bus_shift;
         struct mmc_command      *cmd;
@@ -119,10 +98,16 @@ struct tmio_mmc_host {
         struct mmc_host         *mmc;
         int                     irq;
 
+        /* Callbacks for clock / power control */
+        void (*set_pwr)(struct platform_device *host, int state);
+        void (*set_clk_div)(struct platform_device *host, int state);
+
         /* pio related stuff */
         struct scatterlist      *sg_ptr;
         unsigned int            sg_len;
         unsigned int            sg_off;
+
+        struct platform_device *pdev;
 };
 
 #include <linux/io.h>
@@ -163,25 +148,6 @@ static inline void sd_ctrl_write32(struct tmio_mmc_host *host, int addr,
         writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift));
 }
 
-static inline void sd_config_write8(struct tmio_mmc_host *host, int addr,
-                u8 val)
-{
-        writeb(val, host->cnf + (addr << host->bus_shift));
-}
-
-static inline void sd_config_write16(struct tmio_mmc_host *host, int addr,
-                u16 val)
-{
-        writew(val, host->cnf + (addr << host->bus_shift));
-}
-
-static inline void sd_config_write32(struct tmio_mmc_host *host, int addr,
-                u32 val)
-{
-        writew(val, host->cnf + (addr << host->bus_shift));
-        writew(val >> 16, host->cnf + ((addr + 2) << host->bus_shift));
-}
-
 #include <linux/scatterlist.h>
 #include <linux/blkdev.h>
 
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 4c364d44ad59..2de0cc823d60 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -549,4 +549,21 @@ config MTD_VMU
           To build this as a module select M here, the module will be called
           vmu-flash.
 
+config MTD_PISMO
+        tristate "MTD discovery driver for PISMO modules"
+        depends on I2C
+        depends on ARCH_VERSATILE
+        help
+          This driver allows for discovery of PISMO modules - see
+          <http://www.pismoworld.org/>.  These are small modules containing
+          up to five memory devices (eg, SRAM, flash, DOC) described by an
+          I2C EEPROM.
+
+          This driver does not create any MTD maps itself; instead it
+          creates MTD physmap and MTD SRAM platform devices.  If you
+          enable this option, you should consider enabling MTD_PHYSMAP
+          and/or MTD_PLATRAM according to the devices on your module.
+
+          When built as a module, it will be called pismo.ko
+
 endmenu
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
new file mode 100644
index 000000000000..c48cad271f5d
--- /dev/null
+++ b/drivers/mtd/maps/pismo.c
@@ -0,0 +1,320 @@
+/*
+ * PISMO memory driver - http://www.pismoworld.org/
+ *
+ * For ARM Realview and Versatile platforms
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/plat-ram.h>
+#include <linux/mtd/pismo.h>
+
+#define PISMO_NUM_CS    5
+
+struct pismo_cs_block {
+        u8      type;
+        u8      width;
+        __le16  access;
+        __le32  size;
+        u32     reserved[2];
+        char    device[32];
+} __packed;
+
+struct pismo_eeprom {
+        struct pismo_cs_block cs[PISMO_NUM_CS];
+        char    board[15];
+        u8      sum;
+} __packed;
+
+struct pismo_mem {
+        phys_addr_t base;
+        u32     size;
+        u16     access;
+        u8      width;
+        u8      type;
+};
+
+struct pismo_data {
+        struct i2c_client       *client;
+        void                    (*vpp)(void *, int);
+        void                    *vpp_data;
+        struct platform_device  *dev[PISMO_NUM_CS];
+};
+
+/* FIXME: set_vpp could do with a better calling convention */
+static struct pismo_data *vpp_pismo;
+static DEFINE_MUTEX(pismo_mutex);
+
+static int pismo_setvpp_probe_fix(struct pismo_data *pismo)
+{
+        mutex_lock(&pismo_mutex);
+        if (vpp_pismo) {
+                mutex_unlock(&pismo_mutex);
+                kfree(pismo);
+                return -EBUSY;
+        }
+        vpp_pismo = pismo;
+        mutex_unlock(&pismo_mutex);
+        return 0;
+}
+
+static void pismo_setvpp_remove_fix(struct pismo_data *pismo)
+{
+        mutex_lock(&pismo_mutex);
+        if (vpp_pismo == pismo)
+                vpp_pismo = NULL;
+        mutex_unlock(&pismo_mutex);
+}
+
+static void pismo_set_vpp(struct map_info *map, int on)
+{
+        struct pismo_data *pismo = vpp_pismo;
+
+        pismo->vpp(pismo->vpp_data, on);
+}
+/* end of hack */
+
+
+static unsigned int __devinit pismo_width_to_bytes(unsigned int width)
+{
+        width &= 15;
+        if (width > 2)
+                return 0;
+        return 1 << width;
+}
+
+static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf,
+        u8 addr, size_t size)
+{
+        int ret;
+        struct i2c_msg msg[] = {
+                {
+                        .addr = client->addr,
+                        .len = sizeof(addr),
+                        .buf = &addr,
+                }, {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = size,
+                        .buf = buf,
+                },
+        };
+
+        ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
+
+        return ret == ARRAY_SIZE(msg) ? size : -EIO;
+}
+
+static int __devinit pismo_add_device(struct pismo_data *pismo, int i,
+        struct pismo_mem *region, const char *name, void *pdata, size_t psize)
+{
+        struct platform_device *dev;
+        struct resource res = { };
+        phys_addr_t base = region.base;
+        int ret;
+
+        if (base == ~0)
+                return -ENXIO;
+
+        res.start = base;
+        res.end = base + region->size - 1;
+        res.flags = IORESOURCE_MEM;
+
+        dev = platform_device_alloc(name, i);
+        if (!dev)
+                return -ENOMEM;
+        dev->dev.parent = &pismo->client->dev;
+
+        do {
+                ret = platform_device_add_resources(dev, &res, 1);
+                if (ret)
+                        break;
+
+                ret = platform_device_add_data(dev, pdata, psize);
+                if (ret)
+                        break;
+
+                ret = platform_device_add(dev);
+                if (ret)
+                        break;
+
+                pismo->dev[i] = dev;
+                return 0;
+        } while (0);
+
+        platform_device_put(dev);
+        return ret;
+}
+
+static int __devinit pismo_add_nor(struct pismo_data *pismo, int i,
+        struct pismo_mem *region)
+{
+        struct physmap_flash_data data = {
+                .width = region->width,
+        };
+
+        if (pismo->vpp)
+                data.set_vpp = pismo_set_vpp;
+
+        return pismo_add_device(pismo, i, region, "physmap-flash",
+                &data, sizeof(data));
+}
+
+static int __devinit pismo_add_sram(struct pismo_data *pismo, int i,
+        struct pismo_mem *region)
+{
+        struct platdata_mtd_ram data = {
+                .bankwidth = region->width,
+        };
+
+        return pismo_add_device(pismo, i, region, "mtd-ram",
+                &data, sizeof(data));
+}
+
+static void __devinit pismo_add_one(struct pismo_data *pismo, int i,
+        const struct pismo_cs_block *cs, phys_addr_t base)
+{
+        struct device *dev = &pismo->client->dev;
+        struct pismo_mem region;
+
+        region.base = base;
+        region.type = cs->type;
+        region.width = pismo_width_to_bytes(cs->width);
+        region.access = le16_to_cpu(cs->access);
+        region.size = le32_to_cpu(cs->size);
+
+        if (region.width == 0) {
+                dev_err(dev, "cs%u: bad width: %02x, ignoring\n", i, cs->width);
+                return;
+        }
+
+        /*
+         * FIXME: may need to the platforms memory controller here, but at
+         * the moment we assume that it has already been correctly setup.
+         * The memory controller can also tell us the base address as well.
+         */
+
+        dev_info(dev, "cs%u: %.32s: type %02x access %u00ps size %uK\n",
+                i, cs->device, region.type, region.access, region.size / 1024);
+
+        switch (region.type) {
+        case 0:
+                break;
+        case 1:
+                /* static DOC */
+                break;
+        case 2:
+                /* static NOR */
+                pismo_add_nor(pismo, i, &region);
+                break;
+        case 3:
+                /* static RAM */
+                pismo_add_sram(pismo, i, &region);
+                break;
+        }
+}
+
+static int __devexit pismo_remove(struct i2c_client *client)
+{
+        struct pismo_data *pismo = i2c_get_clientdata(client);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pismo->dev); i++)
+                platform_device_unregister(pismo->dev[i]);
+
+        /* FIXME: set_vpp needs saner arguments */
+        pismo_setvpp_remove_fix(pismo);
+
+        kfree(pismo);
+
+        return 0;
+}
+
+static int __devinit pismo_probe(struct i2c_client *client,
+                                 const struct i2c_device_id *id)
+{
+        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+        struct pismo_pdata *pdata = client->dev.platform_data;
+        struct pismo_eeprom eeprom;
+        struct pismo_data *pismo;
+        int ret, i;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "functionality mismatch\n");
+                return -EIO;
+        }
+
+        pismo = kzalloc(sizeof(*pismo), GFP_KERNEL);
+        if (!pismo)
+                return -ENOMEM;
+
+        /* FIXME: set_vpp needs saner arguments */
+        ret = pismo_setvpp_probe_fix(pismo);
+        if (ret)
+                return ret;
+
+        pismo->client = client;
+        if (pdata) {
+                pismo->vpp = pdata->set_vpp;
+                pismo->vpp_data = pdata->vpp_data;
+        }
+        i2c_set_clientdata(client, pismo);
+
+        ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom));
+        if (ret < 0) {
+                dev_err(&client->dev, "error reading EEPROM: %d\n", ret);
+                return ret;
+        }
+
+        dev_info(&client->dev, "%.15s board found\n", eeprom.board);
+
+        for (i = 0; i < ARRAY_SIZE(eeprom.cs); i++)
+                if (eeprom.cs[i].type != 0xff)
+                        pismo_add_one(pismo, i, &eeprom.cs[i],
+                                      pdata->cs_addrs[i]);
+
+        return 0;
+}
+
+static const struct i2c_device_id pismo_id[] = {
+        { "pismo" },
+        { },
+};
+MODULE_DEVICE_TABLE(i2c, pismo_id);
+
+static struct i2c_driver pismo_driver = {
+        .driver = {
+                .name   = "pismo",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pismo_probe,
+        .remove         = __devexit_p(pismo_remove),
+        .id_table       = pismo_id,
+};
+
+static int __init pismo_init(void)
+{
+        BUILD_BUG_ON(sizeof(struct pismo_cs_block) != 48);
+        BUILD_BUG_ON(sizeof(struct pismo_eeprom) != 256);
+
+        return i2c_add_driver(&pismo_driver);
+}
+module_init(pismo_init);
+
+static void __exit pismo_exit(void)
+{
+        i2c_del_driver(&pismo_driver);
+}
+module_exit(pismo_exit);
+
+MODULE_AUTHOR("Russell King <linux@arm.linux.org.uk>");
+MODULE_DESCRIPTION("PISMO memory driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index a714ec482761..92e12df0917f 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -322,7 +322,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
         memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
 
         /* Panics must be written immediately */
-        if (reason == KMSG_DUMP_PANIC) {
+        if (reason != KMSG_DUMP_OOPS) {
                 if (!cxt->mtd->panic_write)
                         printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
                 else
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 79fc4530987b..25c5dd03a837 100644
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -147,6 +147,10 @@ static int scan_for_bad_eraseblocks(void)
         }
         memset(bbt, 0 , ebcnt);
 
+        /* NOR flash does not implement block_isbad */
+        if (mtd->block_isbad == NULL)
+                return 0;
+
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -184,7 +188,7 @@ static int __init mtd_readtest_init(void)
         tmp = mtd->size;
         do_div(tmp, mtd->erasesize);
         ebcnt = tmp;
-        pgcnt = mtd->erasesize / mtd->writesize;
+        pgcnt = mtd->erasesize / pgsize;
 
         printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "
                "page size %u, count of eraseblocks %u, pages per "
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 141363a7e805..7fbb51d4eabe 100644
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -301,6 +301,10 @@ static int scan_for_bad_eraseblocks(void)
         }
         memset(bbt, 0 , ebcnt);
 
+        /* NOR flash does not implement block_isbad */
+        if (mtd->block_isbad == NULL)
+                goto out;
+
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -309,6 +313,7 @@ static int scan_for_bad_eraseblocks(void)
                 cond_resched();
         }
         printk(PRINT_PREF "scanned %d eraseblocks, %d are bad\n", i, bad);
+out:
         goodebcnt = ebcnt - bad;
         return 0;
 }
@@ -340,7 +345,7 @@ static int __init mtd_speedtest_init(void)
         tmp = mtd->size;
         do_div(tmp, mtd->erasesize);
         ebcnt = tmp;
-        pgcnt = mtd->erasesize / mtd->writesize;
+        pgcnt = mtd->erasesize / pgsize;
 
         printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "
                "page size %u, count of eraseblocks %u, pages per "
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 63920476b57a..a99d3cd737d8 100644
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -227,6 +227,10 @@ static int scan_for_bad_eraseblocks(void)
         }
         memset(bbt, 0 , ebcnt);
 
+        /* NOR flash does not implement block_isbad */
+        if (mtd->block_isbad == NULL)
+                return 0;
+
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -265,7 +269,7 @@ static int __init mtd_stresstest_init(void)
         tmp = mtd->size;
         do_div(tmp, mtd->erasesize);
         ebcnt = tmp;
-        pgcnt = mtd->erasesize / mtd->writesize;
+        pgcnt = mtd->erasesize / pgsize;
 
         printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "
                "page size %u, count of eraseblocks %u, pages per "
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index f237ddbb2713..111ea41c4ecd 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -853,7 +853,6 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,
                         break;
                 }
 
-                req.name[req.name_len] = '\0';
                 err = verify_mkvol_req(ubi, &req);
                 if (err)
                         break;
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 277786ebaa2c..1361574e2b00 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -291,8 +291,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm);
  */
 struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
 {
-        int error, ubi_num, vol_id;
-        struct ubi_volume_desc *ret;
+        int error, ubi_num, vol_id, mod;
         struct inode *inode;
         struct path path;
 
@@ -306,16 +305,16 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
                 return ERR_PTR(error);
 
         inode = path.dentry->d_inode;
+        mod = inode->i_mode;
         ubi_num = ubi_major2num(imajor(inode));
         vol_id = iminor(inode) - 1;
+        path_put(&path);
 
+        if (!S_ISCHR(mod))
+                return ERR_PTR(-EINVAL);
         if (vol_id >= 0 && ubi_num >= 0)
-                ret = ubi_open_volume(ubi_num, vol_id, mode);
-        else
-                ret = ERR_PTR(-ENODEV);
-
-        path_put(&path);
-        return ret;
+                return ubi_open_volume(ubi_num, vol_id, mode);
+        return ERR_PTR(-ENODEV);
 }
 EXPORT_SYMBOL_GPL(ubi_open_volume_path);
 
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index c1d7b880c795..425bf5a3edd4 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -155,6 +155,7 @@ int ubi_start_update(struct ubi_device *ubi, struct ubi_volume *vol,
                 if (err)
                         return err;
                 vol->updating = 0;
+                return 0;
         }
 
         vol->upd_buf = vmalloc(ubi->leb_size);
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 1afc61e7455d..40044028d682 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -566,6 +566,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                 vol->reserved_pebs = be32_to_cpu(vtbl[i].reserved_pebs);
                 vol->alignment = be32_to_cpu(vtbl[i].alignment);
                 vol->data_pad = be32_to_cpu(vtbl[i].data_pad);
+                vol->upd_marker = vtbl[i].upd_marker;
                 vol->vol_type = vtbl[i].vol_type == UBI_VID_DYNAMIC ?
                                         UBI_DYNAMIC_VOLUME : UBI_STATIC_VOLUME;
                 vol->name_len = be16_to_cpu(vtbl[i].name_len);
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index c37ee9e6b67b..39e1c0d39476 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -68,6 +68,7 @@ config W90P910_ETH
         tristate "Nuvoton w90p910 Ethernet support"
         depends on ARM && ARCH_W90X900
         select PHYLIB
+        select MII
         help
           Say Y here if you want to use built-in Ethernet ports
           on w90p910 processor.
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index c5721cb38265..cc9ed8643910 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -663,7 +663,7 @@ static int lance_open( struct net_device *dev )
         while (--i > 0)
                 if (DREG & CSR0_IDON)
                         break;
-        if (i < 0 || (DREG & CSR0_ERR)) {
+        if (i <= 0 || (DREG & CSR0_ERR)) {
                 DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",
                                           dev->name, i, DREG ));
                 DREG = CSR0_STOP;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index c0451d75cdcf..ec52529394ad 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev,
                 return -ENOMEM;
 
         for (i = first_dword; i < last_dword; i++) {
-                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))
-                        return -EIO;
+                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {
+                        ret_val = -EIO;
+                        goto free;
+                }
         }
 
         memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
                 eeprom->len);
+free:
         kfree(eeprom_buff);
 
         return ret_val;
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 102ade134165..fee6eee7ae5b 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -286,7 +286,7 @@ static void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len,
                                 MCC_WRB_SGE_CNT_SHIFT;
         wrb->payload_length = payload_len;
         wrb->tag0 = opcode;
-        be_dws_cpu_to_le(wrb, 20);
+        be_dws_cpu_to_le(wrb, 8);
 }
 
 /* Don't touch the hdr after it's prepared */
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 3a1f7902c16d..33ab8c7f14fe 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -910,7 +910,7 @@ static inline struct page *be_alloc_pages(u32 size)
 static void be_post_rx_frags(struct be_adapter *adapter)
 {
         struct be_rx_page_info *page_info_tbl = adapter->rx_obj.page_info_tbl;
-        struct be_rx_page_info *page_info = NULL;
+        struct be_rx_page_info *page_info = NULL, *prev_page_info = NULL;
         struct be_queue_info *rxq = &adapter->rx_obj.q;
         struct page *pagep = NULL;
         struct be_eth_rx_d *rxd;
@@ -941,7 +941,6 @@ static void be_post_rx_frags(struct be_adapter *adapter)
                 rxd = queue_head_node(rxq);
                 rxd->fragpa_lo = cpu_to_le32(frag_dmaaddr & 0xFFFFFFFF);
                 rxd->fragpa_hi = cpu_to_le32(upper_32_bits(frag_dmaaddr));
-                queue_head_inc(rxq);
 
                 /* Any space left in the current big page for another frag? */
                 if ((page_offset + rx_frag_size + rx_frag_size) >
@@ -949,10 +948,13 @@ static void be_post_rx_frags(struct be_adapter *adapter)
                         pagep = NULL;
                         page_info->last_page_user = true;
                 }
+
+                prev_page_info = page_info;
+                queue_head_inc(rxq);
                 page_info = &page_info_tbl[rxq->head];
         }
         if (pagep)
-                page_info->last_page_user = true;
+                prev_page_info->last_page_user = true;
 
         if (posted) {
                 atomic_add(posted, &rxq->used);
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 8ffea3990d07..0b23bc4f56c6 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -33,6 +33,7 @@
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
 
+#include <asm/dpmc.h>
 #include <asm/blackfin.h>
 #include <asm/cacheflush.h>
 #include <asm/portmux.h>
@@ -386,8 +387,8 @@ static int mii_probe(struct net_device *dev)
         u32 sclk, mdc_div;
 
         /* Enable PHY output early */
-        if (!(bfin_read_VR_CTL() & PHYCLKOE))
-                bfin_write_VR_CTL(bfin_read_VR_CTL() | PHYCLKOE);
+        if (!(bfin_read_VR_CTL() & CLKBUFOE))
+                bfin_write_VR_CTL(bfin_read_VR_CTL() | CLKBUFOE);
 
         sclk = get_sclk();
         mdc_div = ((sclk / MDC_CLK) / 2) - 1;
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 9c5a1537939c..1a72ca066a17 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -990,7 +990,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
                         goto error_tx_buf;
                 }
                 priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL);
-                if (!priv->spi_tx_buf) {
+                if (!priv->spi_rx_buf) {
                         ret = -ENOMEM;
                         goto error_rx_buf;
                 }
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index af9321617ce4..0e79cef95c0a 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -1325,8 +1325,7 @@ net_open(struct net_device *dev)
                 write_irq(dev, lp->chip_type, dev->irq);
                 ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev);
                 if (ret) {
-                        if (net_debug)
-                                printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq);
+                        printk(KERN_ERR "cs89x0: request_irq(%d) failed\n", dev->irq);
                         goto bad_out;
                 }
         }
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 34e03104c3c1..33c4fe26178c 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2711,6 +2711,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         SET_ETHTOOL_OPS(ndev, &ethtool_ops);
         netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
 
+        clk_enable(emac_clk);
+
         /* register the network device */
         SET_NETDEV_DEV(ndev, &pdev->dev);
         rc = register_netdev(ndev);
@@ -2720,7 +2722,6 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
                 goto netdev_reg_err;
         }
 
-        clk_enable(emac_clk);
 
         /* MII/Phy intialisation, mdio bus registration */
         emac_mii = mdiobus_alloc();
@@ -2760,6 +2761,7 @@ mdiobus_quit:
 
 netdev_reg_err:
 mdio_alloc_err:
+        clk_disable(emac_clk);
 no_irq_res:
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, res->end - res->start + 1);
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 2a567df3ea71..e8932db7ee77 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -326,6 +326,8 @@ struct e1000_adapter {
         /* for ioport free */
         int bars;
         int need_ioport;
+
+        bool discarding;
 };
 
 enum e1000_state_t {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7e855f9bbd97..d29bb532eccf 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1698,18 +1698,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         rctl &= ~E1000_RCTL_SZ_4096;
         rctl |= E1000_RCTL_BSEX;
         switch (adapter->rx_buffer_len) {
-                case E1000_RXBUFFER_256:
-                        rctl |= E1000_RCTL_SZ_256;
-                        rctl &= ~E1000_RCTL_BSEX;
-                        break;
-                case E1000_RXBUFFER_512:
-                        rctl |= E1000_RCTL_SZ_512;
-                        rctl &= ~E1000_RCTL_BSEX;
-                        break;
-                case E1000_RXBUFFER_1024:
-                        rctl |= E1000_RCTL_SZ_1024;
-                        rctl &= ~E1000_RCTL_BSEX;
-                        break;
                 case E1000_RXBUFFER_2048:
                 default:
                         rctl |= E1000_RCTL_SZ_2048;
@@ -2802,13 +2790,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
 dma_error:
         dev_err(&pdev->dev, "TX DMA map failed\n");
         buffer_info->dma = 0;
-        count--;
-
-        while (count >= 0) {
+        if (count)
                 count--;
-                i--;
-                if (i < 0)
+
+        while (count--) {
+                if (i==0)
                         i += tx_ring->count;
+                i--;
                 buffer_info = &tx_ring->buffer_info[i];
                 e1000_unmap_and_free_tx_resource(adapter, buffer_info);
         }
@@ -3176,13 +3164,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
          *  however with the new *_jumbo_rx* routines, jumbo receives will use
          *  fragmented skbs */
 
-        if (max_frame <= E1000_RXBUFFER_256)
-                adapter->rx_buffer_len = E1000_RXBUFFER_256;
-        else if (max_frame <= E1000_RXBUFFER_512)
-                adapter->rx_buffer_len = E1000_RXBUFFER_512;
-        else if (max_frame <= E1000_RXBUFFER_1024)
-                adapter->rx_buffer_len = E1000_RXBUFFER_1024;
-        else if (max_frame <= E1000_RXBUFFER_2048)
+        if (max_frame <= E1000_RXBUFFER_2048)
                 adapter->rx_buffer_len = E1000_RXBUFFER_2048;
         else
 #if (PAGE_SIZE >= E1000_RXBUFFER_16384)
@@ -3850,13 +3832,22 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 length = le16_to_cpu(rx_desc->length);
                 /* !EOP means multiple descriptors were used to store a single
-                 * packet, also make sure the frame isn't just CRC only */
-                if (unlikely(!(status & E1000_RXD_STAT_EOP) || (length <= 4))) {
+                 * packet, if thats the case we need to toss it.  In fact, we
+                 * to toss every packet with the EOP bit clear and the next
+                 * frame that _does_ have the EOP bit set, as it is by
+                 * definition only a frame fragment
+                 */
+                if (unlikely(!(status & E1000_RXD_STAT_EOP)))
+                        adapter->discarding = true;
+
+                if (adapter->discarding) {
                         /* All receives must fit into a single buffer */
                         E1000_DBG("%s: Receive packet consumed multiple"
                                   " buffers\n", netdev->name);
                         /* recycle */
                         buffer_info->skb = skb;
+                        if (status & E1000_RXD_STAT_EOP)
+                                adapter->discarding = false;
                         goto next_desc;
                 }
 
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index b979464091bb..02d67d047d96 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -237,6 +237,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
+        /* Adaptive IFS supported */
+        mac->adaptive_ifs = true;
 
         /* check for link */
         switch (hw->phy.media_type) {
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index cebbd9079d53..d236efaf7478 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -421,6 +421,7 @@ struct e1000_info {
 /* CRC Stripping defines */
 #define FLAG2_CRC_STRIPPING               (1 << 0)
 #define FLAG2_HAS_PHY_WAKEUP              (1 << 1)
+#define FLAG2_IS_DISCARDING               (1 << 2)
 
 #define E1000_RX_DESC_PS(R, i)      \
         (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -582,7 +583,6 @@ extern s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
 extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
 extern s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
                                          u16 data);
-extern s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow);
 extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);
 extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);
 extern s32 e1000_check_polarity_82577(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 3028f23da891..e2aa3b788564 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -224,6 +224,8 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
+        /* Adaptive IFS not supported */
+        mac->adaptive_ifs = false;
 
         /* check for link */
         switch (hw->phy.media_type) {
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 2784cf44a6f3..eccf29b75c41 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -818,6 +818,7 @@ struct e1000_mac_info {
 
         u8  forced_speed_duplex;
 
+        bool adaptive_ifs;
         bool arc_subsystem_valid;
         bool autoneg;
         bool autoneg_failed;
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9b09246af064..8b6ecd127889 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -138,6 +138,10 @@
 #define E1000_NVM_K1_CONFIG 0x1B /* NVM K1 Config Word */
 #define E1000_NVM_K1_ENABLE 0x1  /* NVM Enable K1 bit */
 
+/* KMRN Mode Control */
+#define HV_KMRN_MODE_CTRL      PHY_REG(769, 16)
+#define HV_KMRN_MDIO_SLOW      0x0400
+
 /* ICH GbE Flash Hardware Sequencing Flash Status Register bit breakdown */
 /* Offset 04h HSFSTS */
 union ich8_hws_flash_status {
@@ -219,6 +223,7 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
 static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
 static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
 static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
 
 static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
 {
@@ -270,7 +275,21 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
         phy->id = e1000_phy_unknown;
-        e1000e_get_phy_id(hw);
+        ret_val = e1000e_get_phy_id(hw);
+        if (ret_val)
+                goto out;
+        if ((phy->id == 0) || (phy->id == PHY_REVISION_MASK)) {
+                /*
+                 * In case the PHY needs to be in mdio slow mode (eg. 82577),
+                 * set slow mode and try to get the PHY id again.
+                 */
+                ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_get_phy_id(hw);
+                if (ret_val)
+                        goto out;
+        }
         phy->type = e1000e_get_phy_type_from_id(phy->id);
 
         switch (phy->type) {
@@ -292,6 +311,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                 break;
         }
 
+out:
         return ret_val;
 }
 
@@ -454,6 +474,8 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
                 mac->rar_entry_count--;
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = true;
+        /* Adaptive IFS supported */
+        mac->adaptive_ifs = true;
 
         /* LED operations */
         switch (mac->type) {
@@ -1074,16 +1096,44 @@ out:
 
 
 /**
+ *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
+ *  @hw:   pointer to the HW structure
+ **/
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 data;
+
+        ret_val = e1e_rphy(hw, HV_KMRN_MODE_CTRL, &data);
+        if (ret_val)
+                return ret_val;
+
+        data |= HV_KMRN_MDIO_SLOW;
+
+        ret_val = e1e_wphy(hw, HV_KMRN_MODE_CTRL, data);
+
+        return ret_val;
+}
+
+/**
  *  e1000_hv_phy_workarounds_ich8lan - A series of Phy workarounds to be
  *  done after every PHY reset.
  **/
 static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
 {
         s32 ret_val = 0;
+        u16 phy_data;
 
         if (hw->mac.type != e1000_pchlan)
                 return ret_val;
 
+        /* Set MDIO slow mode before any other MDIO access */
+        if (hw->phy.type == e1000_phy_82577) {
+                ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                if (ret_val)
+                        goto out;
+        }
+
         if (((hw->phy.type == e1000_phy_82577) &&
              ((hw->phy.revision == 1) || (hw->phy.revision == 2))) ||
             ((hw->phy.type == e1000_phy_82578) && (hw->phy.revision == 1))) {
@@ -1116,16 +1166,32 @@ static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
 
         hw->phy.addr = 1;
         ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, 0);
+        hw->phy.ops.release(hw);
         if (ret_val)
                 goto out;
-        hw->phy.ops.release(hw);
 
         /*
          * Configure the K1 Si workaround during phy reset assuming there is
          * link so that it disables K1 if link is in 1Gbps.
          */
         ret_val = e1000_k1_gig_workaround_hv(hw, true);
+        if (ret_val)
+                goto out;
 
+        /* Workaround for link disconnects on a busy hub in half duplex */
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                goto out;
+        ret_val = hw->phy.ops.read_reg_locked(hw,
+                                              PHY_REG(BM_PORT_CTRL_PAGE, 17),
+                                              &phy_data);
+        if (ret_val)
+                goto release;
+        ret_val = hw->phy.ops.write_reg_locked(hw,
+                                               PHY_REG(BM_PORT_CTRL_PAGE, 17),
+                                               phy_data & 0x00FF);
+release:
+        hw->phy.ops.release(hw);
 out:
         return ret_val;
 }
@@ -1182,6 +1248,7 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
         /* Allow time for h/w to get to a quiescent state after reset */
         mdelay(10);
 
+        /* Perform any necessary post-reset workarounds */
         if (hw->mac.type == e1000_pchlan) {
                 ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
                 if (ret_val)
@@ -2482,6 +2549,10 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         if (!ret_val)
                 e1000_release_swflag_ich8lan(hw);
 
+        /* Perform any necessary post-reset workarounds */
+        if (hw->mac.type == e1000_pchlan)
+                ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
+
         if (ctrl & E1000_CTRL_PHY_RST)
                 ret_val = hw->phy.ops.get_cfg_done(hw);
 
@@ -2526,9 +2597,6 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         kab |= E1000_KABGTXD_BGSQLBIAS;
         ew32(KABGTXD, kab);
 
-        if (hw->mac.type == e1000_pchlan)
-                ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
-
 out:
         return ret_val;
 }
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index a86c17548c1e..2fa9b36a2c5a 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -125,6 +125,7 @@ void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
 void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
 {
         u32 i;
+        u8 mac_addr[ETH_ALEN] = {0};
 
         /* Setup the receive address */
         e_dbg("Programming MAC Address into RAR[0]\n");
@@ -133,12 +134,8 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
 
         /* Zero out the other (rar_entry_count - 1) receive addresses */
         e_dbg("Clearing RAR[1-%u]\n", rar_count-1);
-        for (i = 1; i < rar_count; i++) {
-                E1000_WRITE_REG_ARRAY(hw, E1000_RA, (i << 1), 0);
-                e1e_flush();
-                E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((i << 1) + 1), 0);
-                e1e_flush();
-        }
+        for (i = 1; i < rar_count; i++)
+                e1000e_rar_set(hw, mac_addr, i);
 }
 
 /**
@@ -164,10 +161,19 @@ void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
 
         rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
 
-        rar_high |= E1000_RAH_AV;
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
 
-        E1000_WRITE_REG_ARRAY(hw, E1000_RA, (index << 1), rar_low);
-        E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((index << 1) + 1), rar_high);
+        /*
+         * Some bridges will combine consecutive 32-bit writes into
+         * a single burst write, which will malfunction on some parts.
+         * The flushes avoid this.
+         */
+        ew32(RAL(index), rar_low);
+        e1e_flush();
+        ew32(RAH(index), rar_high);
+        e1e_flush();
 }
 
 /**
@@ -1609,6 +1615,11 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 {
         struct e1000_mac_info *mac = &hw->mac;
 
+        if (!mac->adaptive_ifs) {
+                e_dbg("Not in Adaptive IFS mode!\n");
+                goto out;
+        }
+
         mac->current_ifs_val = 0;
         mac->ifs_min_val = IFS_MIN;
         mac->ifs_max_val = IFS_MAX;
@@ -1617,6 +1628,8 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
         mac->in_ifs_mode = false;
         ew32(AIT, 0);
+out:
+        return;
 }
 
 /**
@@ -1630,6 +1643,11 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
 {
         struct e1000_mac_info *mac = &hw->mac;
 
+        if (!mac->adaptive_ifs) {
+                e_dbg("Not in Adaptive IFS mode!\n");
+                goto out;
+        }
+
         if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
                 if (mac->tx_packet_delta > MIN_NUM_XMITS) {
                         mac->in_ifs_mode = true;
@@ -1650,6 +1668,8 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                         ew32(AIT, 0);
                 }
         }
+out:
+        return;
 }
 
 /**
@@ -2287,10 +2307,12 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         s32 ret_val, hdr_csum, csum;
         u8 i, len;
 
+        hw->mac.tx_pkt_filtering = true;
+
         /* No manageability, no filtering */
         if (!e1000e_check_mng_mode(hw)) {
                 hw->mac.tx_pkt_filtering = false;
-                return 0;
+                goto out;
         }
 
         /*
@@ -2298,9 +2320,9 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
          * reason, disable filtering.
          */
         ret_val = e1000_mng_enable_host_if(hw);
-        if (ret_val != 0) {
+        if (ret_val) {
                 hw->mac.tx_pkt_filtering = false;
-                return ret_val;
+                goto out;
         }
 
         /* Read in the header.  Length and offset are in dwords. */
@@ -2319,17 +2341,17 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
          */
         if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
                 hw->mac.tx_pkt_filtering = true;
-                return 1;
+                goto out;
         }
 
         /* Cookie area is valid, make the final check for filtering. */
         if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
                 hw->mac.tx_pkt_filtering = false;
-                return 0;
+                goto out;
         }
 
-        hw->mac.tx_pkt_filtering = true;
-        return 1;
+out:
+        return hw->mac.tx_pkt_filtering;
 }
 
 /**
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 762b697ce731..57f149b75fbe 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -450,13 +450,23 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 length = le16_to_cpu(rx_desc->length);
 
-                /* !EOP means multiple descriptors were used to store a single
-                 * packet, also make sure the frame isn't just CRC only */
-                if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) {
+                /*
+                 * !EOP means multiple descriptors were used to store a single
+                 * packet, if that's the case we need to toss it.  In fact, we
+                 * need to toss every packet with the EOP bit clear and the
+                 * next frame that _does_ have the EOP bit set, as it is by
+                 * definition only a frame fragment
+                 */
+                if (unlikely(!(status & E1000_RXD_STAT_EOP)))
+                        adapter->flags2 |= FLAG2_IS_DISCARDING;
+
+                if (adapter->flags2 & FLAG2_IS_DISCARDING) {
                         /* All receives must fit into a single buffer */
                         e_dbg("Receive packet consumed multiple buffers\n");
                         /* recycle */
                         buffer_info->skb = skb;
+                        if (status & E1000_RXD_STAT_EOP)
+                                adapter->flags2 &= ~FLAG2_IS_DISCARDING;
                         goto next_desc;
                 }
 
@@ -745,10 +755,16 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                                  PCI_DMA_FROMDEVICE);
                 buffer_info->dma = 0;
 
-                if (!(staterr & E1000_RXD_STAT_EOP)) {
+                /* see !EOP comment in other rx routine */
+                if (!(staterr & E1000_RXD_STAT_EOP))
+                        adapter->flags2 |= FLAG2_IS_DISCARDING;
+
+                if (adapter->flags2 & FLAG2_IS_DISCARDING) {
                         e_dbg("Packet Split buffers didn't pick up the full "
                               "packet\n");
                         dev_kfree_skb_irq(skb);
+                        if (staterr & E1000_RXD_STAT_EOP)
+                                adapter->flags2 &= ~FLAG2_IS_DISCARDING;
                         goto next_desc;
                 }
 
@@ -1118,6 +1134,7 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
 
         rx_ring->next_to_clean = 0;
         rx_ring->next_to_use = 0;
+        adapter->flags2 &= ~FLAG2_IS_DISCARDING;
 
         writel(0, adapter->hw.hw_addr + rx_ring->head);
         writel(0, adapter->hw.hw_addr + rx_ring->tail);
@@ -2333,18 +2350,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         rctl &= ~E1000_RCTL_SZ_4096;
         rctl |= E1000_RCTL_BSEX;
         switch (adapter->rx_buffer_len) {
-        case 256:
-                rctl |= E1000_RCTL_SZ_256;
-                rctl &= ~E1000_RCTL_BSEX;
-                break;
-        case 512:
-                rctl |= E1000_RCTL_SZ_512;
-                rctl &= ~E1000_RCTL_BSEX;
-                break;
-        case 1024:
-                rctl |= E1000_RCTL_SZ_1024;
-                rctl &= ~E1000_RCTL_BSEX;
-                break;
         case 2048:
         default:
                 rctl |= E1000_RCTL_SZ_2048;
@@ -3315,24 +3320,24 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_SCC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_SCC_LOWER, &phy_data);
-                adapter->stats.scc += phy_data;
+                if (!e1e_rphy(hw, HV_SCC_LOWER, &phy_data))
+                        adapter->stats.scc += phy_data;
 
                 e1e_rphy(hw, HV_ECOL_UPPER, &phy_data);
-                e1e_rphy(hw, HV_ECOL_LOWER, &phy_data);
-                adapter->stats.ecol += phy_data;
+                if (!e1e_rphy(hw, HV_ECOL_LOWER, &phy_data))
+                        adapter->stats.ecol += phy_data;
 
                 e1e_rphy(hw, HV_MCC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_MCC_LOWER, &phy_data);
-                adapter->stats.mcc += phy_data;
+                if (!e1e_rphy(hw, HV_MCC_LOWER, &phy_data))
+                        adapter->stats.mcc += phy_data;
 
                 e1e_rphy(hw, HV_LATECOL_UPPER, &phy_data);
-                e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data);
-                adapter->stats.latecol += phy_data;
+                if (!e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data))
+                        adapter->stats.latecol += phy_data;
 
                 e1e_rphy(hw, HV_DC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_DC_LOWER, &phy_data);
-                adapter->stats.dc += phy_data;
+                if (!e1e_rphy(hw, HV_DC_LOWER, &phy_data))
+                        adapter->stats.dc += phy_data;
         } else {
                 adapter->stats.scc += er32(SCC);
                 adapter->stats.ecol += er32(ECOL);
@@ -3360,8 +3365,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_COLC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_COLC_LOWER, &phy_data);
-                hw->mac.collision_delta = phy_data;
+                if (!e1e_rphy(hw, HV_COLC_LOWER, &phy_data))
+                        hw->mac.collision_delta = phy_data;
         } else {
                 hw->mac.collision_delta = er32(COLC);
         }
@@ -3372,8 +3377,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_TNCRS_UPPER, &phy_data);
-                e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data);
-                adapter->stats.tncrs += phy_data;
+                if (!e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data))
+                        adapter->stats.tncrs += phy_data;
         } else {
                 if ((hw->mac.type != e1000_82574) &&
                     (hw->mac.type != e1000_82583))
@@ -3781,7 +3786,7 @@ static int e1000_tso(struct e1000_adapter *adapter,
                                                          0, IPPROTO_TCP, 0);
                 cmd_length = E1000_TXD_CMD_IP;
                 ipcse = skb_transport_offset(skb) - 1;
-        } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+        } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
                                                        &ipv6_hdr(skb)->daddr,
@@ -3962,13 +3967,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
 dma_error:
         dev_err(&pdev->dev, "TX DMA map failed\n");
         buffer_info->dma = 0;
-        count--;
-
-        while (count >= 0) {
+        if (count)
                 count--;
-                i--;
-                if (i < 0)
+
+        while (count--) {
+                if (i==0)
                         i += tx_ring->count;
+                i--;
                 buffer_info = &tx_ring->buffer_info[i];
                 e1000_put_txbuf(adapter, buffer_info);;
         }
@@ -4317,13 +4322,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
          * fragmented skbs
          */
 
-        if (max_frame <= 256)
-                adapter->rx_buffer_len = 256;
-        else if (max_frame <= 512)
-                adapter->rx_buffer_len = 512;
-        else if (max_frame <= 1024)
-                adapter->rx_buffer_len = 1024;
-        else if (max_frame <= 2048)
+        if (max_frame <= 2048)
                 adapter->rx_buffer_len = 2048;
         else
                 adapter->rx_buffer_len = 4096;
@@ -4674,6 +4673,7 @@ static int e1000_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
+        pci_save_state(pdev);
         e1000e_disable_l1aspm(pdev);
 
         err = pci_enable_device_mem(pdev);
@@ -4825,6 +4825,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
         } else {
                 pci_set_master(pdev);
                 pci_restore_state(pdev);
+                pci_save_state(pdev);
 
                 pci_enable_wake(pdev, PCI_D3hot, 0);
                 pci_enable_wake(pdev, PCI_D3cold, 0);
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 55a2c0acfee7..7f3ceb9dad6a 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -152,32 +152,9 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
                 if (phy->id != 0 && phy->id != PHY_REVISION_MASK)
                         goto out;
 
-                /*
-                 * If the PHY ID is still unknown, we may have an 82577
-                 * without link.  We will try again after setting Slow MDIC
-                 * mode. No harm in trying again in this case since the PHY
-                 * ID is unknown at this point anyway.
-                 */
-                ret_val = phy->ops.acquire(hw);
-                if (ret_val)
-                        goto out;
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-                phy->ops.release(hw);
-
                 retry_count++;
         }
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if (retry_count) {
-                ret_val = phy->ops.acquire(hw);
-                if (ret_val)
-                        return ret_val;
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
-                phy->ops.release(hw);
-        }
-
         return ret_val;
 }
 
@@ -2791,38 +2768,6 @@ static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active)
 }
 
 /**
- *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
- *  @hw:   pointer to the HW structure
- *  @slow: true for slow mode, false for normal mode
- *
- *  Assumes semaphore already acquired.
- **/
-s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow)
-{
-        s32 ret_val = 0;
-        u16 data = 0;
-
-        /* Set MDIO mode - page 769, register 16: 0x2580==slow, 0x2180==fast */
-        hw->phy.addr = 1;
-        ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
-        if (ret_val)
-                goto out;
-
-        ret_val = e1000e_write_phy_reg_mdic(hw, BM_CS_CTRL1,
-                                           (0x2180 | (slow << 10)));
-        if (ret_val)
-                goto out;
-
-        /* dummy read when reverting to fast mode - throw away result */
-        if (!slow)
-                ret_val = e1000e_read_phy_reg_mdic(hw, BM_CS_CTRL1, &data);
-
-out:
-        return ret_val;
-}
-
-/**
  *  __e1000_read_phy_reg_hv -  Read HV PHY register
  *  @hw: pointer to the HW structure
  *  @offset: register offset to be read
@@ -2839,7 +2784,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
         s32 ret_val;
         u16 page = BM_PHY_REG_PAGE(offset);
         u16 reg = BM_PHY_REG_NUM(offset);
-        bool in_slow_mode = false;
 
         if (!locked) {
                 ret_val = hw->phy.ops.acquire(hw);
@@ -2847,16 +2791,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
                         return ret_val;
         }
 
-        /* Workaround failure in MDIO access while cable is disconnected */
-        if ((hw->phy.type == e1000_phy_82577) &&
-            !(er32(STATUS) & E1000_STATUS_LU)) {
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-
-                in_slow_mode = true;
-        }
-
         /* Page 800 works differently than the rest so it has its own func */
         if (page == BM_WUC_PAGE) {
                 ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset,
@@ -2893,10 +2827,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
         ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
                                           data);
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-                ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
-
         if (!locked)
                 hw->phy.ops.release(hw);
 
@@ -2948,7 +2878,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
         s32 ret_val;
         u16 page = BM_PHY_REG_PAGE(offset);
         u16 reg = BM_PHY_REG_NUM(offset);
-        bool in_slow_mode = false;
 
         if (!locked) {
                 ret_val = hw->phy.ops.acquire(hw);
@@ -2956,16 +2885,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                         return ret_val;
         }
 
-        /* Workaround failure in MDIO access while cable is disconnected */
-        if ((hw->phy.type == e1000_phy_82577) &&
-            !(er32(STATUS) & E1000_STATUS_LU)) {
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-
-                in_slow_mode = true;
-        }
-
         /* Page 800 works differently than the rest so it has its own func */
         if (page == BM_WUC_PAGE) {
                 ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset,
@@ -3019,10 +2938,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                                           data);
 
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-                ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
-
         if (!locked)
                 hw->phy.ops.release(hw);
 
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index 25fabb3eedc5..d5160edf2fcf 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -46,6 +46,11 @@
 #include "gianfar.h"
 #include "fsl_pq_mdio.h"
 
+struct fsl_pq_mdio_priv {
+        void __iomem *map;
+        struct fsl_pq_mdio __iomem *regs;
+};
+
 /*
  * Write value to the PHY at mii_id at register regnum,
  * on the bus attached to the local interface, which may be different from the
@@ -105,7 +110,9 @@ int fsl_pq_local_mdio_read(struct fsl_pq_mdio __iomem *regs,
 
 static struct fsl_pq_mdio __iomem *fsl_pq_mdio_get_regs(struct mii_bus *bus)
 {
-        return (void __iomem __force *)bus->priv;
+        struct fsl_pq_mdio_priv *priv = bus->priv;
+
+        return priv->regs;
 }
 
 /*
@@ -266,6 +273,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 {
         struct device_node *np = ofdev->node;
         struct device_node *tbi;
+        struct fsl_pq_mdio_priv *priv;
         struct fsl_pq_mdio __iomem *regs = NULL;
         void __iomem *map;
         u32 __iomem *tbipa;
@@ -274,14 +282,19 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
         u64 addr = 0, size = 0;
         int err = 0;
 
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
         new_bus = mdiobus_alloc();
         if (NULL == new_bus)
-                return -ENOMEM;
+                goto err_free_priv;
 
         new_bus->name = "Freescale PowerQUICC MII Bus",
         new_bus->read = &fsl_pq_mdio_read,
         new_bus->write = &fsl_pq_mdio_write,
         new_bus->reset = &fsl_pq_mdio_reset,
+        new_bus->priv = priv;
         fsl_pq_mdio_bus_name(new_bus->id, np);
 
         /* Set the PHY base address */
@@ -291,6 +304,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                 err = -ENOMEM;
                 goto err_free_bus;
         }
+        priv->map = map;
 
         if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||
                         of_device_is_compatible(np, "fsl,gianfar-tbi") ||
@@ -298,8 +312,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                         of_device_is_compatible(np, "ucc_geth_phy"))
                 map -= offsetof(struct fsl_pq_mdio, miimcfg);
         regs = map;
-
-        new_bus->priv = (void __force *)regs;
+        priv->regs = regs;
 
         new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
 
@@ -392,10 +405,11 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 err_free_irqs:
         kfree(new_bus->irq);
 err_unmap_regs:
-        iounmap(regs);
+        iounmap(priv->map);
 err_free_bus:
         kfree(new_bus);
-
+err_free_priv:
+        kfree(priv);
         return err;
 }
 
@@ -404,14 +418,16 @@ static int fsl_pq_mdio_remove(struct of_device *ofdev)
 {
         struct device *device = &ofdev->dev;
         struct mii_bus *bus = dev_get_drvdata(device);
+        struct fsl_pq_mdio_priv *priv = bus->priv;
 
         mdiobus_unregister(bus);
 
         dev_set_drvdata(device, NULL);
 
-        iounmap(fsl_pq_mdio_get_regs(bus));
+        iounmap(priv->map);
         bus->priv = NULL;
         mdiobus_free(bus);
+        kfree(priv);
 
         return 0;
 }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ae5f11c8fc13..bdadf3e23c94 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -248,6 +248,7 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         unsigned char *ptr;
         struct bpqdev *bpq;
+        struct net_device *orig_dev;
         int size;
 
         /*
@@ -282,8 +283,9 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 
         bpq = netdev_priv(dev);
 
+        orig_dev = dev;
         if ((dev = bpq_get_ether_dev(dev)) == NULL) {
-                dev->stats.tx_dropped++;
+                orig_dev->stats.tx_dropped++;
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 933c64ff2465..997124d2992a 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3422,7 +3422,7 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,
                                                          iph->daddr, 0,
                                                          IPPROTO_TCP,
                                                          0);
-        } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+        } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
                                                        &ipv6_hdr(skb)->daddr,
@@ -3584,6 +3584,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
                 struct skb_frag_struct *frag;
 
+                count++;
                 i++;
                 if (i == tx_ring->count)
                         i = 0;
@@ -3605,7 +3606,6 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
                 if (pci_dma_mapping_error(pdev, buffer_info->dma))
                         goto dma_error;
 
-                count++;
         }
 
         tx_ring->buffer_info[i].skb = skb;
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 0dbd0320023a..297a5ddd77f0 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -1963,7 +1963,7 @@ static int igbvf_tso(struct igbvf_adapter *adapter,
                                                          iph->daddr, 0,
                                                          IPPROTO_TCP,
                                                          0);
-        } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+        } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
                                                        &ipv6_hdr(skb)->daddr,
@@ -2126,6 +2126,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
                 struct skb_frag_struct *frag;
 
+                count++;
                 i++;
                 if (i == tx_ring->count)
                         i = 0;
@@ -2146,7 +2147,6 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
                                                 PCI_DMA_TODEVICE);
                 if (pci_dma_mapping_error(pdev, buffer_info->dma))
                         goto dma_error;
-                count++;
         }
 
         tx_ring->buffer_info[i].skb = skb;
@@ -2163,14 +2163,14 @@ dma_error:
         buffer_info->length = 0;
         buffer_info->next_to_watch = 0;
         buffer_info->mapped_as_page = false;
-        count--;
+        if (count)
+                count--;
 
         /* clear timestamp and dma mappings for remaining portion of packet */
-        while (count >= 0) {
-                count--;
-                i--;
-                if (i < 0)
+        while (count--) {
+                if (i==0)
                         i += tx_ring->count;
+                i--;
                 buffer_info = &tx_ring->buffer_info[i];
                 igbvf_put_txbuf(adapter, buffer_info);
         }
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index bcd0f01d5feb..593d1a4f217c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1363,13 +1363,13 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
 dma_error:
         dev_err(&pdev->dev, "TX DMA map failed\n");
         buffer_info->dma = 0;
-        count--;
-
-        while (count >= 0) {
+        if (count)
                 count--;
-                i--;
-                if (i < 0)
+
+        while (count--) {
+                if (i==0)
                         i += tx_ring->count;
+                i--;
                 buffer_info = &tx_ring->buffer_info[i];
                 ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
         }
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
index 21b41f42b61c..bfef0ebcba9a 100644
--- a/drivers/net/ixgbe/Makefile
+++ b/drivers/net/ixgbe/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 10 Gigabit PCI Express Linux driver
-# Copyright(c) 1999 - 2009 Intel Corporation.
+# Copyright(c) 1999 - 2010 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 8da8eb535084..303e7bd39b67 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index 204177d78cec..3103f4165311 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 538340527aa6..b49bd6b9feb7 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 688b8ca5da32..21f158f79dd0 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 27f3214bed2e..dfff0ffaa502 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index a1562287342f..9aea4f04bbd2 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
index 64a9fa15c059..5caafd4afbc3 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/ixgbe_dcb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
index f30263898ebc..f0e9279d4669 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
index ebbe53c352a7..cc728fa092e2 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index ec8a252636d3..4f7a26ab411e 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
index 9e5e2827e4af..0f3f791e1e1d 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 3c7a79a7d7c6..56f37f66b696 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 0bd49d3b9f65..d77961fc75f9 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index da32a108a7b4..e9a20c88c155 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index de8ff53187da..abf4b2b3f252 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 1a2ea621e371..b5f64ad67975 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,7 +52,7 @@ static const char ixgbe_driver_string[] =
 
 #define DRV_VERSION "2.0.44-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
-static char ixgbe_copyright[] = "Copyright (c) 1999-2009 Intel Corporation.";
+static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
 
 static const struct ixgbe_info *ixgbe_info_tbl[] = {
         [board_82598] = &ixgbe_82598_info,
@@ -262,10 +262,12 @@ static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter,
                 int reg_idx = tx_ring->reg_idx;
                 int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
 
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
+                switch (adapter->hw.mac.type) {
+                case ixgbe_mac_82598EB:
                         tc = reg_idx >> 2;
                         txoff = IXGBE_TFCS_TXOFF0;
-                } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
+                        break;
+                case ixgbe_mac_82599EB:
                         tc = 0;
                         txoff = IXGBE_TFCS_TXOFF;
                         if (dcb_i == 8) {
@@ -284,6 +286,9 @@ static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter,
                                                 tc += (reg_idx - 96) >> 4;
                                 }
                         }
+                        break;
+                default:
+                        tc = 0;
                 }
                 txoff <<= tc;
         }
@@ -4923,7 +4928,7 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,
                                                                  iph->daddr, 0,
                                                                  IPPROTO_TCP,
                                                                  0);
-                } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+                } else if (skb_is_gso_v6(skb)) {
                         ipv6_hdr(skb)->payload_len = 0;
                         tcp_hdr(skb)->check =
                             ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
@@ -5162,14 +5167,14 @@ dma_error:
         tx_buffer_info->dma = 0;
         tx_buffer_info->time_stamp = 0;
         tx_buffer_info->next_to_watch = 0;
-        count--;
+        if (count)
+                count--;
 
         /* clear timestamp and dma mappings for remaining portion of packet */
-        while (count >= 0) {
-                count--;
-                i--;
-                if (i < 0)
+        while (count--) {
+                if (i==0)
                         i += tx_ring->count;
+                i--;
                 tx_buffer_info = &tx_ring->tx_buffer_info[i];
                 ixgbe_unmap_and_free_tx_resource(adapter, tx_buffer_info);
         }
@@ -5571,6 +5576,10 @@ static void ixgbe_netpoll(struct net_device *netdev)
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int i;
 
+        /* if interface is down do nothing */
+        if (test_bit(__IXGBE_DOWN, &adapter->state))
+                return;
+
         adapter->flags |= IXGBE_FLAG_IN_NETPOLL;
         if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                 int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index 9ecad17522c3..1c1efd386956 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h
index 9b700f5bf1ed..9cf5f3b4cc5d 100644
--- a/drivers/net/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ixgbe/ixgbe_phy.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 84650c6ebe03..9eafddfa1b97 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 336e7c7a9275..a8522bd73ae7 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -134,7 +134,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
         struct sk_buff *skb;
         int i;
 
-        lp->rx_skb = kzalloc(sizeof(struct sk_buff)*RX_BD_NUM, GFP_KERNEL);
+        lp->rx_skb = kzalloc(sizeof(*lp->rx_skb) * RX_BD_NUM, GFP_KERNEL);
         /* allocate the tx and rx ring buffer descriptors. */
         /* returns a virtual addres and a physical address. */
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 291a505fd4fc..3cf56d90d859 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1174,7 +1174,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         return 0;
 
 err_port:
-        for (port = 1; port <= dev->caps.num_ports; port++)
+        for (--port; port >= 1; --port)
                 mlx4_cleanup_port_info(&priv->port[port]);
 
         mlx4_cleanup_mcg_table(dev);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 1405a170bb43..af67af55efe7 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -656,6 +656,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
                 struct sk_buff *skb;
                 int rx;
                 struct rx_desc *rx_desc;
+                int size;
 
                 skb = __skb_dequeue(&mp->rx_recycle);
                 if (skb == NULL)
@@ -678,10 +679,11 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
 
                 rx_desc = rxq->rx_desc_area + rx;
 
+                size = skb->end - skb->data;
                 rx_desc->buf_ptr = dma_map_single(mp->dev->dev.parent,
-                                                  skb->data, mp->skb_size,
+                                                  skb->data, size,
                                                   DMA_FROM_DEVICE);
-                rx_desc->buf_size = mp->skb_size;
+                rx_desc->buf_size = size;
                 rxq->rx_skb[rx] = skb;
                 wmb();
                 rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 76cd1f3e9fc8..9bc5bd1d538a 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 65
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.65"
+#define _NETXEN_NIC_LINUX_SUBVERSION 72
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.72"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index ddd704ae0188..542f408333ff 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -66,7 +66,7 @@ static const char netxen_nic_gstrings_test[][ETH_GSTRING_LEN] = {
 
 #define NETXEN_NIC_TEST_LEN     ARRAY_SIZE(netxen_nic_gstrings_test)
 
-#define NETXEN_NIC_REGS_COUNT 42
+#define NETXEN_NIC_REGS_COUNT 30
 #define NETXEN_NIC_REGS_LEN (NETXEN_NIC_REGS_COUNT * sizeof(__le32))
 #define NETXEN_MAX_EEPROM_LEN   1024
 
@@ -312,150 +312,91 @@ static int netxen_nic_get_regs_len(struct net_device *dev)
         return NETXEN_NIC_REGS_LEN;
 }
 
-struct netxen_niu_regs {
-        __u32 reg[NETXEN_NIC_REGS_COUNT];
-};
-
-static struct netxen_niu_regs niu_registers[] = {
-        {
-         /* GB Mode */
-         {
-          NETXEN_NIU_GB_SERDES_RESET,
-          NETXEN_NIU_GB0_MII_MODE,
-          NETXEN_NIU_GB1_MII_MODE,
-          NETXEN_NIU_GB2_MII_MODE,
-          NETXEN_NIU_GB3_MII_MODE,
-          NETXEN_NIU_GB0_GMII_MODE,
-          NETXEN_NIU_GB1_GMII_MODE,
-          NETXEN_NIU_GB2_GMII_MODE,
-          NETXEN_NIU_GB3_GMII_MODE,
-          NETXEN_NIU_REMOTE_LOOPBACK,
-          NETXEN_NIU_GB0_HALF_DUPLEX,
-          NETXEN_NIU_GB1_HALF_DUPLEX,
-          NETXEN_NIU_RESET_SYS_FIFOS,
-          NETXEN_NIU_GB_CRC_DROP,
-          NETXEN_NIU_GB_DROP_WRONGADDR,
-          NETXEN_NIU_TEST_MUX_CTL,
-
-          NETXEN_NIU_GB_MAC_CONFIG_0(0),
-          NETXEN_NIU_GB_MAC_CONFIG_1(0),
-          NETXEN_NIU_GB_HALF_DUPLEX_CTRL(0),
-          NETXEN_NIU_GB_MAX_FRAME_SIZE(0),
-          NETXEN_NIU_GB_TEST_REG(0),
-          NETXEN_NIU_GB_MII_MGMT_CONFIG(0),
-          NETXEN_NIU_GB_MII_MGMT_COMMAND(0),
-          NETXEN_NIU_GB_MII_MGMT_ADDR(0),
-          NETXEN_NIU_GB_MII_MGMT_CTRL(0),
-          NETXEN_NIU_GB_MII_MGMT_STATUS(0),
-          NETXEN_NIU_GB_MII_MGMT_INDICATE(0),
-          NETXEN_NIU_GB_INTERFACE_CTRL(0),
-          NETXEN_NIU_GB_INTERFACE_STATUS(0),
-          NETXEN_NIU_GB_STATION_ADDR_0(0),
-          NETXEN_NIU_GB_STATION_ADDR_1(0),
-          -1,
-          }
-         },
-        {
-         /* XG Mode */
-         {
-          NETXEN_NIU_XG_SINGLE_TERM,
-          NETXEN_NIU_XG_DRIVE_HI,
-          NETXEN_NIU_XG_DRIVE_LO,
-          NETXEN_NIU_XG_DTX,
-          NETXEN_NIU_XG_DEQ,
-          NETXEN_NIU_XG_WORD_ALIGN,
-          NETXEN_NIU_XG_RESET,
-          NETXEN_NIU_XG_POWER_DOWN,
-          NETXEN_NIU_XG_RESET_PLL,
-          NETXEN_NIU_XG_SERDES_LOOPBACK,
-          NETXEN_NIU_XG_DO_BYTE_ALIGN,
-          NETXEN_NIU_XG_TX_ENABLE,
-          NETXEN_NIU_XG_RX_ENABLE,
-          NETXEN_NIU_XG_STATUS,
-          NETXEN_NIU_XG_PAUSE_THRESHOLD,
-          NETXEN_NIU_XGE_CONFIG_0,
-          NETXEN_NIU_XGE_CONFIG_1,
-          NETXEN_NIU_XGE_IPG,
-          NETXEN_NIU_XGE_STATION_ADDR_0_HI,
-          NETXEN_NIU_XGE_STATION_ADDR_0_1,
-          NETXEN_NIU_XGE_STATION_ADDR_1_LO,
-          NETXEN_NIU_XGE_STATUS,
-          NETXEN_NIU_XGE_MAX_FRAME_SIZE,
-          NETXEN_NIU_XGE_PAUSE_FRAME_VALUE,
-          NETXEN_NIU_XGE_TX_BYTE_CNT,
-          NETXEN_NIU_XGE_TX_FRAME_CNT,
-          NETXEN_NIU_XGE_RX_BYTE_CNT,
-          NETXEN_NIU_XGE_RX_FRAME_CNT,
-          NETXEN_NIU_XGE_AGGR_ERROR_CNT,
-          NETXEN_NIU_XGE_MULTICAST_FRAME_CNT,
-          NETXEN_NIU_XGE_UNICAST_FRAME_CNT,
-          NETXEN_NIU_XGE_CRC_ERROR_CNT,
-          NETXEN_NIU_XGE_OVERSIZE_FRAME_ERR,
-          NETXEN_NIU_XGE_UNDERSIZE_FRAME_ERR,
-          NETXEN_NIU_XGE_LOCAL_ERROR_CNT,
-          NETXEN_NIU_XGE_REMOTE_ERROR_CNT,
-          NETXEN_NIU_XGE_CONTROL_CHAR_CNT,
-          NETXEN_NIU_XGE_PAUSE_FRAME_CNT,
-          -1,
-          }
-         }
-};
-
 static void
 netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 mode, *regs_buff = p;
-        int i, window;
+        struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+        struct nx_host_sds_ring *sds_ring;
+        u32 *regs_buff = p;
+        int ring, i = 0;
+        int port = adapter->physical_port;
 
         memset(p, 0, NETXEN_NIC_REGS_LEN);
+
         regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
             (adapter->pdev)->device;
-        /* which mode */
-        regs_buff[0] = NXRD32(adapter, NETXEN_NIU_MODE);
-        mode = regs_buff[0];
-
-        /* Common registers to all the modes */
-        regs_buff[2] = NXRD32(adapter, NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);
-        /* GB/XGB Mode */
-        mode = (mode / 2) - 1;
-        window = 0;
-        if (mode <= 1) {
-                for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
-                        /* GB: port specific registers */
-                        if (mode == 0 && i >= 19)
-                                window = adapter->physical_port *
-                                        NETXEN_NIC_PORT_WINDOW;
-
-                        regs_buff[i] = NXRD32(adapter,
-                                niu_registers[mode].reg[i - 3] + window);
-                }
 
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return;
+
+        regs_buff[i++] = NXRD32(adapter, CRB_CMDPEG_STATE);
+        regs_buff[i++] = NXRD32(adapter, CRB_RCVPEG_STATE);
+        regs_buff[i++] = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
+        regs_buff[i++] = NXRDIO(adapter, adapter->crb_int_state_reg);
+        regs_buff[i++] = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+        regs_buff[i++] = NXRD32(adapter, NX_CRB_DEV_STATE);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_HALT_STATUS2);
+
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_0+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_1+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_2+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_3+0x3c);
+
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+
+                regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_4+0x3c);
+                i += 2;
+
+                regs_buff[i++] = NXRD32(adapter, CRB_XG_STATE_P3);
+                regs_buff[i++] = le32_to_cpu(*(adapter->tx_ring->hw_consumer));
+
+        } else {
+                i++;
+
+                regs_buff[i++] = NXRD32(adapter,
+                                        NETXEN_NIU_XGE_CONFIG_0+(0x10000*port));
+                regs_buff[i++] = NXRD32(adapter,
+                                        NETXEN_NIU_XGE_CONFIG_1+(0x10000*port));
+
+                regs_buff[i++] = NXRD32(adapter, CRB_XG_STATE);
+                regs_buff[i++] = NXRDIO(adapter,
+                                 adapter->tx_ring->crb_cmd_consumer);
+        }
+
+        regs_buff[i++] = NXRDIO(adapter, adapter->tx_ring->crb_cmd_producer);
+
+        regs_buff[i++] = NXRDIO(adapter,
+                         recv_ctx->rds_rings[0].crb_rcv_producer);
+        regs_buff[i++] = NXRDIO(adapter,
+                         recv_ctx->rds_rings[1].crb_rcv_producer);
+
+        regs_buff[i++] = adapter->max_sds_rings;
+
+        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                sds_ring = &(recv_ctx->sds_rings[ring]);
+                regs_buff[i++] = NXRDIO(adapter,
+                                        sds_ring->crb_sts_consumer);
         }
 }
 
 static u32 netxen_nic_test_link(struct net_device *dev)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 status;
-        int val;
+        u32 val, port;
 
-        /* read which mode */
-        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                if (adapter->phy_read &&
-                    adapter->phy_read(adapter,
-                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                      &status) != 0)
-                        return -EIO;
-                else {
-                        val = netxen_get_phy_link(status);
-                        return !val;
-                }
-        } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
+        port = adapter->physical_port;
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                val = NXRD32(adapter, CRB_XG_STATE_P3);
+                val = XG_LINK_STATE_P3(adapter->ahw.pci_func, val);
+                return (val == XG_LINK_UP_P3) ? 0 : 1;
+        } else {
                 val = NXRD32(adapter, CRB_XG_STATE);
+                val = (val >> port*8) & 0xff;
                 return (val == XG_LINK_UP) ? 0 : 1;
         }
-        return -EIO;
 }
 
 static int
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 2e364fee3cbb..85e28e60ecf1 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -345,8 +345,7 @@ netxen_pcie_sem_lock(struct netxen_adapter *adapter, int sem, u32 id_reg)
 void
 netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem)
 {
-        int val;
-        val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
+        NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
 }
 
 int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
@@ -691,6 +690,9 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)
         struct list_head *head;
         nx_mac_list_t *cur;
 
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return;
+
         list_splice_tail_init(&adapter->mac_list, &del_list);
 
         nx_p3_nic_add_mac(adapter, adapter->mac_addr, &del_list);
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 02f8d4b4db63..64cff68d372c 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -184,6 +184,8 @@ skip_rds:
 
         tx_ring = adapter->tx_ring;
         vfree(tx_ring->cmd_buf_arr);
+        kfree(tx_ring);
+        adapter->tx_ring = NULL;
 }
 
 int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
@@ -782,7 +784,7 @@ netxen_need_fw_reset(struct netxen_adapter *adapter)
         if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED)
                 return 1;
 
-        old_count = count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+        old_count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
 
         for (i = 0; i < 10; i++) {
 
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 6cae26a5bd67..9f9d6081959b 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -340,7 +340,7 @@ netxen_check_hw_init(struct netxen_adapter *adapter, int first_boot)
                 if (!(first_boot & 0x4)) {
                         first_boot |= 0x4;
                         NXWR32(adapter, NETXEN_PCIE_REG(0x4), first_boot);
-                        first_boot = NXRD32(adapter, NETXEN_PCIE_REG(0x4));
+                        NXRD32(adapter, NETXEN_PCIE_REG(0x4));
                 }
 
                 /* This is the first boot after power up */
@@ -1898,12 +1898,8 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)
                 linkup = (val == XG_LINK_UP_P3);
         } else {
                 val = NXRD32(adapter, CRB_XG_STATE);
-                if (adapter->ahw.port_type == NETXEN_NIC_GBE)
-                        linkup = (val >> port) & 1;
-                else {
-                        val = (val >> port*8) & 0xff;
-                        linkup = (val == XG_LINK_UP);
-                }
+                val = (val >> port*8) & 0xff;
+                linkup = (val == XG_LINK_UP);
         }
 
         netxen_advert_link_change(adapter, linkup);
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 8ce58c4c7dd3..2aed2b382c40 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -2844,7 +2844,7 @@ static int tcam_wait_bit(struct niu *np, u64 bit)
                         break;
                 udelay(1);
         }
-        if (limit < 0)
+        if (limit <= 0)
                 return -ENODEV;
 
         return 0;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 813aca3fc433..7b17404d0858 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -717,6 +717,7 @@ static struct pcmcia_device_id fmvj18x_ids[] = {
         PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
+        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0e01),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),
         PCMCIA_DEVICE_NULL,
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 8a5ae3b182ed..12e3233868e9 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1402,7 +1402,6 @@ static void BuildLAF(int *ladrf, int *adr)
   for (i = 0; i < 8; i++)
     printk(KERN_CONT " %02X", ladrf[i]);
   printk(KERN_CONT "\n");
-  }
 #endif
 } /* BuildLAF */
 
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 92ed3fbf89a5..776cad2f5715 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1741,7 +1741,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"),
         PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "cis/DP83903.cis"),
         PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"),
+        PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "cis/PE520.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"),
@@ -1754,7 +1754,7 @@ MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);
 MODULE_FIRMWARE("cis/PCMLM28.cis");
 MODULE_FIRMWARE("cis/DP83903.cis");
 MODULE_FIRMWARE("cis/LA-PCM.cis");
-MODULE_FIRMWARE("PE520.cis");
+MODULE_FIRMWARE("cis/PE520.cis");
 MODULE_FIRMWARE("cis/NE2K.cis");
 MODULE_FIRMWARE("cis/PE-200.cis");
 MODULE_FIRMWARE("cis/tamarack.cis");
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index c13cf64095b6..33c4b12a63ba 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -331,8 +331,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
         bool clk125en = true;
 
         /* Abort if we are using an untested phy. */
-        if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 ||
-            BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 ||
+        if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&
+            BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
             BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M)
                 return;
 
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index bd4e8d72dc08..e17b70291bbc 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -264,6 +264,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
                 (phydev->phy_id & phydrv->phy_id_mask));
 }
 
+#ifdef CONFIG_PM
+
 static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
 {
         struct device_driver *drv = phydev->dev.driver;
@@ -295,34 +297,88 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
         return true;
 }
 
-/* Suspend and resume.  Copied from platform_suspend and
- * platform_resume
- */
-static int mdio_bus_suspend(struct device * dev, pm_message_t state)
+static int mdio_bus_suspend(struct device *dev)
 {
         struct phy_driver *phydrv = to_phy_driver(dev->driver);
         struct phy_device *phydev = to_phy_device(dev);
 
+        /*
+         * We must stop the state machine manually, otherwise it stops out of
+         * control, possibly with the phydev->lock held. Upon resume, netdev
+         * may call phy routines that try to grab the same lock, and that may
+         * lead to a deadlock.
+         */
+        if (phydev->attached_dev)
+                phy_stop_machine(phydev);
+
         if (!mdio_bus_phy_may_suspend(phydev))
                 return 0;
+
         return phydrv->suspend(phydev);
 }
 
-static int mdio_bus_resume(struct device * dev)
+static int mdio_bus_resume(struct device *dev)
 {
         struct phy_driver *phydrv = to_phy_driver(dev->driver);
         struct phy_device *phydev = to_phy_device(dev);
+        int ret;
 
         if (!mdio_bus_phy_may_suspend(phydev))
+                goto no_resume;
+
+        ret = phydrv->resume(phydev);
+        if (ret < 0)
+                return ret;
+
+no_resume:
+        if (phydev->attached_dev)
+                phy_start_machine(phydev, NULL);
+
+        return 0;
+}
+
+static int mdio_bus_restore(struct device *dev)
+{
+        struct phy_device *phydev = to_phy_device(dev);
+        struct net_device *netdev = phydev->attached_dev;
+        int ret;
+
+        if (!netdev)
                 return 0;
-        return phydrv->resume(phydev);
+
+        ret = phy_init_hw(phydev);
+        if (ret < 0)
+                return ret;
+
+        /* The PHY needs to renegotiate. */
+        phydev->link = 0;
+        phydev->state = PHY_UP;
+
+        phy_start_machine(phydev, NULL);
+
+        return 0;
 }
 
+static struct dev_pm_ops mdio_bus_pm_ops = {
+        .suspend = mdio_bus_suspend,
+        .resume = mdio_bus_resume,
+        .freeze = mdio_bus_suspend,
+        .thaw = mdio_bus_resume,
+        .restore = mdio_bus_restore,
+};
+
+#define MDIO_BUS_PM_OPS (&mdio_bus_pm_ops)
+
+#else
+
+#define MDIO_BUS_PM_OPS NULL
+
+#endif /* CONFIG_PM */
+
 struct bus_type mdio_bus_type = {
         .name           = "mdio_bus",
         .match          = mdio_bus_match,
-        .suspend        = mdio_bus_suspend,
-        .resume         = mdio_bus_resume,
+        .pm             = MDIO_BUS_PM_OPS,
 };
 EXPORT_SYMBOL(mdio_bus_type);
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index b0e9f9c51721..0295097d6c44 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -410,7 +410,6 @@ EXPORT_SYMBOL(phy_start_aneg);
 
 
 static void phy_change(struct work_struct *work);
-static void phy_state_machine(struct work_struct *work);
 
 /**
  * phy_start_machine - start PHY state machine tracking
@@ -430,7 +429,6 @@ void phy_start_machine(struct phy_device *phydev,
 {
         phydev->adjust_state = handler;
 
-        INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine);
         schedule_delayed_work(&phydev->state_queue, HZ);
 }
 
@@ -761,7 +759,7 @@ EXPORT_SYMBOL(phy_start);
  * phy_state_machine - Handle the state machine
  * @work: work_struct that describes the work to be done
  */
-static void phy_state_machine(struct work_struct *work)
+void phy_state_machine(struct work_struct *work)
 {
         struct delayed_work *dwork = to_delayed_work(work);
         struct phy_device *phydev =
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index b10fedd82143..adbc0fded130 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -177,6 +177,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
         dev->state = PHY_DOWN;
 
         mutex_init(&dev->lock);
+        INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
 
         return dev;
 }
@@ -378,6 +379,20 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
+int phy_init_hw(struct phy_device *phydev)
+{
+        int ret;
+
+        if (!phydev->drv || !phydev->drv->config_init)
+                return 0;
+
+        ret = phy_scan_fixups(phydev);
+        if (ret < 0)
+                return ret;
+
+        return phydev->drv->config_init(phydev);
+}
+
 /**
  * phy_attach_direct - attach a network device to a given PHY device pointer
  * @dev: network device to attach
@@ -425,21 +440,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         /* Do initial configuration here, now that
          * we have certain key parameters
          * (dev_flags and interface) */
-        if (phydev->drv->config_init) {
-                int err;
-
-                err = phy_scan_fixups(phydev);
-
-                if (err < 0)
-                        return err;
-
-                err = phydev->drv->config_init(phydev);
-
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
+        return phy_init_hw(phydev);
 }
 EXPORT_SYMBOL(phy_attach_direct);
 
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 707b391afa02..894a7c84faef 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4119,7 +4119,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         err = pcie_set_readrq(pdev, 4096);
         if (err) {
                 dev_err(&pdev->dev, "Set readrq failed.\n");
-                goto err_out;
+                goto err_out1;
         }
 
         err = pci_request_regions(pdev, DRV_NAME);
@@ -4140,7 +4140,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
 
         if (err) {
                 dev_err(&pdev->dev, "No usable DMA configuration.\n");
-                goto err_out;
+                goto err_out2;
         }
 
         /* Set PCIe reset type for EEH to fundamental. */
@@ -4152,7 +4152,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         if (!qdev->reg_base) {
                 dev_err(&pdev->dev, "Register mapping failed.\n");
                 err = -ENOMEM;
-                goto err_out;
+                goto err_out2;
         }
 
         qdev->doorbell_area_size = pci_resource_len(pdev, 3);
@@ -4162,14 +4162,14 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         if (!qdev->doorbell_area) {
                 dev_err(&pdev->dev, "Doorbell register mapping failed.\n");
                 err = -ENOMEM;
-                goto err_out;
+                goto err_out2;
         }
 
         err = ql_get_board_info(qdev);
         if (err) {
                 dev_err(&pdev->dev, "Register access failed.\n");
                 err = -EIO;
-                goto err_out;
+                goto err_out2;
         }
         qdev->msg_enable = netif_msg_init(debug, default_msg);
         spin_lock_init(&qdev->hw_lock);
@@ -4179,7 +4179,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         err = qdev->nic_ops->get_flash(qdev);
         if (err) {
                 dev_err(&pdev->dev, "Invalid FLASH.\n");
-                goto err_out;
+                goto err_out2;
         }
 
         memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);
@@ -4212,8 +4212,9 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
                          DRV_NAME, DRV_VERSION);
         }
         return 0;
-err_out:
+err_out2:
         ql_release_all(pdev);
+err_out1:
         pci_disable_device(pdev);
         return err;
 }
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 20a71749154a..1c257098d0a6 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1293,7 +1293,7 @@ static void rr_dump(struct net_device *dev)
 
         printk("Error code 0x%x\n", readl(&regs->Fail1));
 
-        index = (((readl(&regs->EvtPrd) >> 8) & 0xff ) - 1) % EVT_RING_ENTRIES;
+        index = (((readl(&regs->EvtPrd) >> 8) & 0xff) - 1) % TX_RING_ENTRIES;
         cons = rrpriv->dirty_tx;
         printk("TX ring index %i, TX consumer %i\n",
                index, cons);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index cc4218667cba..3c4836d0898f 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3421,7 +3421,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
                                 break;
                         }
                 } else {
-                        if (!(val64 & busy_bit)) {
+                        if (val64 & busy_bit) {
                                 ret = SUCCESS;
                                 break;
                         }
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index 683353b904c7..9f035b9f0350 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -142,8 +142,9 @@ static int efx_mcdi_poll(struct efx_nic *efx)
                 if (spins != 0) {
                         --spins;
                         udelay(1);
-                } else
-                        schedule();
+                } else {
+                        schedule_timeout_uninterruptible(1);
+                }
 
                 time = get_seconds();
 
@@ -803,7 +804,7 @@ int efx_mcdi_nvram_read(struct efx_nic *efx, unsigned int type,
                         loff_t offset, u8 *buffer, size_t length)
 {
         u8 inbuf[MC_CMD_NVRAM_READ_IN_LEN];
-        u8 outbuf[MC_CMD_NVRAM_READ_OUT_LEN(length)];
+        u8 outbuf[MC_CMD_NVRAM_READ_OUT_LEN(EFX_MCDI_NVRAM_LEN_MAX)];
         size_t outlen;
         int rc;
 
@@ -827,7 +828,7 @@ fail:
 int efx_mcdi_nvram_write(struct efx_nic *efx, unsigned int type,
                            loff_t offset, const u8 *buffer, size_t length)
 {
-        u8 inbuf[MC_CMD_NVRAM_WRITE_IN_LEN(length)];
+        u8 inbuf[MC_CMD_NVRAM_WRITE_IN_LEN(EFX_MCDI_NVRAM_LEN_MAX)];
         int rc;
 
         MCDI_SET_DWORD(inbuf, NVRAM_WRITE_IN_TYPE, type);
@@ -837,7 +838,8 @@ int efx_mcdi_nvram_write(struct efx_nic *efx, unsigned int type,
 
         BUILD_BUG_ON(MC_CMD_NVRAM_WRITE_OUT_LEN != 0);
 
-        rc = efx_mcdi_rpc(efx, MC_CMD_NVRAM_WRITE, inbuf, sizeof(inbuf),
+        rc = efx_mcdi_rpc(efx, MC_CMD_NVRAM_WRITE, inbuf,
+                          ALIGN(MC_CMD_NVRAM_WRITE_IN_LEN(length), 4),
                           NULL, 0, NULL);
         if (rc)
                 goto fail;
diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/sfc/mcdi.h
index de916728c2e3..10ce98f4c0fb 100644
--- a/drivers/net/sfc/mcdi.h
+++ b/drivers/net/sfc/mcdi.h
@@ -111,6 +111,7 @@ extern int efx_mcdi_nvram_read(struct efx_nic *efx, unsigned int type,
 extern int efx_mcdi_nvram_write(struct efx_nic *efx, unsigned int type,
                                 loff_t offset, const u8 *buffer,
                                 size_t length);
+#define EFX_MCDI_NVRAM_LEN_MAX 128
 extern int efx_mcdi_nvram_erase(struct efx_nic *efx, unsigned int type,
                                 loff_t offset, size_t length);
 extern int efx_mcdi_nvram_update_finish(struct efx_nic *efx,
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/sfc/mcdi_pcol.h
index 2a85360a46f0..73e71f420624 100644
--- a/drivers/net/sfc/mcdi_pcol.h
+++ b/drivers/net/sfc/mcdi_pcol.h
@@ -1090,8 +1090,10 @@
 #define MC_CMD_MAC_RX_LANES01_DISP_ERR 57
 #define MC_CMD_MAC_RX_LANES23_DISP_ERR 58
 #define MC_CMD_MAC_RX_MATCH_FAULT 59
+#define MC_CMD_GMAC_DMABUF_START 64
+#define MC_CMD_GMAC_DMABUF_END   95
 /* Insert new members here. */
-#define MC_CMD_MAC_GENERATION_END 60
+#define MC_CMD_MAC_GENERATION_END 96
 #define MC_CMD_MAC_NSTATS (MC_CMD_MAC_GENERATION_END+1)
 
 /* MC_CMD_MAC_STATS:
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c
index 3a464529a46b..407bbaddfea6 100644
--- a/drivers/net/sfc/mtd.c
+++ b/drivers/net/sfc/mtd.c
@@ -23,7 +23,6 @@
 #include "mcdi_pcol.h"
 
 #define EFX_SPI_VERIFY_BUF_LEN 16
-#define EFX_MCDI_CHUNK_LEN 128
 
 struct efx_mtd_partition {
         struct mtd_info mtd;
@@ -428,7 +427,7 @@ static int siena_mtd_read(struct mtd_info *mtd, loff_t start,
         int rc = 0;
 
         while (offset < end) {
-                chunk = min_t(size_t, end - offset, EFX_MCDI_CHUNK_LEN);
+                chunk = min_t(size_t, end - offset, EFX_MCDI_NVRAM_LEN_MAX);
                 rc = efx_mcdi_nvram_read(efx, part->mcdi.nvram_type, offset,
                                          buffer, chunk);
                 if (rc)
@@ -491,7 +490,7 @@ static int siena_mtd_write(struct mtd_info *mtd, loff_t start,
         }
 
         while (offset < end) {
-                chunk = min_t(size_t, end - offset, EFX_MCDI_CHUNK_LEN);
+                chunk = min_t(size_t, end - offset, EFX_MCDI_NVRAM_LEN_MAX);
                 rc = efx_mcdi_nvram_write(efx, part->mcdi.nvram_type, offset,
                                           buffer, chunk);
                 if (rc)
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index ff8f0a417fa3..e0d13a451019 100644
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -318,12 +318,6 @@ static int qt202x_reset_phy(struct efx_nic *efx)
         /* Wait 250ms for the PHY to complete bootup */
         msleep(250);
 
-        /* Check that all the MMDs we expect are present and responding. We
-         * expect faults on some if the link is down, but not on the PHY XS */
-        rc = efx_mdio_check_mmds(efx, QT202X_REQUIRED_DEVS, MDIO_DEVS_PHYXS);
-        if (rc < 0)
-                goto fail;
-
         falcon_board(efx)->type->init_phy(efx);
 
         return rc;
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index af3933579790..250c8827b842 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -79,10 +79,14 @@ struct efx_loopback_state {
 static int efx_test_mdio(struct efx_nic *efx, struct efx_self_tests *tests)
 {
         int rc = 0;
-        int devad = __ffs(efx->mdio.mmds);
+        int devad;
         u16 physid1, physid2;
 
-        if (efx->phy_type == PHY_TYPE_NONE)
+        if (efx->mdio.mode_support & MDIO_SUPPORTS_C45)
+                devad = __ffs(efx->mdio.mmds);
+        else if (efx->mdio.mode_support & MDIO_SUPPORTS_C22)
+                devad = MDIO_DEVAD_NONE;
+        else
                 return 0;
 
         mutex_lock(&efx->mac_lock);
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index ca6285016dfd..7402b858cab7 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -110,7 +110,7 @@ static void sh_eth_reset(struct net_device *ndev)
                 mdelay(1);
                 cnt--;
         }
-        if (cnt < 0)
+        if (cnt == 0)
                 printk(KERN_ERR "Device reset fail\n");
 
         /* Table Init */
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1c01b96c9611..d760650c5c04 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -644,6 +644,7 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
 {
         u32 reg1;
 
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 &= ~phy_power[port];
 
@@ -651,6 +652,7 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
                 reg1 |= coma_mode[port];
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         sky2_pci_read32(hw, PCI_DEV_REG1);
 
         if (hw->chip_id == CHIP_ID_YUKON_FE)
@@ -707,9 +709,11 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_PDOWN);
         }
 
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 |= phy_power[port];                /* set PHY to PowerDown/COMA Mode */
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 /* Force a renegotiation */
@@ -1844,7 +1848,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
         sky2->tx_cons = idx;
         smp_mb();
 
-        if (tx_avail(sky2) > MAX_SKB_TX_LE + 4)
+        /* Wake unless it's detached, and called e.g. from sky2_down() */
+        if (tx_avail(sky2) > MAX_SKB_TX_LE + 4 && netif_device_present(dev))
                 netif_wake_queue(dev);
 }
 
@@ -2148,7 +2153,9 @@ static void sky2_qlink_intr(struct sky2_hw *hw)
 
         /* reset PHY Link Detect */
         phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         sky2_link_up(sky2);
 }
@@ -2639,6 +2646,7 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
@@ -2646,12 +2654,14 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                 sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_IS_PCI_EXP) {
                 /* PCI-Express uncorrectable Error occurred */
                 u32 err;
 
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
                 sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
                              0xfffffffful);
@@ -2659,6 +2669,7 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                         dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
                 sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_HWE_L1_MASK)
@@ -3037,6 +3048,7 @@ static void sky2_reset(struct sky2_hw *hw)
         }
 
         sky2_power_on(hw);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         for (i = 0; i < hw->ports; i++) {
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -3073,6 +3085,7 @@ static void sky2_reset(struct sky2_hw *hw)
                 reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
 
                 /* reset PHY Link Detect */
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4,
                                  reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3090,6 +3103,7 @@ static void sky2_reset(struct sky2_hw *hw)
                         /* restore the PCIe Link Control register */
                         sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
                 }
+                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                 /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
                 sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));
@@ -3227,6 +3241,27 @@ static inline u8 sky2_wol_supported(const struct sky2_hw *hw)
         return sky2_is_copper(hw) ? (WAKE_PHY | WAKE_MAGIC) : 0;
 }
 
+static void sky2_hw_set_wol(struct sky2_hw *hw)
+{
+        int wol = 0;
+        int i;
+
+        for (i = 0; i < hw->ports; i++) {
+                struct net_device *dev = hw->dev[i];
+                struct sky2_port *sky2 = netdev_priv(dev);
+
+                if (sky2->wol)
+                        wol = 1;
+        }
+
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U ||
+            hw->chip_id == CHIP_ID_YUKON_EX ||
+            hw->chip_id == CHIP_ID_YUKON_FE_P)
+                sky2_write32(hw, B0_CTST, wol ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
+
+        device_set_wakeup_enable(&hw->pdev->dev, wol);
+}
+
 static void sky2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         const struct sky2_port *sky2 = netdev_priv(dev);
@@ -3246,13 +3281,7 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 
         sky2->wol = wol->wolopts;
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U ||
-            hw->chip_id == CHIP_ID_YUKON_EX ||
-            hw->chip_id == CHIP_ID_YUKON_FE_P)
-                sky2_write32(hw, B0_CTST, sky2->wol
-                             ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
-
-        device_set_wakeup_enable(&hw->pdev->dev, sky2->wol);
+        sky2_hw_set_wol(hw);
 
         if (!netif_running(dev))
                 sky2_wol_init(sky2);
@@ -4684,6 +4713,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         INIT_WORK(&hw->restart_work, sky2_restart);
 
         pci_set_drvdata(pdev, hw);
+        pdev->d3_delay = 150;
 
         return 0;
 
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3a74d2168598..7f82b0238e08 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2005-2009 Broadcom Corporation.
+ * Copyright (C) 2005-2010 Broadcom Corporation.
  *
  * Firmware is:
  *      Derived from proprietary unpublished source code,
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.105"
-#define DRV_MODULE_RELDATE      "December 2, 2009"
+#define DRV_MODULE_VERSION      "3.106"
+#define DRV_MODULE_RELDATE      "January 12, 2010"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -1037,7 +1037,11 @@ static void tg3_mdio_start(struct tg3 *tp)
                 else
                         tp->phy_addr = 1;
 
-                is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
+                if (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
+                        is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
+                else
+                        is_serdes = tr32(TG3_CPMU_PHY_STRAP) &
+                                    TG3_CPMU_PHY_STRAP_IS_SERDES;
                 if (is_serdes)
                         tp->phy_addr += 7;
         } else
@@ -4693,8 +4697,9 @@ next_pkt:
                 (*post_ptr)++;
 
                 if (unlikely(rx_std_posted >= tp->rx_std_max_post)) {
-                        u32 idx = *post_ptr % TG3_RX_RING_SIZE;
-                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG, idx);
+                        tpr->rx_std_prod_idx = std_prod_idx % TG3_RX_RING_SIZE;
+                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG,
+                                     tpr->rx_std_prod_idx);
                         work_mask &= ~RXD_OPAQUE_RING_STD;
                         rx_std_posted = 0;
                 }
@@ -7742,7 +7747,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              ((u64) tpr->rx_std_mapping >> 32));
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
              ((u64) tpr->rx_std_mapping & 0xffffffff));
-        if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS))
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
                 tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
                      NIC_SRAM_RX_BUFFER_DESC);
 
@@ -12122,7 +12127,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 
                 tp->phy_id = eeprom_phy_id;
                 if (eeprom_phy_serdes) {
-                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
                                 tp->tg3_flags2 |= TG3_FLG2_MII_SERDES;
                         else
                                 tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
@@ -13384,6 +13390,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (err)
                 return err;
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+            (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 ||
+                 (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+                return -ENOTSUPP;
+
         /* Initialize data/descriptor byte/word swapping. */
         val = tr32(GRC_MODE);
         val &= GRC_MODE_HOST_STACKUP;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index cd30889650f8..8a167912902b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
+ * Copyright (C) 2007-2010 Broadcom Corporation.
  */
 
 #ifndef _T3_H
@@ -1054,6 +1055,8 @@
 #define  CPMU_MUTEX_REQ_DRIVER           0x00001000
 #define TG3_CPMU_MUTEX_GNT              0x00003660
 #define  CPMU_MUTEX_GNT_DRIVER           0x00001000
+#define TG3_CPMU_PHY_STRAP              0x00003664
+#define TG3_CPMU_PHY_STRAP_IS_SERDES     0x00000020
 /* 0x3664 --> 0x3800 unused */
 
 /* Mbuf cluster free registers */
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 1cc8cf4425d1..516713fa0a05 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -101,6 +101,10 @@ config TULIP_NAPI_HW_MITIGATION
 
           If in doubt, say Y.
 
+config TULIP_DM910X
+        def_bool y
+        depends on TULIP && SPARC
+
 config DE4X5
         tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
         depends on PCI || EISA
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ad63621913c3..6f44ebf58910 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -92,6 +92,10 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
+#ifdef CONFIG_TULIP_DM910X
+#include <linux/of.h>
+#endif
+
 
 /* Board/System/Debug information/definition ---------------- */
 #define PCI_DM9132_ID   0x91321282      /* Davicom DM9132 ID */
@@ -377,6 +381,23 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         if (!printed_version++)
                 printk(version);
 
+        /*
+         *      SPARC on-board DM910x chips should be handled by the main
+         *      tulip driver, except for early DM9100s.
+         */
+#ifdef CONFIG_TULIP_DM910X
+        if ((ent->driver_data == PCI_DM9100_ID && pdev->revision >= 0x30) ||
+            ent->driver_data == PCI_DM9102_ID) {
+                struct device_node *dp = pci_device_to_OF_node(pdev);
+
+                if (dp && of_get_property(dp, "local-mac-address", NULL)) {
+                        printk(KERN_INFO DRV_NAME
+                               ": skipping on-board DM910x (use tulip)\n");
+                        return -ENODEV;
+                }
+        }
+#endif
+
         /* Init network device */
         dev = alloc_etherdev(sizeof(*db));
         if (dev == NULL)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 0fa3140d65bf..20696b5d60a5 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -196,9 +196,13 @@ struct tulip_chip_table tulip_tbl[] = {
         | HAS_NWAY | HAS_PCI_MWI, tulip_timer, tulip_media_task },
 
   /* DM910X */
+#ifdef CONFIG_TULIP_DM910X
   { "Davicom DM9102/DM9102A", 128, 0x0001ebef,
         HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI,
         tulip_timer, tulip_media_task },
+#else
+  { NULL },
+#endif
 
   /* RS7112 */
   { "Conexant LANfinity", 256, 0x0001ebef,
@@ -228,8 +232,10 @@ static struct pci_device_id tulip_pci_tbl[] = {
         { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
         { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 },
+#ifdef CONFIG_TULIP_DM910X
         { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
         { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
+#endif
         { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
         { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
@@ -243,6 +249,7 @@ static struct pci_device_id tulip_pci_tbl[] = {
         { 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */
         { 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */
+        { 0x1414, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Microsoft MN-120 */
         { 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { } /* terminate list */
 };
@@ -1299,18 +1306,30 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         }
 
         /*
-         *      Early DM9100's need software CRC and the DMFE driver
+         *      DM910x chips should be handled by the dmfe driver, except
+         *      on-board chips on SPARC systems.  Also, early DM9100s need
+         *      software CRC which only the dmfe driver supports.
          */
 
-        if (pdev->vendor == 0x1282 && pdev->device == 0x9100)
-        {
-                /* Read Chip revision */
-                if (pdev->revision < 0x30)
-                {
-                        printk(KERN_ERR PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
+#ifdef CONFIG_TULIP_DM910X
+        if (chip_idx == DM910X) {
+                struct device_node *dp;
+
+                if (pdev->vendor == 0x1282 && pdev->device == 0x9100 &&
+                    pdev->revision < 0x30) {
+                        printk(KERN_INFO PFX
+                               "skipping early DM9100 with Crc bug (use dmfe)\n");
+                        return -ENODEV;
+                }
+
+                dp = pci_device_to_OF_node(pdev);
+                if (!(dp && of_get_property(dp, "local-mac-address", NULL))) {
+                        printk(KERN_INFO PFX
+                               "skipping DM910x expansion card (use dmfe)\n");
                         return -ENODEV;
                 }
         }
+#endif
 
         /*
          *      Looks for early PCI chipsets where people report hangs
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 41ad2f3697c7..eb8fe7e16c6c 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3279,13 +3279,12 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
                 /* Handle the transmitted buffer and release */
                 /* the BD to be used with the current frame  */
 
-                if (bd == ugeth->txBd[txQ]) /* queue empty? */
+                skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];
+                if (!skb)
                         break;
 
                 dev->stats.tx_packets++;
 
-                skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];
-
                 if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN &&
                              skb_recycle_check(skb,
                                     ugeth->ug_info->uf_info.max_rx_buf_length +
@@ -3607,6 +3606,7 @@ static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state)
         if (!netif_running(ndev))
                 return 0;
 
+        netif_device_detach(ndev);
         napi_disable(&ugeth->napi);
 
         /*
@@ -3665,7 +3665,7 @@ static int ucc_geth_resume(struct of_device *ofdev)
         phy_start(ugeth->phydev);
 
         napi_enable(&ugeth->napi);
-        netif_start_queue(ndev);
+        netif_device_attach(ndev);
 
         return 0;
 }
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index a007e2acf651..ef1fbeb11c6e 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -838,13 +838,13 @@ struct ucc_geth_hardware_statistics {
                                                            using the maximum is
                                                            easier */
 #define UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT  32
-#define UCC_GETH_SCHEDULER_ALIGNMENT            4       /* This is a guess */
+#define UCC_GETH_SCHEDULER_ALIGNMENT            8       /* This is a guess */
 #define UCC_GETH_TX_STATISTICS_ALIGNMENT        4       /* This is a guess */
 #define UCC_GETH_RX_STATISTICS_ALIGNMENT        4       /* This is a guess */
 #define UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT      64
 #define UCC_GETH_RX_BD_QUEUES_ALIGNMENT         8       /* This is a guess */
 #define UCC_GETH_RX_PREFETCHED_BDS_ALIGNMENT    128     /* This is a guess */
-#define UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT 4    /* This
+#define UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT 8    /* This
                                                                            is a
                                                                            guess
                                                                          */
@@ -899,16 +899,17 @@ struct ucc_geth_hardware_statistics {
 #define UCC_GETH_UTFS_INIT                      512     /* Tx virtual FIFO size
                                                          */
 #define UCC_GETH_UTFET_INIT                     256     /* 1/2 utfs */
-#define UCC_GETH_UTFTT_INIT                     128
+#define UCC_GETH_UTFTT_INIT                     512
 /* Gigabit Ethernet (1000 Mbps) */
 #define UCC_GETH_URFS_GIGA_INIT                 4096/*2048*/    /* Rx virtual
                                                                    FIFO size */
 #define UCC_GETH_URFET_GIGA_INIT                2048/*1024*/    /* 1/2 urfs */
 #define UCC_GETH_URFSET_GIGA_INIT               3072/*1536*/    /* 3/4 urfs */
-#define UCC_GETH_UTFS_GIGA_INIT                 8192/*2048*/    /* Tx virtual
+#define UCC_GETH_UTFS_GIGA_INIT                 4096/*2048*/    /* Tx virtual
+                                                                   FIFO size */
+#define UCC_GETH_UTFET_GIGA_INIT                2048/*1024*/    /* 1/2 utfs */
+#define UCC_GETH_UTFTT_GIGA_INIT                4096/*0x40*/    /* Tx virtual
                                                                    FIFO size */
-#define UCC_GETH_UTFET_GIGA_INIT                4096/*1024*/    /* 1/2 utfs */
-#define UCC_GETH_UTFTT_GIGA_INIT                0x400/*0x40*/   /* */
 
 #define UCC_GETH_REMODER_INIT                   0       /* bits that must be
                                                            set */
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index f78f0903b073..6895f1531238 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -286,6 +286,7 @@ struct hso_device {
         u8 usb_gone;
         struct work_struct async_get_intf;
         struct work_struct async_put_intf;
+        struct work_struct reset_device;
 
         struct usb_device *usb;
         struct usb_interface *interface;
@@ -332,7 +333,8 @@ static void hso_kick_transmit(struct hso_serial *serial);
 /* Helper functions */
 static int hso_mux_submit_intr_urb(struct hso_shared_int *mux_int,
                                    struct usb_device *usb, gfp_t gfp);
-static void log_usb_status(int status, const char *function);
+static void handle_usb_error(int status, const char *function,
+                             struct hso_device *hso_dev);
 static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
                                                   int type, int dir);
 static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports);
@@ -350,6 +352,7 @@ static void async_put_intf(struct work_struct *data);
 static int hso_put_activity(struct hso_device *hso_dev);
 static int hso_get_activity(struct hso_device *hso_dev);
 static void tiocmget_intr_callback(struct urb *urb);
+static void reset_device(struct work_struct *data);
 /*****************************************************************************/
 /* Helping functions                                                         */
 /*****************************************************************************/
@@ -461,10 +464,17 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x7501)},           /* GTM 382 */
         {USB_DEVICE(0x0af0, 0x7601)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7701)},
+        {USB_DEVICE(0x0af0, 0x7706)},
         {USB_DEVICE(0x0af0, 0x7801)},
         {USB_DEVICE(0x0af0, 0x7901)},
+        {USB_DEVICE(0x0af0, 0x7A01)},
+        {USB_DEVICE(0x0af0, 0x7A05)},
         {USB_DEVICE(0x0af0, 0x8200)},
         {USB_DEVICE(0x0af0, 0x8201)},
+        {USB_DEVICE(0x0af0, 0x8300)},
+        {USB_DEVICE(0x0af0, 0x8302)},
+        {USB_DEVICE(0x0af0, 0x8304)},
+        {USB_DEVICE(0x0af0, 0x8400)},
         {USB_DEVICE(0x0af0, 0xd035)},
         {USB_DEVICE(0x0af0, 0xd055)},
         {USB_DEVICE(0x0af0, 0xd155)},
@@ -473,6 +483,8 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0xd157)},
         {USB_DEVICE(0x0af0, 0xd257)},
         {USB_DEVICE(0x0af0, 0xd357)},
+        {USB_DEVICE(0x0af0, 0xd058)},
+        {USB_DEVICE(0x0af0, 0xc100)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, hso_ids);
@@ -655,8 +667,8 @@ static void set_serial_by_index(unsigned index, struct hso_serial *serial)
         spin_unlock_irqrestore(&serial_table_lock, flags);
 }
 
-/* log a meaningful explanation of an USB status */
-static void log_usb_status(int status, const char *function)
+static void handle_usb_error(int status, const char *function,
+                             struct hso_device *hso_dev)
 {
         char *explanation;
 
@@ -685,10 +697,20 @@ static void log_usb_status(int status, const char *function)
         case -EMSGSIZE:
                 explanation = "internal error";
                 break;
+        case -EILSEQ:
+        case -EPROTO:
+        case -ETIME:
+        case -ETIMEDOUT:
+                explanation = "protocol error";
+                if (hso_dev)
+                        schedule_work(&hso_dev->reset_device);
+                break;
         default:
                 explanation = "unknown status";
                 break;
         }
+
+        /* log a meaningful explanation of an USB status */
         D1("%s: received USB status - %s (%d)", function, explanation, status);
 }
 
@@ -762,7 +784,7 @@ static void write_bulk_callback(struct urb *urb)
         /* log status, but don't act on it, we don't need to resubmit anything
          * anyhow */
         if (status)
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, odev->parent);
 
         hso_put_activity(odev->parent);
 
@@ -806,7 +828,7 @@ static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb,
         result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC);
         if (result) {
                 dev_warn(&odev->parent->interface->dev,
-                        "failed mux_bulk_tx_urb %d", result);
+                        "failed mux_bulk_tx_urb %d\n", result);
                 net->stats.tx_errors++;
                 netif_start_queue(net);
         } else {
@@ -998,7 +1020,7 @@ static void read_bulk_callback(struct urb *urb)
 
         /* is al ok?  (Filip: Who's Al ?) */
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, odev->parent);
                 return;
         }
 
@@ -1019,7 +1041,8 @@ static void read_bulk_callback(struct urb *urb)
         if (odev->parent->port_spec & HSO_INFO_CRC_BUG) {
                 u32 rest;
                 u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
-                rest = urb->actual_length % odev->in_endp->wMaxPacketSize;
+                rest = urb->actual_length %
+                        le16_to_cpu(odev->in_endp->wMaxPacketSize);
                 if (((rest == 5) || (rest == 6)) &&
                     !memcmp(((u8 *) urb->transfer_buffer) +
                             urb->actual_length - 4, crc_check, 4)) {
@@ -1053,7 +1076,7 @@ static void read_bulk_callback(struct urb *urb)
         result = usb_submit_urb(urb, GFP_ATOMIC);
         if (result)
                 dev_warn(&odev->parent->interface->dev,
-                         "%s failed submit mux_bulk_rx_urb %d", __func__,
+                         "%s failed submit mux_bulk_rx_urb %d\n", __func__,
                          result);
 }
 
@@ -1207,7 +1230,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
                 D1("serial == NULL");
                 return;
         } else if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 return;
         }
 
@@ -1225,7 +1248,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
                         u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
                         rest =
                             urb->actual_length %
-                            serial->in_endp->wMaxPacketSize;
+                            le16_to_cpu(serial->in_endp->wMaxPacketSize);
                         if (((rest == 5) || (rest == 6)) &&
                             !memcmp(((u8 *) urb->transfer_buffer) +
                                     urb->actual_length - 4, crc_check, 4)) {
@@ -1513,7 +1536,7 @@ static void tiocmget_intr_callback(struct urb *urb)
         if (!serial)
                 return;
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 return;
         }
         tiocmget = serial->tiocmget;
@@ -1700,6 +1723,10 @@ static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
                 D1("no tty structures");
                 return -EINVAL;
         }
+
+        if ((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM)
+                return -EINVAL;
+
         if_num = serial->parent->interface->altsetting->desc.bInterfaceNumber;
 
         spin_lock_irqsave(&serial->serial_lock, flags);
@@ -1838,7 +1865,7 @@ static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,
         result = usb_submit_urb(ctrl_urb, GFP_ATOMIC);
         if (result) {
                 dev_err(&ctrl_urb->dev->dev,
-                        "%s failed submit ctrl_urb %d type %d", __func__,
+                        "%s failed submit ctrl_urb %d type %d\n", __func__,
                         result, type);
                 return result;
         }
@@ -1888,7 +1915,7 @@ static void intr_callback(struct urb *urb)
 
         /* status check */
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, NULL);
                 return;
         }
         D4("\n--- Got intr callback 0x%02X ---", status);
@@ -1905,18 +1932,18 @@ static void intr_callback(struct urb *urb)
                         if (serial != NULL) {
                                 D1("Pending read interrupt on port %d\n", i);
                                 spin_lock(&serial->serial_lock);
-                                if (serial->rx_state == RX_IDLE) {
+                                if (serial->rx_state == RX_IDLE &&
+                                        serial->open_count > 0) {
                                         /* Setup and send a ctrl req read on
                                          * port i */
-                                if (!serial->rx_urb_filled[0]) {
+                                        if (!serial->rx_urb_filled[0]) {
                                                 serial->rx_state = RX_SENT;
                                                 hso_mux_serial_read(serial);
                                         } else
                                                 serial->rx_state = RX_PENDING;
-
                                 } else {
-                                        D1("Already pending a read on "
-                                           "port %d\n", i);
+                                        D1("Already a read pending on "
+                                           "port %d or port not open\n", i);
                                 }
                                 spin_unlock(&serial->serial_lock);
                         }
@@ -1958,7 +1985,7 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)
         tty = tty_kref_get(serial->tty);
         spin_unlock(&serial->serial_lock);
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 tty_kref_put(tty);
                 return;
         }
@@ -2014,7 +2041,7 @@ static void ctrl_callback(struct urb *urb)
         tty = tty_kref_get(serial->tty);
         spin_unlock(&serial->serial_lock);
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 tty_kref_put(tty);
                 return;
         }
@@ -2358,12 +2385,12 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
         serial->tx_data_length = tx_size;
         serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
         if (!serial->tx_data) {
-                dev_err(dev, "%s - Out of memory", __func__);
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 goto exit;
         }
         serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
         if (!serial->tx_buffer) {
-                dev_err(dev, "%s - Out of memory", __func__);
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 goto exit;
         }
 
@@ -2391,6 +2418,7 @@ static struct hso_device *hso_create_device(struct usb_interface *intf,
 
         INIT_WORK(&hso_dev->async_get_intf, async_get_intf);
         INIT_WORK(&hso_dev->async_put_intf, async_put_intf);
+        INIT_WORK(&hso_dev->reset_device, reset_device);
 
         return hso_dev;
 }
@@ -2831,13 +2859,14 @@ struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
 
         mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!mux->shared_intr_urb) {
-                dev_err(&interface->dev, "Could not allocate intr urb?");
+                dev_err(&interface->dev, "Could not allocate intr urb?\n");
                 goto exit;
         }
-        mux->shared_intr_buf = kzalloc(mux->intr_endp->wMaxPacketSize,
-                                       GFP_KERNEL);
+        mux->shared_intr_buf =
+                kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
+                        GFP_KERNEL);
         if (!mux->shared_intr_buf) {
-                dev_err(&interface->dev, "Could not allocate intr buf?");
+                dev_err(&interface->dev, "Could not allocate intr buf?\n");
                 goto exit;
         }
 
@@ -3132,6 +3161,26 @@ out:
         return result;
 }
 
+static void reset_device(struct work_struct *data)
+{
+        struct hso_device *hso_dev =
+            container_of(data, struct hso_device, reset_device);
+        struct usb_device *usb = hso_dev->usb;
+        int result;
+
+        if (hso_dev->usb_gone) {
+                D1("No reset during disconnect\n");
+        } else {
+                result = usb_lock_device_for_reset(usb, hso_dev->interface);
+                if (result < 0)
+                        D1("unable to lock device for reset: %d\n", result);
+                else {
+                        usb_reset_device(usb);
+                        usb_unlock_device(usb);
+                }
+        }
+}
+
 static void hso_serial_ref_free(struct kref *ref)
 {
         struct hso_device *hso_dev = container_of(ref, struct hso_device, ref);
@@ -3232,13 +3281,13 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,
                          usb_rcvintpipe(usb,
                                 shared_int->intr_endp->bEndpointAddress & 0x7F),
                          shared_int->shared_intr_buf,
-                         shared_int->intr_endp->wMaxPacketSize,
+                         1,
                          intr_callback, shared_int,
                          shared_int->intr_endp->bInterval);
 
         result = usb_submit_urb(shared_int->shared_intr_urb, gfp);
         if (result)
-                dev_warn(&usb->dev, "%s failed mux_intr_urb %d", __func__,
+                dev_warn(&usb->dev, "%s failed mux_intr_urb %d\n", __func__,
                         result);
 
         return result;
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index f14d225404da..fd19db0d2504 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
                 get_registers(dev, PHYCNT, 1, data);
         } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
 
-        if (i < MII_TIMEOUT) {
+        if (i <= MII_TIMEOUT) {
                 get_registers(dev, PHYDAT, 2, data);
                 *reg = data[0] | (data[1] << 8);
                 return 0;
@@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
                 get_registers(dev, PHYCNT, 1, data);
         } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
 
-        if (i < MII_TIMEOUT)
+        if (i <= MII_TIMEOUT)
                 return 0;
         else
                 return 1;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4ceb441f2687..c93f58f5c6f2 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2237,8 +2237,6 @@ static int velocity_open(struct net_device *dev)
         /* Ensure chip is running */
         pci_set_power_state(vptr->pdev, PCI_D0);
 
-        velocity_give_many_rx_descs(vptr);
-
         velocity_init_registers(vptr, VELOCITY_INIT_COLD);
 
         ret = request_irq(vptr->pdev->irq, velocity_intr, IRQF_SHARED,
@@ -2250,6 +2248,8 @@ static int velocity_open(struct net_device *dev)
                 goto out;
         }
 
+        velocity_give_many_rx_descs(vptr);
+
         mac_enable_int(vptr->mac_regs);
         netif_start_queue(dev);
         napi_enable(&vptr->napi);
@@ -2339,10 +2339,10 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
 
                 dev->mtu = new_mtu;
 
-                velocity_give_many_rx_descs(vptr);
-
                 velocity_init_registers(vptr, VELOCITY_INIT_COLD);
 
+                velocity_give_many_rx_descs(vptr);
+
                 mac_enable_int(vptr->mac_regs);
                 netif_start_queue(dev);
 
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index c708ecc3cb2e..9ead30bd00c4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -395,8 +395,7 @@ static void refill_work(struct work_struct *work)
 
         vi = container_of(work, struct virtnet_info, refill.work);
         napi_disable(&vi->napi);
-        try_fill_recv(vi, GFP_KERNEL);
-        still_empty = (vi->num == 0);
+        still_empty = !try_fill_recv(vi, GFP_KERNEL);
         napi_enable(&vi->napi);
 
         /* In theory, this can happen: if we don't get any buffers in
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 0fdfd58a35a1..b9685e82f7b6 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -310,7 +310,7 @@ static int vxge_rx_map(void *dtrh, struct vxge_ring *ring)
         dma_addr = pci_map_single(ring->pdev, rx_priv->skb_data,
                                 rx_priv->data_size, PCI_DMA_FROMDEVICE);
 
-        if (dma_addr == 0) {
+        if (unlikely(pci_dma_mapping_error(ring->pdev, dma_addr))) {
                 ring->stats.pci_map_fail++;
                 return -EIO;
         }
diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
index 5cc0f279417e..2d7c96d7e865 100644
--- a/drivers/net/wimax/i2400m/i2400m-usb.h
+++ b/drivers/net/wimax/i2400m/i2400m-usb.h
@@ -151,6 +151,7 @@ enum {
 
         /* Device IDs */
         USB_DEVICE_ID_I6050 = 0x0186,
+        USB_DEVICE_ID_I6050_2 = 0x0188,
 };
 
 
@@ -234,6 +235,7 @@ struct i2400mu {
         u8 rx_size_auto_shrink;
 
         struct dentry *debugfs_dentry;
+        unsigned i6050:1;       /* 1 if this is a 6050 based SKU */
 };
 
 
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 3b48681f8a0d..98f4f8c5fb68 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -478,7 +478,16 @@ int i2400mu_probe(struct usb_interface *iface,
         i2400m->bus_bm_wait_for_ack = i2400mu_bus_bm_wait_for_ack;
         i2400m->bus_bm_mac_addr_impaired = 0;
 
-        if (id->idProduct == USB_DEVICE_ID_I6050) {
+        switch (id->idProduct) {
+        case USB_DEVICE_ID_I6050:
+        case USB_DEVICE_ID_I6050_2:
+                i2400mu->i6050 = 1;
+                break;
+        default:
+                break;
+        }
+
+        if (i2400mu->i6050) {
                 i2400m->bus_fw_names = i2400mu_bus_fw_names_6050;
                 i2400mu->endpoint_cfg.bulk_out = 0;
                 i2400mu->endpoint_cfg.notification = 3;
@@ -719,6 +728,7 @@ int i2400mu_post_reset(struct usb_interface *iface)
 static
 struct usb_device_id i2400mu_id_table[] = {
         { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
+        { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
         { USB_DEVICE(0x8086, 0x0181) },
         { USB_DEVICE(0x8086, 0x1403) },
         { USB_DEVICE(0x8086, 0x1405) },
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 5d1c8677f180..6a3f4da7fb48 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -97,7 +97,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         int ret;
         u16 val;
-        u32 cksum, offset;
+        u32 cksum, offset, eep_max = AR5K_EEPROM_INFO_MAX;
 
         /*
          * Read values from EEPROM and store them in the capability structure
@@ -116,12 +116,38 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
          * Validate the checksum of the EEPROM date. There are some
          * devices with invalid EEPROMs.
          */
-        for (cksum = 0, offset = 0; offset < AR5K_EEPROM_INFO_MAX; offset++) {
+        AR5K_EEPROM_READ(AR5K_EEPROM_SIZE_UPPER, val);
+        if (val) {
+                eep_max = (val & AR5K_EEPROM_SIZE_UPPER_MASK) <<
+                           AR5K_EEPROM_SIZE_ENDLOC_SHIFT;
+                AR5K_EEPROM_READ(AR5K_EEPROM_SIZE_LOWER, val);
+                eep_max = (eep_max | val) - AR5K_EEPROM_INFO_BASE;
+
+                /*
+                 * Fail safe check to prevent stupid loops due
+                 * to busted EEPROMs. XXX: This value is likely too
+                 * big still, waiting on a better value.
+                 */
+                if (eep_max > (3 * AR5K_EEPROM_INFO_MAX)) {
+                        ATH5K_ERR(ah->ah_sc, "Invalid max custom EEPROM size: "
+                                  "%d (0x%04x) max expected: %d (0x%04x)\n",
+                                  eep_max, eep_max,
+                                  3 * AR5K_EEPROM_INFO_MAX,
+                                  3 * AR5K_EEPROM_INFO_MAX);
+                        return -EIO;
+                }
+        }
+
+        for (cksum = 0, offset = 0; offset < eep_max; offset++) {
                 AR5K_EEPROM_READ(AR5K_EEPROM_INFO(offset), val);
                 cksum ^= val;
         }
         if (cksum != AR5K_EEPROM_INFO_CKSUM) {
-                ATH5K_ERR(ah->ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);
+                ATH5K_ERR(ah->ah_sc, "Invalid EEPROM "
+                          "checksum: 0x%04x eep_max: 0x%04x (%s)\n",
+                          cksum, eep_max,
+                          eep_max == AR5K_EEPROM_INFO_MAX ?
+                                "default size" : "custom size");
                 return -EIO;
         }
 
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h
index 0123f3521a0b..473a483bb9c3 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.h
+++ b/drivers/net/wireless/ath/ath5k/eeprom.h
@@ -37,6 +37,14 @@
 #define AR5K_EEPROM_RFKILL_POLARITY_S   1
 
 #define AR5K_EEPROM_REG_DOMAIN          0x00bf  /* EEPROM regdom */
+
+/* FLASH(EEPROM) Defines for AR531X chips */
+#define AR5K_EEPROM_SIZE_LOWER          0x1b /* size info -- lower */
+#define AR5K_EEPROM_SIZE_UPPER          0x1c /* size info -- upper */
+#define AR5K_EEPROM_SIZE_UPPER_MASK     0xfff0
+#define AR5K_EEPROM_SIZE_UPPER_SHIFT    4
+#define AR5K_EEPROM_SIZE_ENDLOC_SHIFT   12
+
 #define AR5K_EEPROM_CHECKSUM            0x00c0  /* EEPROM checksum */
 #define AR5K_EEPROM_INFO_BASE           0x00c0  /* EEPROM header */
 #define AR5K_EEPROM_INFO_MAX            (0x400 - AR5K_EEPROM_INFO_BASE)
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index 03a1106ad725..5774cea23a3b 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -25,7 +25,7 @@ config ATH9K
 
 config ATH9K_DEBUGFS
         bool "Atheros ath9k debugging"
-        depends on ATH9K
+        depends on ATH9K && DEBUG_FS
         ---help---
           Say Y, if you need access to ath9k's statistics for
           interrupts, rate control, etc.
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index e2cef2ff5d8f..1597a42731ed 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -33,11 +33,11 @@ struct ath_node;
 
 /* Macro to expand scalars to 64-bit objects */
 
-#define ito64(x) (sizeof(x) == 8) ?                     \
+#define ito64(x) (sizeof(x) == 1) ?                     \
         (((unsigned long long int)(x)) & (0xff)) :      \
-        (sizeof(x) == 16) ?                             \
+        (sizeof(x) == 2) ?                              \
         (((unsigned long long int)(x)) & 0xffff) :      \
-        ((sizeof(x) == 32) ?                            \
+        ((sizeof(x) == 4) ?                             \
          (((unsigned long long int)(x)) & 0xffffffff) : \
          (unsigned long long int)(x))
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 484c5fdf7c2a..9b4b8b5c7574 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1961,7 +1961,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
         struct ieee80211_tx_info *info;
         struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
         u32  status = le32_to_cpu(tx_resp->u.status);
-        int tid = MAX_TID_COUNT;
+        int uninitialized_var(tid);
         int sta_id;
         int freed;
         u8 *qc = NULL;
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 33a5866538e7..de45f308b744 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1598,6 +1598,7 @@ struct iwl_cfg iwl5300_agn_cfg = {
         .use_bsm = false,
         .ht_greenfield_support = true,
         .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
         .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
         .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
 };
@@ -1622,6 +1623,7 @@ struct iwl_cfg iwl5100_bgn_cfg = {
         .use_bsm = false,
         .ht_greenfield_support = true,
         .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
         .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 };
 
@@ -1667,6 +1669,7 @@ struct iwl_cfg iwl5100_agn_cfg = {
         .use_bsm = false,
         .ht_greenfield_support = true,
         .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
         .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
         .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
 };
@@ -1691,6 +1694,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .use_bsm = false,
         .ht_greenfield_support = true,
         .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
         .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
         .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
 };
@@ -1715,6 +1719,7 @@ struct iwl_cfg iwl5150_agn_cfg = {
         .use_bsm = false,
         .ht_greenfield_support = true,
         .led_compensation = 51,
+        .use_rts_for_ht = true, /* use rts/cts protection */
         .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
         .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 574d36658702..5461f105bd2d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2344,6 +2344,21 @@ static void iwl_ht_conf(struct iwl_priv *priv,
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
+static inline void iwl_set_no_assoc(struct iwl_priv *priv)
+{
+        priv->assoc_id = 0;
+        iwl_led_disassociate(priv);
+        /*
+         * inform the ucode that there is no longer an
+         * association and that no more packets should be
+         * sent
+         */
+        priv->staging_rxon.filter_flags &=
+                ~RXON_FILTER_ASSOC_MSK;
+        priv->staging_rxon.assoc_id = 0;
+        iwlcore_commit_rxon(priv);
+}
+
 #define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
 void iwl_bss_info_changed(struct ieee80211_hw *hw,
                           struct ieee80211_vif *vif,
@@ -2475,20 +2490,8 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                                         IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;
                         if (!iwl_is_rfkill(priv))
                                 priv->cfg->ops->lib->post_associate(priv);
-                } else {
-                        priv->assoc_id = 0;
-                        iwl_led_disassociate(priv);
-
-                        /*
-                         * inform the ucode that there is no longer an
-                         * association and that no more packets should be
-                         * send
-                         */
-                        priv->staging_rxon.filter_flags &=
-                                ~RXON_FILTER_ASSOC_MSK;
-                        priv->staging_rxon.assoc_id = 0;
-                        iwlcore_commit_rxon(priv);
-                }
+                } else
+                        iwl_set_no_assoc(priv);
         }
 
         if (changes && iwl_is_associated(priv) && priv->assoc_id) {
@@ -2503,12 +2506,14 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
-        if ((changes & BSS_CHANGED_BEACON_ENABLED) &&
-            vif->bss_conf.enable_beacon) {
-                memcpy(priv->staging_rxon.bssid_addr,
-                       bss_conf->bssid, ETH_ALEN);
-                memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
-                iwlcore_config_ap(priv);
+        if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                if (vif->bss_conf.enable_beacon) {
+                        memcpy(priv->staging_rxon.bssid_addr,
+                               bss_conf->bssid, ETH_ALEN);
+                        memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
+                        iwlcore_config_ap(priv);
+                } else
+                        iwl_set_no_assoc(priv);
         }
 
         mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 165d1f6e2dd9..3822cf53e368 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -711,7 +711,7 @@ extern void iwl_txq_ctx_stop(struct iwl_priv *priv);
 extern int iwl_queue_space(const struct iwl_queue *q);
 static inline int iwl_queue_used(const struct iwl_queue *q, int i)
 {
-        return q->write_ptr > q->read_ptr ?
+        return q->write_ptr >= q->read_ptr ?
                 (i >= q->read_ptr && i < q->write_ptr) :
                 !(i < q->read_ptr && i >= q->write_ptr);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index e7d88d1da15d..83cc4e500a96 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -1,3 +1,29 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
 #include <linux/module.h>
 
 /* sparse doesn't like tracepoint macros */
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 21361968ab7e..d9c7363b1bbb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -1,3 +1,29 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
 #if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)
 #define __IWLWIFI_DEVICE_TRACE
 
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index 777584d76a88..1e41ad0fcad5 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -973,6 +973,10 @@ int iwm_send_pmkid_update(struct iwm_priv *iwm,
 
         memset(&update, 0, sizeof(struct iwm_umac_pmkid_update));
 
+        update.hdr.oid = UMAC_WIFI_IF_CMD_PMKID_UPDATE;
+        update.hdr.buf_size = cpu_to_le16(sizeof(struct iwm_umac_pmkid_update) -
+                                          sizeof(struct iwm_umac_wifi_if));
+
         update.command = cpu_to_le32(command);
         if (pmksa->bssid)
                 memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.h b/drivers/net/wireless/iwmc3200wifi/commands.h
index 06af0552cd75..3dfd9f0e9003 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.h
+++ b/drivers/net/wireless/iwmc3200wifi/commands.h
@@ -463,6 +463,7 @@ struct iwm_umac_cmd_stop_resume_tx {
 #define IWM_CMD_PMKID_FLUSH 3
 
 struct iwm_umac_pmkid_update {
+        struct iwm_umac_wifi_if hdr;
         __le32 command;
         u8 bssid[ETH_ALEN];
         __le16 reserved;
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 59d49159cf2a..59f92105b0c2 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3157,8 +3157,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
         /* Clear unsupported feature flags */
         *total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC;
 
-        if (mwl8k_fw_lock(hw))
+        if (mwl8k_fw_lock(hw)) {
+                kfree(cmd);
                 return;
+        }
 
         if (priv->sniffer_enabled) {
                 mwl8k_enable_sniffer(hw, 0);
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index a15962a19b2a..a72f7c2577de 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -197,6 +197,14 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
                         i %= ring_limit;
                         continue;
                 }
+
+                if (unlikely(len > priv->common.rx_mtu)) {
+                        if (net_ratelimit())
+                                dev_err(&priv->pdev->dev, "rx'd frame size "
+                                        "exceeds length threshold.\n");
+
+                        len = priv->common.rx_mtu;
+                }
                 skb_put(skb, len);
 
                 if (p54_rx(dev, skb)) {
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 27bf887f1453..9deae41cb784 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -340,7 +340,7 @@ static int rt2800_blink_set(struct led_classdev *led_cdev,
         rt2x00_set_field32(&reg, LED_CFG_OFF_PERIOD, *delay_off);
         rt2x00_set_field32(&reg, LED_CFG_SLOW_BLINK_PERIOD, 3);
         rt2x00_set_field32(&reg, LED_CFG_R_LED_MODE, 3);
-        rt2x00_set_field32(&reg, LED_CFG_G_LED_MODE, 12);
+        rt2x00_set_field32(&reg, LED_CFG_G_LED_MODE, 3);
         rt2x00_set_field32(&reg, LED_CFG_Y_LED_MODE, 3);
         rt2x00_set_field32(&reg, LED_CFG_LED_POLAR, 1);
         rt2800_register_write(led->rt2x00dev, LED_CFG, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 4d841c07c970..dcfc8c25d1a7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -113,6 +113,12 @@
         (  ((unsigned long)((__skb)->data + (__header))) & 3 )
 
 /*
+ * Constants for extra TX headroom for alignment purposes.
+ */
+#define RT2X00_ALIGN_SIZE       4 /* Only whole frame needs alignment */
+#define RT2X00_L2PAD_SIZE       8 /* Both header & payload need alignment */
+
+/*
  * Standard timing and size defines.
  * These values should follow the ieee80211 specifications.
  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 06c43ca39bf8..265e66dba552 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -686,7 +686,17 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize extra TX headroom required.
          */
-        rt2x00dev->hw->extra_tx_headroom = rt2x00dev->ops->extra_tx_headroom;
+        rt2x00dev->hw->extra_tx_headroom =
+                max_t(unsigned int, IEEE80211_TX_STATUS_HEADROOM,
+                      rt2x00dev->ops->extra_tx_headroom);
+
+        /*
+         * Take TX headroom required for alignment into account.
+         */
+        if (test_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags))
+                rt2x00dev->hw->extra_tx_headroom += RT2X00_L2PAD_SIZE;
+        else if (test_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags))
+                rt2x00dev->hw->extra_tx_headroom += RT2X00_ALIGN_SIZE;
 
         /*
          * Register HW.
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 239afc7a9c0b..9915a09141ef 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -104,7 +104,7 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
          * is also mapped to the DMA so it can be used for transfering
          * additional descriptor information to the hardware.
          */
-        skb_push(skb, rt2x00dev->hw->extra_tx_headroom);
+        skb_push(skb, rt2x00dev->ops->extra_tx_headroom);
 
         skbdesc->skb_dma =
             dma_map_single(rt2x00dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
@@ -112,7 +112,7 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
         /*
          * Restore data pointer to original location again.
          */
-        skb_pull(skb, rt2x00dev->hw->extra_tx_headroom);
+        skb_pull(skb, rt2x00dev->ops->extra_tx_headroom);
 
         skbdesc->flags |= SKBDESC_DMA_MAPPED_TX;
 }
@@ -134,7 +134,7 @@ void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
                  * by the driver, but it was actually mapped to DMA.
                  */
                 dma_unmap_single(rt2x00dev->dev, skbdesc->skb_dma,
-                                 skb->len + rt2x00dev->hw->extra_tx_headroom,
+                                 skb->len + rt2x00dev->ops->extra_tx_headroom,
                                  DMA_TO_DEVICE);
                 skbdesc->flags &= ~SKBDESC_DMA_MAPPED_TX;
         }
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 8ebf5c33955d..f14deb0c8514 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -987,12 +987,13 @@ static void zd_op_configure_filter(struct ieee80211_hw *hw,
         changed_flags &= SUPPORTED_FIF_FLAGS;
         *new_flags &= SUPPORTED_FIF_FLAGS;
 
-        /* changed_flags is always populated but this driver
-         * doesn't support all FIF flags so its possible we don't
-         * need to do anything */
-        if (!changed_flags)
-                return;
-
+        /*
+         * If multicast parameter (as returned by zd_op_prepare_multicast)
+         * has changed, no bit in changed_flags is set. To handle this
+         * situation, we do not return if changed_flags is 0. If we do so,
+         * we will have some issue with IPv6 which uses multicast for link
+         * layer address resolution.
+         */
         if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI))
                 zd_mc_add_all(&hash);
 
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index ac19ecd19cfe..72d3e437e190 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -62,6 +62,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
         { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0409, 0x0248), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index c5df94e86678..807224ec8351 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -75,7 +75,8 @@ static ssize_t local_cpus_show(struct device *dev,
         int len;
 
 #ifdef CONFIG_NUMA
-        mask = cpumask_of_node(dev_to_node(dev));
+        mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
+                                          cpumask_of_node(dev_to_node(dev));
 #else
         mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
 #endif
@@ -93,7 +94,8 @@ static ssize_t local_cpulist_show(struct device *dev,
         int len;
 
 #ifdef CONFIG_NUMA
-        mask = cpumask_of_node(dev_to_node(dev));
+        mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
+                                          cpumask_of_node(dev_to_node(dev));
 #else
         mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
 #endif
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0906599ebfde..315fea47e784 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -29,7 +29,17 @@ const char *pci_power_names[] = {
 };
 EXPORT_SYMBOL_GPL(pci_power_names);
 
-unsigned int pci_pm_d3_delay = PCI_PM_D3_WAIT;
+unsigned int pci_pm_d3_delay;
+
+static void pci_dev_d3_sleep(struct pci_dev *dev)
+{
+        unsigned int delay = dev->d3_delay;
+
+        if (delay < pci_pm_d3_delay)
+                delay = pci_pm_d3_delay;
+
+        msleep(delay);
+}
 
 #ifdef CONFIG_PCI_DOMAINS
 int pci_domains_supported = 1;
@@ -522,7 +532,7 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
         /* Mandatory power management transition delays */
         /* see PCI PM 1.1 5.6.1 table 18 */
         if (state == PCI_D3hot || dev->current_state == PCI_D3hot)
-                msleep(pci_pm_d3_delay);
+                pci_dev_d3_sleep(dev);
         else if (state == PCI_D2 || dev->current_state == PCI_D2)
                 udelay(PCI_PM_D2_DELAY);
 
@@ -1409,6 +1419,7 @@ void pci_pm_init(struct pci_dev *dev)
         }
 
         dev->pm_cap = pm;
+        dev->d3_delay = PCI_PM_D3_WAIT;
 
         dev->d1_support = false;
         dev->d2_support = false;
@@ -2247,12 +2258,12 @@ static int pci_pm_reset(struct pci_dev *dev, int probe)
         csr &= ~PCI_PM_CTRL_STATE_MASK;
         csr |= PCI_D3hot;
         pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr);
-        msleep(pci_pm_d3_delay);
+        pci_dev_d3_sleep(dev);
 
         csr &= ~PCI_PM_CTRL_STATE_MASK;
         csr |= PCI_D0;
         pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr);
-        msleep(pci_pm_d3_delay);
+        pci_dev_d3_sleep(dev);
 
         return 0;
 }
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 797d47809f7a..223052b73563 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -321,7 +321,7 @@ static int aer_inject(struct aer_error_inj *einj)
         unsigned long flags;
         unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn);
         int pos_cap_err, rp_pos_cap_err;
-        u32 sever;
+        u32 sever, cor_mask, uncor_mask;
         int ret = 0;
 
         dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn);
@@ -339,6 +339,9 @@ static int aer_inject(struct aer_error_inj *einj)
                 goto out_put;
         }
         pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_SEVER, &sever);
+        pci_read_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK, &cor_mask);
+        pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK,
+                              &uncor_mask);
 
         rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR);
         if (!rp_pos_cap_err) {
@@ -374,6 +377,21 @@ static int aer_inject(struct aer_error_inj *einj)
         err->header_log2 = einj->header_log2;
         err->header_log3 = einj->header_log3;
 
+        if (einj->cor_status && !(einj->cor_status & ~cor_mask)) {
+                ret = -EINVAL;
+                printk(KERN_WARNING "The correctable error(s) is masked "
+                                "by device\n");
+                spin_unlock_irqrestore(&inject_lock, flags);
+                goto out_put;
+        }
+        if (einj->uncor_status && !(einj->uncor_status & ~uncor_mask)) {
+                ret = -EINVAL;
+                printk(KERN_WARNING "The uncorrectable error(s) is masked "
+                                "by device\n");
+                spin_unlock_irqrestore(&inject_lock, flags);
+                goto out_put;
+        }
+
         rperr = __find_aer_error_by_dev(rpdev);
         if (!rperr) {
                 rperr = rperr_alloc;
@@ -413,8 +431,14 @@ static int aer_inject(struct aer_error_inj *einj)
         if (ret)
                 goto out_put;
 
-        if (find_aer_device(rpdev, &edev))
+        if (find_aer_device(rpdev, &edev)) {
+                if (!get_service_data(edev)) {
+                        printk(KERN_WARNING "AER service is not initialized\n");
+                        ret = -EINVAL;
+                        goto out_put;
+                }
                 aer_irq(-1, edev);
+        }
         else
                 ret = -EINVAL;
 out_put:
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 413262eb95b7..b174188ac121 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -27,7 +27,7 @@
  */
 static void release_pcie_device(struct device *dev)
 {
-        kfree(to_pcie_device(dev));                     
+        kfree(to_pcie_device(dev));
 }
 
 /**
@@ -346,12 +346,11 @@ static int suspend_iter(struct device *dev, void *data)
 {
         struct pcie_port_service_driver *service_driver;
 
-        if ((dev->bus == &pcie_port_bus_type) &&
-            (dev->driver)) {
-                service_driver = to_service_driver(dev->driver);
-                if (service_driver->suspend)
-                        service_driver->suspend(to_pcie_device(dev));
-        }
+        if ((dev->bus == &pcie_port_bus_type) && dev->driver) {
+                service_driver = to_service_driver(dev->driver);
+                if (service_driver->suspend)
+                        service_driver->suspend(to_pcie_device(dev));
+        }
         return 0;
 }
 
@@ -494,6 +493,7 @@ int pcie_port_service_register(struct pcie_port_service_driver *new)
 
         return driver_register(&new->driver);
 }
+EXPORT_SYMBOL(pcie_port_service_register);
 
 /**
  * pcie_port_service_unregister - unregister PCI Express port service driver
@@ -503,6 +503,4 @@ void pcie_port_service_unregister(struct pcie_port_service_driver *drv)
 {
         driver_unregister(&drv->driver);
 }
-
-EXPORT_SYMBOL(pcie_port_service_register);
 EXPORT_SYMBOL(pcie_port_service_unregister);
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 34d65172a4d7..13c8972886e6 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -63,7 +63,7 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
  * pcie_portdrv_probe - Probe PCI-Express port devices
  * @dev: PCI-Express port device being probed
  *
- * If detected invokes the pcie_port_device_register() method for 
+ * If detected invokes the pcie_port_device_register() method for
  * this port device.
  *
  */
@@ -78,7 +78,7 @@ static int __devinit pcie_portdrv_probe(struct pci_dev *dev,
              (dev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM)))
                 return -ENODEV;
 
-        if (!dev->irq && dev->pin) {
+        if (!dev->irq && dev->pin) {
                 dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; "
                          "check vendor BIOS\n", dev->vendor, dev->device);
         }
@@ -91,7 +91,7 @@ static int __devinit pcie_portdrv_probe(struct pci_dev *dev,
         return 0;
 }
 
-static void pcie_portdrv_remove (struct pci_dev *dev)
+static void pcie_portdrv_remove(struct pci_dev *dev)
 {
         pcie_port_device_remove(dev);
         pci_disable_device(dev);
@@ -129,14 +129,13 @@ static int error_detected_iter(struct device *device, void *data)
 static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,
                                         enum pci_channel_state error)
 {
-        struct aer_broadcast_data result_data =
-                        {error, PCI_ERS_RESULT_CAN_RECOVER};
-        int retval;
+        struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};
+        int ret;
 
         /* can not fail */
-        retval = device_for_each_child(&dev->dev, &result_data, error_detected_iter);
+        ret = device_for_each_child(&dev->dev, &data, error_detected_iter);
 
-        return result_data.result;
+        return data.result;
 }
 
 static int mmio_enabled_iter(struct device *device, void *data)
@@ -290,7 +289,7 @@ static int __init pcie_portdrv_init(void)
         return retval;
 }
 
-static void __exit pcie_portdrv_exit(void) 
+static void __exit pcie_portdrv_exit(void)
 {
         pci_unregister_driver(&pcie_portdriver);
         pcie_port_bus_unregister();
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 98ffb2de22e9..446e4a94d7d3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -681,7 +681,7 @@ static void pci_read_irq(struct pci_dev *dev)
         dev->irq = irq;
 }
 
-static void set_pcie_port_type(struct pci_dev *pdev)
+void set_pcie_port_type(struct pci_dev *pdev)
 {
         int pos;
         u16 reg16;
@@ -695,7 +695,7 @@ static void set_pcie_port_type(struct pci_dev *pdev)
         pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4;
 }
 
-static void set_pcie_hotplug_bridge(struct pci_dev *pdev)
+void set_pcie_hotplug_bridge(struct pci_dev *pdev)
 {
         int pos;
         u16 reg16;
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index db32c25e3605..f526e735c5ab 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -364,6 +364,7 @@ config EEEPC_LAPTOP
         select HWMON
         select LEDS_CLASS
         select NEW_LEDS
+        select INPUT_SPARSEKMAP
         ---help---
           This driver supports the Fn-Fx keys on Eee PC laptops.
 
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 5838c69b2fb3..e2be6bb33d92 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -31,10 +31,12 @@
 #include <acpi/acpi_bus.h>
 #include <linux/uaccess.h>
 #include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
 #include <linux/rfkill.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
 #include <linux/leds.h>
+#include <linux/dmi.h>
 
 #define EEEPC_LAPTOP_VERSION    "0.1"
 #define EEEPC_LAPTOP_NAME       "Eee PC Hotkey Driver"
@@ -48,6 +50,14 @@ MODULE_AUTHOR("Corentin Chary, Eric Cooper");
 MODULE_DESCRIPTION(EEEPC_LAPTOP_NAME);
 MODULE_LICENSE("GPL");
 
+static bool hotplug_disabled;
+
+module_param(hotplug_disabled, bool, 0644);
+MODULE_PARM_DESC(hotplug_disabled,
+                 "Disable hotplug for wireless device. "
+                 "If your laptop need that, please report to "
+                 "acpi4asus-user@lists.sourceforge.net.");
+
 /*
  * Definitions for Asus EeePC
  */
@@ -120,38 +130,28 @@ static const char *cm_setv[] = {
         NULL, NULL, "PBPS", "TPDS"
 };
 
-struct key_entry {
-        char type;
-        u8 code;
-        u16 keycode;
-};
-
-enum { KE_KEY, KE_END };
-
 static const struct key_entry eeepc_keymap[] = {
-        /* Sleep already handled via generic ACPI code */
-        {KE_KEY, 0x10, KEY_WLAN },
-        {KE_KEY, 0x11, KEY_WLAN },
-        {KE_KEY, 0x12, KEY_PROG1 },
-        {KE_KEY, 0x13, KEY_MUTE },
-        {KE_KEY, 0x14, KEY_VOLUMEDOWN },
-        {KE_KEY, 0x15, KEY_VOLUMEUP },
-        {KE_KEY, 0x16, KEY_DISPLAY_OFF },
-        {KE_KEY, 0x1a, KEY_COFFEE },
-        {KE_KEY, 0x1b, KEY_ZOOM },
-        {KE_KEY, 0x1c, KEY_PROG2 },
-        {KE_KEY, 0x1d, KEY_PROG3 },
-        {KE_KEY, NOTIFY_BRN_MIN, KEY_BRIGHTNESSDOWN },
-        {KE_KEY, NOTIFY_BRN_MAX, KEY_BRIGHTNESSUP },
-        {KE_KEY, 0x30, KEY_SWITCHVIDEOMODE },
-        {KE_KEY, 0x31, KEY_SWITCHVIDEOMODE },
-        {KE_KEY, 0x32, KEY_SWITCHVIDEOMODE },
-        {KE_KEY, 0x37, KEY_F13 }, /* Disable Touchpad */
-        {KE_KEY, 0x38, KEY_F14 },
-        {KE_END, 0},
+        { KE_KEY, 0x10, { KEY_WLAN } },
+        { KE_KEY, 0x11, { KEY_WLAN } },
+        { KE_KEY, 0x12, { KEY_PROG1 } },
+        { KE_KEY, 0x13, { KEY_MUTE } },
+        { KE_KEY, 0x14, { KEY_VOLUMEDOWN } },
+        { KE_KEY, 0x15, { KEY_VOLUMEUP } },
+        { KE_KEY, 0x16, { KEY_DISPLAY_OFF } },
+        { KE_KEY, 0x1a, { KEY_COFFEE } },
+        { KE_KEY, 0x1b, { KEY_ZOOM } },
+        { KE_KEY, 0x1c, { KEY_PROG2 } },
+        { KE_KEY, 0x1d, { KEY_PROG3 } },
+        { KE_KEY, NOTIFY_BRN_MIN, { KEY_BRIGHTNESSDOWN } },
+        { KE_KEY, NOTIFY_BRN_MAX, { KEY_BRIGHTNESSUP } },
+        { KE_KEY, 0x30, { KEY_SWITCHVIDEOMODE } },
+        { KE_KEY, 0x31, { KEY_SWITCHVIDEOMODE } },
+        { KE_KEY, 0x32, { KEY_SWITCHVIDEOMODE } },
+        { KE_KEY, 0x37, { KEY_F13 } }, /* Disable Touchpad */
+        { KE_KEY, 0x38, { KEY_F14 } },
+        { KE_END, 0 },
 };
 
-
 /*
  * This is the main structure, we can use it to store useful information
  */
@@ -159,6 +159,8 @@ struct eeepc_laptop {
         acpi_handle handle;             /* the handle of the acpi device */
         u32 cm_supported;               /* the control methods supported
                                            by this BIOS */
+        bool cpufv_disabled;
+        bool hotplug_disabled;
         u16 event_count[128];           /* count for each event */
 
         struct platform_device *platform_device;
@@ -378,6 +380,8 @@ static ssize_t store_cpufv(struct device *dev,
         struct eeepc_cpufv c;
         int rv, value;
 
+        if (eeepc->cpufv_disabled)
+                return -EPERM;
         if (get_cpufv(eeepc, &c))
                 return -ENODEV;
         rv = parse_arg(buf, count, &value);
@@ -389,6 +393,41 @@ static ssize_t store_cpufv(struct device *dev,
         return rv;
 }
 
+static ssize_t show_cpufv_disabled(struct device *dev,
+                          struct device_attribute *attr,
+                          char *buf)
+{
+        struct eeepc_laptop *eeepc = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d\n", eeepc->cpufv_disabled);
+}
+
+static ssize_t store_cpufv_disabled(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        struct eeepc_laptop *eeepc = dev_get_drvdata(dev);
+        int rv, value;
+
+        rv = parse_arg(buf, count, &value);
+        if (rv < 0)
+                return rv;
+
+        switch (value) {
+        case 0:
+                if (eeepc->cpufv_disabled)
+                        pr_warning("cpufv enabled (not officially supported "
+                                "on this model)\n");
+                eeepc->cpufv_disabled = false;
+                return rv;
+        case 1:
+                return -EPERM;
+        default:
+                return -EINVAL;
+        }
+}
+
+
 static struct device_attribute dev_attr_cpufv = {
         .attr = {
                 .name = "cpufv",
@@ -404,12 +443,22 @@ static struct device_attribute dev_attr_available_cpufv = {
         .show   = show_available_cpufv
 };
 
+static struct device_attribute dev_attr_cpufv_disabled = {
+        .attr = {
+                .name = "cpufv_disabled",
+                .mode = 0644 },
+        .show   = show_cpufv_disabled,
+        .store  = store_cpufv_disabled
+};
+
+
 static struct attribute *platform_attributes[] = {
         &dev_attr_camera.attr,
         &dev_attr_cardr.attr,
         &dev_attr_disp.attr,
         &dev_attr_cpufv.attr,
         &dev_attr_available_cpufv.attr,
+        &dev_attr_cpufv_disabled.attr,
         NULL
 };
 
@@ -796,6 +845,9 @@ static int eeepc_rfkill_init(struct eeepc_laptop *eeepc)
         if (result && result != -ENODEV)
                 goto exit;
 
+        if (eeepc->hotplug_disabled)
+                return 0;
+
         result = eeepc_setup_pci_hotplug(eeepc);
         /*
          * If we get -EBUSY then something else is handling the PCI hotplug -
@@ -1090,120 +1142,42 @@ static void eeepc_backlight_exit(struct eeepc_laptop *eeepc)
 /*
  * Input device (i.e. hotkeys)
  */
-static struct key_entry *eeepc_get_entry_by_scancode(
-        struct eeepc_laptop *eeepc,
-        int code)
+static int eeepc_input_init(struct eeepc_laptop *eeepc)
 {
-        struct key_entry *key;
+        struct input_dev *input;
+        int error;
 
-        for (key = eeepc->keymap; key->type != KE_END; key++)
-                if (code == key->code)
-                        return key;
-
-        return NULL;
-}
-
-static void eeepc_input_notify(struct eeepc_laptop *eeepc, int event)
-{
-        static struct key_entry *key;
-
-        key = eeepc_get_entry_by_scancode(eeepc, event);
-        if (key) {
-                switch (key->type) {
-                case KE_KEY:
-                        input_report_key(eeepc->inputdev, key->keycode,
-                                                1);
-                        input_sync(eeepc->inputdev);
-                        input_report_key(eeepc->inputdev, key->keycode,
-                                                0);
-                        input_sync(eeepc->inputdev);
-                        break;
-                }
+        input = input_allocate_device();
+        if (!input) {
+                pr_info("Unable to allocate input device\n");
+                return -ENOMEM;
         }
-}
-
-static struct key_entry *eeepc_get_entry_by_keycode(
-        struct eeepc_laptop *eeepc, int code)
-{
-        struct key_entry *key;
-
-        for (key = eeepc->keymap; key->type != KE_END; key++)
-                if (code == key->keycode && key->type == KE_KEY)
-                        return key;
 
-        return NULL;
-}
+        input->name = "Asus EeePC extra buttons";
+        input->phys = EEEPC_LAPTOP_FILE "/input0";
+        input->id.bustype = BUS_HOST;
+        input->dev.parent = &eeepc->platform_device->dev;
 
-static int eeepc_getkeycode(struct input_dev *dev, int scancode, int *keycode)
-{
-        struct eeepc_laptop *eeepc = input_get_drvdata(dev);
-        struct key_entry *key = eeepc_get_entry_by_scancode(eeepc, scancode);
-
-        if (key && key->type == KE_KEY) {
-                *keycode = key->keycode;
-                return 0;
+        error = sparse_keymap_setup(input, eeepc_keymap, NULL);
+        if (error) {
+                pr_err("Unable to setup input device keymap\n");
+                goto err_free_dev;
         }
 
-        return -EINVAL;
-}
-
-static int eeepc_setkeycode(struct input_dev *dev, int scancode, int keycode)
-{
-        struct eeepc_laptop *eeepc = input_get_drvdata(dev);
-        struct key_entry *key;
-        int old_keycode;
-
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
-
-        key = eeepc_get_entry_by_scancode(eeepc, scancode);
-        if (key && key->type == KE_KEY) {
-                old_keycode = key->keycode;
-                key->keycode = keycode;
-                set_bit(keycode, dev->keybit);
-                if (!eeepc_get_entry_by_keycode(eeepc, old_keycode))
-                        clear_bit(old_keycode, dev->keybit);
-                return 0;
+        error = input_register_device(input);
+        if (error) {
+                pr_err("Unable to register input device\n");
+                goto err_free_keymap;
         }
 
-        return -EINVAL;
-}
-
-static int eeepc_input_init(struct eeepc_laptop *eeepc)
-{
-        const struct key_entry *key;
-        int result;
-
-        eeepc->inputdev = input_allocate_device();
-        if (!eeepc->inputdev) {
-                pr_info("Unable to allocate input device\n");
-                return -ENOMEM;
-        }
-        eeepc->inputdev->name = "Asus EeePC extra buttons";
-        eeepc->inputdev->dev.parent = &eeepc->platform_device->dev;
-        eeepc->inputdev->phys = EEEPC_LAPTOP_FILE "/input0";
-        eeepc->inputdev->id.bustype = BUS_HOST;
-        eeepc->inputdev->getkeycode = eeepc_getkeycode;
-        eeepc->inputdev->setkeycode = eeepc_setkeycode;
-        input_set_drvdata(eeepc->inputdev, eeepc);
-
-        eeepc->keymap = kmemdup(eeepc_keymap, sizeof(eeepc_keymap),
-                                GFP_KERNEL);
-        for (key = eeepc_keymap; key->type != KE_END; key++) {
-                switch (key->type) {
-                case KE_KEY:
-                        set_bit(EV_KEY, eeepc->inputdev->evbit);
-                        set_bit(key->keycode, eeepc->inputdev->keybit);
-                        break;
-                }
-        }
-        result = input_register_device(eeepc->inputdev);
-        if (result) {
-                pr_info("Unable to register input device\n");
-                input_free_device(eeepc->inputdev);
-                return result;
-        }
+        eeepc->inputdev = input;
         return 0;
+
+ err_free_keymap:
+        sparse_keymap_free(input);
+ err_free_dev:
+        input_free_device(input);
+        return error;
 }
 
 static void eeepc_input_exit(struct eeepc_laptop *eeepc)
@@ -1253,11 +1227,59 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
                                 * event will be desired value (or else ignored)
                                 */
                         }
-                        eeepc_input_notify(eeepc, event);
+                        sparse_keymap_report_event(eeepc->inputdev, event,
+                                                   1, true);
                 }
         } else {
                 /* Everything else is a bona-fide keypress event */
-                eeepc_input_notify(eeepc, event);
+                sparse_keymap_report_event(eeepc->inputdev, event, 1, true);
+        }
+}
+
+static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
+{
+        const char *model;
+
+        model = dmi_get_system_info(DMI_PRODUCT_NAME);
+        if (!model)
+                return;
+
+        /*
+         * Blacklist for setting cpufv (cpu speed).
+         *
+         * EeePC 4G ("701") implements CFVS, but it is not supported
+         * by the pre-installed OS, and the original option to change it
+         * in the BIOS setup screen was removed in later versions.
+         *
+         * Judging by the lack of "Super Hybrid Engine" on Asus product pages,
+         * this applies to all "701" models (4G/4G Surf/2G Surf).
+         *
+         * So Asus made a deliberate decision not to support it on this model.
+         * We have several reports that using it can cause the system to hang
+         *
+         * The hang has also been reported on a "702" (Model name "8G"?).
+         *
+         * We avoid dmi_check_system() / dmi_match(), because they use
+         * substring matching.  We don't want to affect the "701SD"
+         * and "701SDX" models, because they do support S.H.E.
+         */
+        if (strcmp(model, "701") == 0 || strcmp(model, "702") == 0) {
+                eeepc->cpufv_disabled = true;
+                pr_info("model %s does not officially support setting cpu "
+                        "speed\n", model);
+                pr_info("cpufv disabled to avoid instability\n");
+        }
+
+        /*
+         * Blacklist for wlan hotplug
+         *
+         * Eeepc 1005HA doesn't work like others models and don't need the
+         * hotplug code. In fact, current hotplug code seems to unplug another
+         * device...
+         */
+        if (strcmp(model, "1005HA") == 0 || strcmp(model, "1201N") == 0) {
+                eeepc->hotplug_disabled = true;
+                pr_info("wlan hotplug disabled\n");
         }
 }
 
@@ -1342,6 +1364,10 @@ static int __devinit eeepc_acpi_add(struct acpi_device *device)
         strcpy(acpi_device_class(device), EEEPC_ACPI_CLASS);
         device->driver_data = eeepc;
 
+        eeepc->hotplug_disabled = hotplug_disabled;
+
+        eeepc_dmi_check(eeepc);
+
         result = eeepc_acpi_init(eeepc, device);
         if (result)
                 goto fail_platform;
@@ -1452,10 +1478,12 @@ static int __init eeepc_laptop_init(void)
         result = acpi_bus_register_driver(&eeepc_acpi_driver);
         if (result < 0)
                 goto fail_acpi_driver;
+
         if (!eeepc_device_present) {
                 result = -ENODEV;
                 goto fail_no_device;
         }
+
         return 0;
 
 fail_no_device:
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 5b648f0c6075..ad4c414dbfbc 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -393,8 +393,6 @@ static void hp_wmi_notify(u32 value, void *context)
         } else
                 printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
                         eventcode);
-
-        kfree(obj);
 }
 
 static int __init hp_wmi_input_setup(void)
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 5af53340da6f..3f71a605a492 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1201,9 +1201,12 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
         /* the buffer is filled with magic numbers describing the devices
          * available, 0xff terminates the enumeration
          */
-        while ((dev_code = *(device_enum->buffer.pointer + i)) != 0xff &&
-                        i < device_enum->buffer.length) {
-                i++;
+        for (i = 0; i < device_enum->buffer.length; i++) {
+
+                dev_code = *(device_enum->buffer.pointer + i);
+                if (dev_code == 0xff)
+                        break;
+
                 dprintk("Radio devices, looking at 0x%.2x\n", dev_code);
 
                 if (dev_code == 0 && !sony_rfkill_devices[SONY_WIFI])
diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c
index 9346a862f1f2..9c87ad564803 100644
--- a/drivers/power/pmu_battery.c
+++ b/drivers/power/pmu_battery.c
@@ -89,6 +89,8 @@ static int pmu_bat_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_STATUS:
                 if (pbi->flags & PMU_BATT_CHARGING)
                         val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                else if (pmu_power_flags & PMU_PWR_AC_PRESENT)
+                        val->intval = POWER_SUPPLY_STATUS_FULL;
                 else
                         val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                 break;
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 1bbff099a546..e7b89e704af6 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1504,7 +1504,8 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink,
         led->isink_init.consumer_supplies = &led->isink_consumer;
         led->isink_init.constraints.min_uA = 0;
         led->isink_init.constraints.max_uA = pdata->max_uA;
-        led->isink_init.constraints.valid_ops_mask = REGULATOR_CHANGE_CURRENT;
+        led->isink_init.constraints.valid_ops_mask
+                = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS;
         led->isink_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL;
         ret = wm8350_register_regulator(wm8350, isink, &led->isink_init);
         if (ret != 0) {
@@ -1517,6 +1518,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink,
         led->dcdc_init.num_consumer_supplies = 1;
         led->dcdc_init.consumer_supplies = &led->dcdc_consumer;
         led->dcdc_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL;
+        led->dcdc_init.constraints.valid_ops_mask =  REGULATOR_CHANGE_STATUS;
         ret = wm8350_register_regulator(wm8350, dcdc, &led->dcdc_init);
         if (ret != 0) {
                 platform_device_put(pdev);
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index c8c12325e69b..e9aa814ddd23 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -1096,9 +1096,9 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
 #define cmos_pnp_resume         NULL
 #endif
 
-static void cmos_pnp_shutdown(struct device *pdev)
+static void cmos_pnp_shutdown(struct pnp_dev *pnp)
 {
-        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev))
+        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pnp->dev))
                 return;
 
         cmos_do_shutdown();
@@ -1117,15 +1117,12 @@ static struct pnp_driver cmos_pnp_driver = {
         .id_table       = rtc_ids,
         .probe          = cmos_pnp_probe,
         .remove         = __exit_p(cmos_pnp_remove),
+        .shutdown       = cmos_pnp_shutdown,
 
         /* flag ensures resume() gets called, and stops syslog spam */
         .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
         .suspend        = cmos_pnp_suspend,
         .resume         = cmos_pnp_resume,
-        .driver         = {
-                .name     = (char *)driver_name,
-                .shutdown = cmos_pnp_shutdown,
-        }
 };
 
 #endif  /* CONFIG_PNP */
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index fdb2e7c14506..5905936c7c60 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1004,8 +1004,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
         if (device == NULL ||
             device != dasd_device_from_cdev_locked(cdev) ||
             strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
-                DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "
-                              "bus_id %s", dev_name(&cdev->dev));
+                DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",
+                                "invalid device in request");
                 return;
         }
 
@@ -1078,8 +1078,8 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         device = (struct dasd_device *) cqr->startdev;
         if (!device ||
             strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
-                DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "
-                              "bus_id %s", dev_name(&cdev->dev));
+                DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",
+                                "invalid device in request");
                 return;
         }
 
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 5819dc02a143..1cca21aafaba 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -23,6 +23,7 @@
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/ebcdic.h>
+#include <asm/compat.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/cio.h>
@@ -2844,13 +2845,16 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp)
         rc = -EFAULT;
         if (copy_from_user(&usrparm, argp, sizeof(usrparm)))
                 goto out;
-#ifndef CONFIG_64BIT
-        /* Make sure pointers are sane even on 31 bit. */
-        if ((usrparm.psf_data >> 32) != 0 || (usrparm.rssd_result >> 32) != 0) {
+        if (is_compat_task() || sizeof(long) == 4) {
+                /* Make sure pointers are sane even on 31 bit. */
                 rc = -EINVAL;
-                goto out;
+                if ((usrparm.psf_data >> 32) != 0)
+                        goto out;
+                if ((usrparm.rssd_result >> 32) != 0)
+                        goto out;
+                usrparm.psf_data &= 0x7fffffffULL;
+                usrparm.rssd_result &= 0x7fffffffULL;
         }
-#endif
         /* alloc I/O data area */
         psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA);
         rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);
@@ -3029,7 +3033,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device,
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X CC: 0x%02X RC: %d\n",
                        req, scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw),
-                       scsw_cc(&irb->scsw), req->intrc);
+                       scsw_cc(&irb->scsw), req ? req->intrc : 0);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        dev_name(&device->cdev->dev),
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 478bcdb90b6f..7039d9cf0fb4 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -17,7 +17,7 @@
 #include <linux/fs.h>
 #include <linux/blkpg.h>
 #include <linux/smp_lock.h>
-
+#include <asm/compat.h>
 #include <asm/ccwdev.h>
 #include <asm/cmb.h>
 #include <asm/uaccess.h>
@@ -260,7 +260,7 @@ static int dasd_ioctl_information(struct dasd_block *block,
         struct ccw_dev_id dev_id;
 
         base = block->base;
-        if (!base->discipline->fill_info)
+        if (!base->discipline || !base->discipline->fill_info)
                 return -EINVAL;
 
         dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
@@ -303,10 +303,7 @@ static int dasd_ioctl_information(struct dasd_block *block,
         dasd_info->features |=
                 ((base->features & DASD_FEATURE_READONLY) != 0);
 
-        if (base->discipline)
-                memcpy(dasd_info->type, base->discipline->name, 4);
-        else
-                memcpy(dasd_info->type, "none", 4);
+        memcpy(dasd_info->type, base->discipline->name, 4);
 
         if (block->request_queue->request_fn) {
                 struct list_head *l;
@@ -358,9 +355,8 @@ dasd_ioctl_set_ro(struct block_device *bdev, void __user *argp)
 }
 
 static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,
-                unsigned long arg)
+                                  struct cmbdata __user *argp)
 {
-        struct cmbdata __user *argp = (void __user *) arg;
         size_t size = _IOC_SIZE(cmd);
         struct cmbdata data;
         int ret;
@@ -376,7 +372,12 @@ dasd_do_ioctl(struct block_device *bdev, fmode_t mode,
               unsigned int cmd, unsigned long arg)
 {
         struct dasd_block *block = bdev->bd_disk->private_data;
-        void __user *argp = (void __user *)arg;
+        void __user *argp;
+
+        if (is_compat_task())
+                argp = compat_ptr(arg);
+        else
+                argp = (void __user *)arg;
 
         if (!block)
                 return -ENODEV;
@@ -414,7 +415,7 @@ dasd_do_ioctl(struct block_device *bdev, fmode_t mode,
         case BIODASDCMFDISABLE:
                 return disable_cmf(block->base->cdev);
         case BIODASDREADALLCMB:
-                return dasd_ioctl_readall_cmb(block, cmd, arg);
+                return dasd_ioctl_readall_cmb(block, cmd, argp);
         default:
                 /* if the discipline has an ioctl method try it. */
                 if (block->base->discipline->ioctl) {
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 6315fbd8e68b..71f95f54866f 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -72,7 +72,7 @@ dasd_devices_show(struct seq_file *m, void *v)
         /* Print device number. */
         seq_printf(m, "%s", dev_name(&device->cdev->dev));
         /* Print discipline string. */
-        if (device != NULL && device->discipline != NULL)
+        if (device->discipline != NULL)
                 seq_printf(m, "(%s)", device->discipline->name);
         else
                 seq_printf(m, "(none)");
@@ -92,10 +92,7 @@ dasd_devices_show(struct seq_file *m, void *v)
         substr = (device->features & DASD_FEATURE_READONLY) ? "(ro)" : " ";
         seq_printf(m, "%4s: ", substr);
         /* Print device status information. */
-        switch ((device != NULL) ? device->state : -1) {
-        case -1:
-                seq_printf(m, "unknown");
-                break;
+        switch (device->state) {
         case DASD_STATE_NEW:
                 seq_printf(m, "new");
                 break;
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 9d61683b5633..59ec073724bf 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -1037,22 +1037,6 @@ static void tty3215_flush_buffer(struct tty_struct *tty)
 }
 
 /*
- * Currently we don't have any io controls for 3215 ttys
- */
-static int tty3215_ioctl(struct tty_struct *tty, struct file * file,
-                         unsigned int cmd, unsigned long arg)
-{
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        switch (cmd) {
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-/*
  * Disable reading from a 3215 tty
  */
 static void tty3215_throttle(struct tty_struct * tty)
@@ -1117,7 +1101,6 @@ static const struct tty_operations tty3215_ops = {
         .write_room = tty3215_write_room,
         .chars_in_buffer = tty3215_chars_in_buffer,
         .flush_buffer = tty3215_flush_buffer,
-        .ioctl = tty3215_ioctl,
         .throttle = tty3215_throttle,
         .unthrottle = tty3215_unthrottle,
         .stop = tty3215_stop,
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 247b2b934728..31c59b0d6df0 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/smp_lock.h>
 
+#include <asm/compat.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
@@ -322,6 +323,7 @@ fs3270_write(struct file *filp, const char __user *data, size_t count, loff_t *o
 static long
 fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
+        char __user *argp;
         struct fs3270 *fp;
         struct raw3270_iocb iocb;
         int rc;
@@ -329,6 +331,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         fp = filp->private_data;
         if (!fp)
                 return -ENODEV;
+        if (is_compat_task())
+                argp = compat_ptr(arg);
+        else
+                argp = (char __user *)arg;
         rc = 0;
         mutex_lock(&fs3270_mutex);
         switch (cmd) {
@@ -339,10 +345,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 fp->write_command = arg;
                 break;
         case TUBGETI:
-                rc = put_user(fp->read_command, (char __user *) arg);
+                rc = put_user(fp->read_command, argp);
                 break;
         case TUBGETO:
-                rc = put_user(fp->write_command,(char __user *) arg);
+                rc = put_user(fp->write_command, argp);
                 break;
         case TUBGETMOD:
                 iocb.model = fp->view.model;
@@ -351,8 +357,7 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 iocb.pf_cnt = 24;
                 iocb.re_cnt = 20;
                 iocb.map = 0;
-                if (copy_to_user((char __user *) arg, &iocb,
-                                 sizeof(struct raw3270_iocb)))
+                if (copy_to_user(argp, &iocb, sizeof(struct raw3270_iocb)))
                         rc = -EFAULT;
                 break;
         }
@@ -511,8 +516,8 @@ static const struct file_operations fs3270_fops = {
         .write           = fs3270_write,        /* write */
         .unlocked_ioctl  = fs3270_ioctl,        /* ioctl */
         .compat_ioctl    = fs3270_ioctl,        /* ioctl */
-        .open           = fs3270_open,          /* open */
-        .release        = fs3270_close,         /* release */
+        .open            = fs3270_open,         /* open */
+        .release         = fs3270_close,        /* release */
 };
 
 /*
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index b9d2a007e93b..3796ffdb8479 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -495,6 +495,10 @@ sclp_vt220_open(struct tty_struct *tty, struct file *filp)
                 if (tty->driver_data == NULL)
                         return -ENOMEM;
                 tty->low_latency = 0;
+                if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
+                        tty->winsize.ws_row = 24;
+                        tty->winsize.ws_col = 80;
+                }
         }
         return 0;
 }
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 96816149368a..8d3d720737da 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -46,8 +46,6 @@
  */
 static int tapeblock_open(struct block_device *, fmode_t);
 static int tapeblock_release(struct gendisk *, fmode_t);
-static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int,
-                                unsigned long);
 static int tapeblock_medium_changed(struct gendisk *);
 static int tapeblock_revalidate_disk(struct gendisk *);
 
@@ -55,7 +53,6 @@ static const struct block_device_operations tapeblock_fops = {
         .owner           = THIS_MODULE,
         .open            = tapeblock_open,
         .release         = tapeblock_release,
-        .ioctl           = tapeblock_ioctl,
         .media_changed   = tapeblock_medium_changed,
         .revalidate_disk = tapeblock_revalidate_disk,
 };
@@ -416,42 +413,6 @@ tapeblock_release(struct gendisk *disk, fmode_t mode)
 }
 
 /*
- * Support of some generic block device IOCTLs.
- */
-static int
-tapeblock_ioctl(
-        struct block_device *   bdev,
-        fmode_t                 mode,
-        unsigned int            command,
-        unsigned long           arg
-) {
-        int rc;
-        int minor;
-        struct gendisk *disk = bdev->bd_disk;
-        struct tape_device *device;
-
-        rc     = 0;
-        BUG_ON(!disk);
-        device = disk->private_data;
-        BUG_ON(!device);
-        minor  = MINOR(bdev->bd_dev);
-
-        DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);
-        DBF_LH(6, "device = %d:%d\n", tapeblock_major, minor);
-
-        switch (command) {
-                /* Refuse some IOCTL calls without complaining (mount). */
-                case 0x5310:            /* CDROMMULTISESSION */
-                        rc = -EINVAL;
-                        break;
-                default:
-                        rc = -EINVAL;
-        }
-
-        return rc;
-}
-
-/*
  * Initialize block device frontend.
  */
 int
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 2125ec7d95f0..539045acaad4 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -18,6 +18,7 @@
 #include <linux/proc_fs.h>
 #include <linux/mtio.h>
 #include <linux/smp_lock.h>
+#include <linux/compat.h>
 
 #include <asm/uaccess.h>
 
@@ -37,8 +38,9 @@ static ssize_t tapechar_write(struct file *, const char __user *, size_t, loff_t
 static int tapechar_open(struct inode *,struct file *);
 static int tapechar_release(struct inode *,struct file *);
 static long tapechar_ioctl(struct file *, unsigned int, unsigned long);
-static long tapechar_compat_ioctl(struct file *, unsigned int,
-                          unsigned long);
+#ifdef CONFIG_COMPAT
+static long tapechar_compat_ioctl(struct file *, unsigned int, unsigned long);
+#endif
 
 static const struct file_operations tape_fops =
 {
@@ -46,7 +48,9 @@ static const struct file_operations tape_fops =
         .read = tapechar_read,
         .write = tapechar_write,
         .unlocked_ioctl = tapechar_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = tapechar_compat_ioctl,
+#endif
         .open = tapechar_open,
         .release = tapechar_release,
 };
@@ -457,15 +461,22 @@ tapechar_ioctl(struct file *filp, unsigned int no, unsigned long data)
         return rc;
 }
 
+#ifdef CONFIG_COMPAT
 static long
 tapechar_compat_ioctl(struct file *filp, unsigned int no, unsigned long data)
 {
         struct tape_device *device = filp->private_data;
         int rval = -ENOIOCTLCMD;
+        unsigned long argp;
 
+        /* The 'arg' argument of any ioctl function may only be used for
+         * pointers because of the compat pointer conversion.
+         * Consider this when adding new ioctls.
+         */
+        argp = (unsigned long) compat_ptr(data);
         if (device->discipline->ioctl_fn) {
                 mutex_lock(&device->mutex);
-                rval = device->discipline->ioctl_fn(device, no, data);
+                rval = device->discipline->ioctl_fn(device, no, argp);
                 mutex_unlock(&device->mutex);
                 if (rval == -EINVAL)
                         rval = -ENOIOCTLCMD;
@@ -473,6 +484,7 @@ tapechar_compat_ioctl(struct file *filp, unsigned int no, unsigned long data)
 
         return rval;
 }
+#endif /* CONFIG_COMPAT */
 
 /*
  * Initialize character device frontend.
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index a6087cec55b4..921dcda77676 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
+#include <asm/compat.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
 #include <asm/uaccess.h>
@@ -139,21 +140,26 @@ vmcp_write(struct file *file, const char __user *buff, size_t count,
 static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         struct vmcp_session *session;
+        int __user *argp;
         int temp;
 
         session = (struct vmcp_session *)file->private_data;
+        if (is_compat_task())
+                argp = compat_ptr(arg);
+        else
+                argp = (int __user *)arg;
         if (mutex_lock_interruptible(&session->mutex))
                 return -ERESTARTSYS;
         switch (cmd) {
         case VMCP_GETCODE:
                 temp = session->resp_code;
                 mutex_unlock(&session->mutex);
-                return put_user(temp, (int __user *)arg);
+                return put_user(temp, argp);
         case VMCP_SETBUF:
                 free_pages((unsigned long)session->response,
                                 get_order(session->bufsize));
                 session->response=NULL;
-                temp = get_user(session->bufsize, (int __user *)arg);
+                temp = get_user(session->bufsize, argp);
                 if (get_order(session->bufsize) > 8) {
                         session->bufsize = PAGE_SIZE;
                         temp = -EINVAL;
@@ -163,7 +169,7 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case VMCP_GETSIZE:
                 temp = session->resp_size;
                 mutex_unlock(&session->mutex);
-                return put_user(temp, (int __user *)arg);
+                return put_user(temp, argp);
         default:
                 mutex_unlock(&session->mutex);
                 return -ENOIOCTLCMD;
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index cc5144b6f9d9..c84ac9443079 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -12,6 +12,7 @@
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 
+#include <asm/compat.h>
 #include <asm/cio.h>
 #include <asm/chsc.h>
 #include <asm/isc.h>
@@ -770,24 +771,30 @@ out_free:
 static long chsc_ioctl(struct file *filp, unsigned int cmd,
                        unsigned long arg)
 {
+        void __user *argp;
+
         CHSC_MSG(2, "chsc_ioctl called, cmd=%x\n", cmd);
+        if (is_compat_task())
+                argp = compat_ptr(arg);
+        else
+                argp = (void __user *)arg;
         switch (cmd) {
         case CHSC_START:
-                return chsc_ioctl_start((void __user *)arg);
+                return chsc_ioctl_start(argp);
         case CHSC_INFO_CHANNEL_PATH:
-                return chsc_ioctl_info_channel_path((void __user *)arg);
+                return chsc_ioctl_info_channel_path(argp);
         case CHSC_INFO_CU:
-                return chsc_ioctl_info_cu((void __user *)arg);
+                return chsc_ioctl_info_cu(argp);
         case CHSC_INFO_SCH_CU:
-                return chsc_ioctl_info_sch_cu((void __user *)arg);
+                return chsc_ioctl_info_sch_cu(argp);
         case CHSC_INFO_CI:
-                return chsc_ioctl_conf_info((void __user *)arg);
+                return chsc_ioctl_conf_info(argp);
         case CHSC_INFO_CCL:
-                return chsc_ioctl_conf_comp_list((void __user *)arg);
+                return chsc_ioctl_conf_comp_list(argp);
         case CHSC_INFO_CPD:
-                return chsc_ioctl_chpd((void __user *)arg);
+                return chsc_ioctl_chpd(argp);
         case CHSC_INFO_DCAL:
-                return chsc_ioctl_dcal((void __user *)arg);
+                return chsc_ioctl_dcal(argp);
         default: /* unknown ioctl number */
                 return -ENOIOCTLCMD;
         }
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 0d4d18bdd45c..c68be24e27d9 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -393,10 +393,12 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
                          * u_mult_inv > 128 bytes.
                          */
                         if (copied == 0) {
-                                int len;
+                                unsigned int len;
                                 spin_unlock_bh(&zcrypt_device_lock);
                                 /* len is max 256 / 2 - 120 = 8 */
                                 len = crt->inputdatalength / 2 - 120;
+                                if (len > sizeof(z1))
+                                        return -EFAULT;
                                 z1 = z2 = z3 = 0;
                                 if (copy_from_user(&z1, crt->np_prime, len) ||
                                     copy_from_user(&z2, crt->bp_key, len) ||
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index a23726a0735c..142f72a2ca5a 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -373,6 +373,8 @@ static int convert_type86(struct zcrypt_device *zdev,
                         zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
                         return -EAGAIN;
                 }
+                if (service_rc == 8 && service_rs == 72)
+                        return -EINVAL;
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 79c120578e61..68f3e6204db8 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -470,6 +470,8 @@ static int convert_type86_ica(struct zcrypt_device *zdev,
                 }
                 if (service_rc == 12 && service_rs == 769)
                         return -EINVAL;
+                if (service_rc == 8 && service_rs == 72)
+                        return -EINVAL;
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 3c77bfe0764c..147bb1a69aba 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -3398,7 +3398,7 @@ claw_init(void)
                 goto out_err;
         }
         CLAW_DBF_TEXT(2, setup, "init_mod");
-        claw_root_dev = root_device_register("qeth");
+        claw_root_dev = root_device_register("claw");
         ret = IS_ERR(claw_root_dev) ? PTR_ERR(claw_root_dev) : 0;
         if (ret)
                 goto register_err;
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c
index f932400e980a..0eb6eefd2c1a 100644
--- a/drivers/s390/scsi/zfcp_cfdc.c
+++ b/drivers/s390/scsi/zfcp_cfdc.c
@@ -12,6 +12,7 @@
 
 #include <linux/types.h>
 #include <linux/miscdevice.h>
+#include <asm/compat.h>
 #include <asm/ccwdev.h>
 #include "zfcp_def.h"
 #include "zfcp_ext.h"
@@ -163,7 +164,7 @@ static void zfcp_cfdc_req_to_sense(struct zfcp_cfdc_data *data,
 }
 
 static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
-                                unsigned long buffer)
+                                unsigned long arg)
 {
         struct zfcp_cfdc_data *data;
         struct zfcp_cfdc_data __user *data_user;
@@ -175,7 +176,11 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
         if (command != ZFCP_CFDC_IOC)
                 return -ENOTTY;
 
-        data_user = (void __user *) buffer;
+        if (is_compat_task())
+                data_user = compat_ptr(arg);
+        else
+                data_user = (void __user *)arg;
+
         if (!data_user)
                 return -EINVAL;
 
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 84450955ae11..7369c8911bcf 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -327,7 +327,7 @@ static void zfcp_dbf_hba_view_response(char **p,
                         break;
                 zfcp_dbf_out(p, "scsi_cmnd", "0x%0Lx", r->u.fcp.cmnd);
                 zfcp_dbf_out(p, "scsi_serial", "0x%016Lx", r->u.fcp.serial);
-                p += sprintf(*p, "\n");
+                *p += sprintf(*p, "\n");
                 break;
 
         case FSF_QTCB_OPEN_PORT_WITH_DID:
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 03dec832b465..66bdb34143cb 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -108,6 +108,7 @@ extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *);
 extern int zfcp_fc_gs_setup(struct zfcp_adapter *);
 extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);
 extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *);
+extern int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *);
 
 /* zfcp_fsf.c */
 extern int zfcp_fsf_open_port(struct zfcp_erp_action *);
@@ -129,9 +130,9 @@ extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);
 extern int zfcp_fsf_status_read(struct zfcp_qdio *);
 extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);
 extern int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *, struct zfcp_fsf_ct_els *,
-                            mempool_t *);
+                            mempool_t *, unsigned int);
 extern int zfcp_fsf_send_els(struct zfcp_adapter *, u32,
-                             struct zfcp_fsf_ct_els *);
+                             struct zfcp_fsf_ct_els *, unsigned int);
 extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *,
                                           struct scsi_cmnd *);
 extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index ac5e3b7a3576..0f7b493fb105 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -258,7 +258,8 @@ static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port,
         gid_pn->gid_pn_req.gid_pn.fn_wwpn = port->wwpn;
 
         ret = zfcp_fsf_send_ct(&adapter->gs->ds, &gid_pn->ct,
-                               adapter->pool.gid_pn_req);
+                               adapter->pool.gid_pn_req,
+                               ZFCP_FC_CTELS_TMO);
         if (!ret) {
                 wait_for_completion(&completion);
                 zfcp_fc_ns_gid_pn_eval(gid_pn);
@@ -421,7 +422,8 @@ static int zfcp_fc_adisc(struct zfcp_port *port)
         hton24(adisc->adisc_req.adisc_port_id,
                fc_host_port_id(adapter->scsi_host));
 
-        ret = zfcp_fsf_send_els(adapter, port->d_id, &adisc->els);
+        ret = zfcp_fsf_send_els(adapter, port->d_id, &adisc->els,
+                                ZFCP_FC_CTELS_TMO);
         if (ret)
                 kmem_cache_free(zfcp_data.adisc_cache, adisc);
 
@@ -532,7 +534,8 @@ static int zfcp_fc_send_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft,
         ct->req = &gpn_ft->sg_req;
         ct->resp = gpn_ft->sg_resp;
 
-        ret = zfcp_fsf_send_ct(&adapter->gs->ds, ct, NULL);
+        ret = zfcp_fsf_send_ct(&adapter->gs->ds, ct, NULL,
+                               ZFCP_FC_CTELS_TMO);
         if (!ret)
                 wait_for_completion(&completion);
         return ret;
@@ -677,6 +680,44 @@ static void zfcp_fc_ct_els_job_handler(void *data)
         job->job_done(job);
 }
 
+static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job)
+{
+        u32 preamble_word1;
+        u8 gs_type;
+        struct zfcp_adapter *adapter;
+
+        preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;
+        gs_type = (preamble_word1 & 0xff000000) >> 24;
+
+        adapter = (struct zfcp_adapter *) job->shost->hostdata[0];
+
+        switch (gs_type) {
+        case FC_FST_ALIAS:
+                return &adapter->gs->as;
+        case FC_FST_MGMT:
+                return &adapter->gs->ms;
+        case FC_FST_TIME:
+                return &adapter->gs->ts;
+                break;
+        case FC_FST_DIR:
+                return &adapter->gs->ds;
+                break;
+        default:
+                return NULL;
+        }
+}
+
+static void zfcp_fc_ct_job_handler(void *data)
+{
+        struct fc_bsg_job *job = data;
+        struct zfcp_fc_wka_port *wka_port;
+
+        wka_port = zfcp_fc_job_wka_port(job);
+        zfcp_fc_wka_port_put(wka_port);
+
+        zfcp_fc_ct_els_job_handler(data);
+}
+
 static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,
                                 struct zfcp_adapter *adapter)
 {
@@ -695,43 +736,27 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,
         } else
                 d_id = ntoh24(job->request->rqst_data.h_els.port_id);
 
-        return zfcp_fsf_send_els(adapter, d_id, els);
+        els->handler = zfcp_fc_ct_els_job_handler;
+        return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ);
 }
 
 static int zfcp_fc_exec_ct_job(struct fc_bsg_job *job,
                                struct zfcp_adapter *adapter)
 {
         int ret;
-        u8 gs_type;
         struct zfcp_fsf_ct_els *ct = job->dd_data;
         struct zfcp_fc_wka_port *wka_port;
-        u32 preamble_word1;
 
-        preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;
-        gs_type = (preamble_word1 & 0xff000000) >> 24;
-
-        switch (gs_type) {
-        case FC_FST_ALIAS:
-                wka_port = &adapter->gs->as;
-                break;
-        case FC_FST_MGMT:
-                wka_port = &adapter->gs->ms;
-                break;
-        case FC_FST_TIME:
-                wka_port = &adapter->gs->ts;
-                break;
-        case FC_FST_DIR:
-                wka_port = &adapter->gs->ds;
-                break;
-        default:
-                return -EINVAL; /* no such service */
-        }
+        wka_port = zfcp_fc_job_wka_port(job);
+        if (!wka_port)
+                return -EINVAL;
 
         ret = zfcp_fc_wka_port_get(wka_port);
         if (ret)
                 return ret;
 
-        ret = zfcp_fsf_send_ct(wka_port, ct, NULL);
+        ct->handler = zfcp_fc_ct_job_handler;
+        ret = zfcp_fsf_send_ct(wka_port, ct, NULL, job->req->timeout / HZ);
         if (ret)
                 zfcp_fc_wka_port_put(wka_port);
 
@@ -752,7 +777,6 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)
 
         ct_els->req = job->request_payload.sg_list;
         ct_els->resp = job->reply_payload.sg_list;
-        ct_els->handler = zfcp_fc_ct_els_job_handler;
         ct_els->handler_data = job;
 
         switch (job->request->msgcode) {
@@ -767,6 +791,12 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)
         }
 }
 
+int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *job)
+{
+        /* hardware tracks timeout, reset bsg timeout to not interfere */
+        return -EAGAIN;
+}
+
 int zfcp_fc_gs_setup(struct zfcp_adapter *adapter)
 {
         struct zfcp_fc_wka_ports *wka_ports;
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index cb2a3669a384..0747b087390d 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -27,6 +27,8 @@
 #define ZFCP_FC_GPN_FT_MAX_ENT    (ZFCP_FC_GPN_FT_NUM_BUFS * \
                                         (ZFCP_FC_GPN_FT_ENT_PAGE + 1))
 
+#define ZFCP_FC_CTELS_TMO       (2 * FC_DEF_R_A_TOV / 1000)
+
 /**
  * struct zfcp_fc_gid_pn_req - container for ct header plus gid_pn request
  * @ct_hdr: FC GS common transport header
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 482dcd97aa5d..e8fb4d9baa8b 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1068,20 +1068,20 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,
 static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,
                                  struct scatterlist *sg_req,
                                  struct scatterlist *sg_resp,
-                                 int max_sbals)
+                                 int max_sbals, unsigned int timeout)
 {
         int ret;
-        unsigned int fcp_chan_timeout;
 
         ret = zfcp_fsf_setup_ct_els_sbals(req, sg_req, sg_resp, max_sbals);
         if (ret)
                 return ret;
 
         /* common settings for ct/gs and els requests */
-        fcp_chan_timeout = 2 * FC_DEF_R_A_TOV / 1000;
+        if (timeout > 255)
+                timeout = 255; /* max value accepted by hardware */
         req->qtcb->bottom.support.service_class = FSF_CLASS_3;
-        req->qtcb->bottom.support.timeout = fcp_chan_timeout;
-        zfcp_fsf_start_timer(req, (fcp_chan_timeout + 10) * HZ);
+        req->qtcb->bottom.support.timeout = timeout;
+        zfcp_fsf_start_timer(req, (timeout + 10) * HZ);
 
         return 0;
 }
@@ -1092,7 +1092,8 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,
  * @pool: if non-null this mempool is used to allocate struct zfcp_fsf_req
  */
 int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *wka_port,
-                     struct zfcp_fsf_ct_els *ct, mempool_t *pool)
+                     struct zfcp_fsf_ct_els *ct, mempool_t *pool,
+                     unsigned int timeout)
 {
         struct zfcp_qdio *qdio = wka_port->adapter->qdio;
         struct zfcp_fsf_req *req;
@@ -1111,7 +1112,7 @@ int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *wka_port,
 
         req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
         ret = zfcp_fsf_setup_ct_els(req, ct->req, ct->resp,
-                                    FSF_MAX_SBALS_PER_REQ);
+                                    FSF_MAX_SBALS_PER_REQ, timeout);
         if (ret)
                 goto failed_send;
 
@@ -1188,7 +1189,7 @@ skip_fsfstatus:
  * @els: pointer to struct zfcp_send_els with data for the command
  */
 int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,
-                      struct zfcp_fsf_ct_els *els)
+                      struct zfcp_fsf_ct_els *els, unsigned int timeout)
 {
         struct zfcp_fsf_req *req;
         struct zfcp_qdio *qdio = adapter->qdio;
@@ -1206,7 +1207,7 @@ int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,
         }
 
         req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
-        ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, 2);
+        ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, 2, timeout);
 
         if (ret)
                 goto failed_send;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 771cc536a989..8e6fc68d6bd4 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -652,6 +652,7 @@ struct fc_function_template zfcp_transport_functions = {
         .show_host_port_state = 1,
         .show_host_active_fc4s = 1,
         .bsg_request = zfcp_fc_exec_bsg_job,
+        .bsg_timeout = zfcp_fc_timeout_bsg_job,
         /* no functions registered for following dynamic attributes but
            directly set by LLDD */
         .show_host_port_type = 1,
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 7c815d3327f7..28d86f9df83c 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -522,6 +522,40 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct of_device *op,
         set_fan_speeds(fp);
 }
 
+static void destroy_one_temp(struct bbc_cpu_temperature *tp)
+{
+        bbc_i2c_detach(tp->client);
+        kfree(tp);
+}
+
+static void destroy_all_temps(struct bbc_i2c_bus *bp)
+{
+        struct bbc_cpu_temperature *tp, *tpos;
+
+        list_for_each_entry_safe(tp, tpos, &bp->temps, bp_list) {
+                list_del(&tp->bp_list);
+                list_del(&tp->glob_list);
+                destroy_one_temp(tp);
+        }
+}
+
+static void destroy_one_fan(struct bbc_fan_control *fp)
+{
+        bbc_i2c_detach(fp->client);
+        kfree(fp);
+}
+
+static void destroy_all_fans(struct bbc_i2c_bus *bp)
+{
+        struct bbc_fan_control *fp, *fpos;
+
+        list_for_each_entry_safe(fp, fpos, &bp->fans, bp_list) {
+                list_del(&fp->bp_list);
+                list_del(&fp->glob_list);
+                destroy_one_fan(fp);
+        }
+}
+
 int bbc_envctrl_init(struct bbc_i2c_bus *bp)
 {
         struct of_device *op;
@@ -541,6 +575,8 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
                         int err = PTR_ERR(kenvctrld_task);
 
                         kenvctrld_task = NULL;
+                        destroy_all_temps(bp);
+                        destroy_all_fans(bp);
                         return err;
                 }
         }
@@ -548,35 +584,11 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
         return 0;
 }
 
-static void destroy_one_temp(struct bbc_cpu_temperature *tp)
-{
-        bbc_i2c_detach(tp->client);
-        kfree(tp);
-}
-
-static void destroy_one_fan(struct bbc_fan_control *fp)
-{
-        bbc_i2c_detach(fp->client);
-        kfree(fp);
-}
-
 void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp)
 {
-        struct bbc_cpu_temperature *tp, *tpos;
-        struct bbc_fan_control *fp, *fpos;
-
         if (kenvctrld_task)
                 kthread_stop(kenvctrld_task);
 
-        list_for_each_entry_safe(tp, tpos, &bp->temps, bp_list) {
-                list_del(&tp->bp_list);
-                list_del(&tp->glob_list);
-                destroy_one_temp(tp);
-        }
-
-        list_for_each_entry_safe(fp, fpos, &bp->fans, bp_list) {
-                list_del(&fp->bp_list);
-                list_del(&fp->glob_list);
-                destroy_one_fan(fp);
-        }
+        destroy_all_temps(bp);
+        destroy_all_fans(bp);
 }
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 2a889853a106..7e26ebc26661 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -293,7 +293,10 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
                         status = -EINVAL;
                 }
         }
-        aac_fib_complete(fibptr);
+        /* Do not set XferState to zero unless receives a response from F/W */
+        if (status >= 0)
+                aac_fib_complete(fibptr);
+
         /* Send a CT_COMMIT_CONFIG to enable discovery of devices */
         if (status >= 0) {
                 if ((aac_commit == 1) || commit_flag) {
@@ -310,13 +313,18 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
                                     FsaNormal,
                                     1, 1,
                                     NULL, NULL);
-                        aac_fib_complete(fibptr);
+                        /* Do not set XferState to zero unless
+                         * receives a response from F/W */
+                        if (status >= 0)
+                                aac_fib_complete(fibptr);
                 } else if (aac_commit == 0) {
                         printk(KERN_WARNING
                           "aac_get_config_status: Foreign device configurations are being ignored\n");
                 }
         }
-        aac_fib_free(fibptr);
+        /* FIB should be freed only after getting the response from the F/W */
+        if (status != -ERESTARTSYS)
+                aac_fib_free(fibptr);
         return status;
 }
 
@@ -355,7 +363,9 @@ int aac_get_containers(struct aac_dev *dev)
                 maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);
                 aac_fib_complete(fibptr);
         }
-        aac_fib_free(fibptr);
+        /* FIB should be freed only after getting the response from the F/W */
+        if (status != -ERESTARTSYS)
+                aac_fib_free(fibptr);
 
         if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS)
                 maximum_num_containers = MAXIMUM_NUM_CONTAINERS;
@@ -1245,8 +1255,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
                          NULL);
 
         if (rcode < 0) {
-                aac_fib_complete(fibptr);
-                aac_fib_free(fibptr);
+                /* FIB should be freed only after
+                 * getting the response from the F/W */
+                if (rcode != -ERESTARTSYS) {
+                        aac_fib_complete(fibptr);
+                        aac_fib_free(fibptr);
+                }
                 return rcode;
         }
         memcpy(&dev->adapter_info, info, sizeof(*info));
@@ -1270,6 +1284,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
 
                 if (rcode >= 0)
                         memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo));
+                if (rcode == -ERESTARTSYS) {
+                        fibptr = aac_fib_alloc(dev);
+                        if (!fibptr)
+                                return -ENOMEM;
+                }
+
         }
 
 
@@ -1470,9 +1490,11 @@ int aac_get_adapter_info(struct aac_dev* dev)
                           (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
                 }
         }
-
-        aac_fib_complete(fibptr);
-        aac_fib_free(fibptr);
+        /* FIB should be freed only after getting the response from the F/W */
+        if (rcode != -ERESTARTSYS) {
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
+        }
 
         return rcode;
 }
@@ -1633,6 +1655,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)
          *      Alocate and initialize a Fib
          */
         if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+                printk(KERN_WARNING "aac_read: fib allocation failed\n");
                 return -1;
         }
 
@@ -1712,9 +1735,14 @@ static int aac_write(struct scsi_cmnd * scsicmd)
          *      Allocate and initialize a Fib then setup a BlockWrite command
          */
         if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
-                scsicmd->result = DID_ERROR << 16;
-                scsicmd->scsi_done(scsicmd);
-                return 0;
+                /* FIB temporarily unavailable,not catastrophic failure */
+
+                /* scsicmd->result = DID_ERROR << 16;
+                 * scsicmd->scsi_done(scsicmd);
+                 * return 0;
+                 */
+                printk(KERN_WARNING "aac_write: fib allocation failed\n");
+                return -1;
         }
 
         status = aac_adapter_write(cmd_fibcontext, scsicmd, lba, count, fua);
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 83986ed86556..619c02d9c862 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 2461
+# define AAC_DRIVER_BUILD 24702
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
@@ -1036,6 +1036,9 @@ struct aac_dev
         u8                      printf_enabled;
         u8                      in_reset;
         u8                      msi;
+        int                     management_fib_count;
+        spinlock_t              manage_lock;
+
 };
 
 #define aac_adapter_interrupt(dev) \
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 0391d759dfdb..9c0c91178538 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -153,7 +153,7 @@ cleanup:
                 fibptr->hw_fib_pa = hw_fib_pa;
                 fibptr->hw_fib_va = hw_fib;
         }
-        if (retval != -EINTR)
+        if (retval != -ERESTARTSYS)
                 aac_fib_free(fibptr);
         return retval;
 }
@@ -322,7 +322,7 @@ return_fib:
                 }
                 if (f.wait) {
                         if(down_interruptible(&fibctx->wait_sem) < 0) {
-                                status = -EINTR;
+                                status = -ERESTARTSYS;
                         } else {
                                 /* Lock again and retry */
                                 spin_lock_irqsave(&dev->fib_lock, flags);
@@ -593,10 +593,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 u64 addr;
                                 void* p;
                                 if (upsg->sg[i].count >
-                                    (dev->adapter_info.options &
+                                    ((dev->adapter_info.options &
                                      AAC_OPT_NEW_COMM) ?
                                       (dev->scsi_host_ptr->max_sectors << 9) :
-                                      65536) {
+                                      65536)) {
                                         rcode = -EINVAL;
                                         goto cleanup;
                                 }
@@ -645,10 +645,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 u64 addr;
                                 void* p;
                                 if (usg->sg[i].count >
-                                    (dev->adapter_info.options &
+                                    ((dev->adapter_info.options &
                                      AAC_OPT_NEW_COMM) ?
                                       (dev->scsi_host_ptr->max_sectors << 9) :
-                                      65536) {
+                                      65536)) {
                                         rcode = -EINVAL;
                                         goto cleanup;
                                 }
@@ -695,10 +695,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 uintptr_t addr;
                                 void* p;
                                 if (usg->sg[i].count >
-                                    (dev->adapter_info.options &
+                                    ((dev->adapter_info.options &
                                      AAC_OPT_NEW_COMM) ?
                                       (dev->scsi_host_ptr->max_sectors << 9) :
-                                      65536) {
+                                      65536)) {
                                         rcode = -EINVAL;
                                         goto cleanup;
                                 }
@@ -734,10 +734,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 dma_addr_t addr;
                                 void* p;
                                 if (upsg->sg[i].count >
-                                    (dev->adapter_info.options &
+                                    ((dev->adapter_info.options &
                                      AAC_OPT_NEW_COMM) ?
                                       (dev->scsi_host_ptr->max_sectors << 9) :
-                                      65536) {
+                                      65536)) {
                                         rcode = -EINVAL;
                                         goto cleanup;
                                 }
@@ -772,8 +772,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                 psg->count = cpu_to_le32(sg_indx+1);
                 status = aac_fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL);
         }
-        if (status == -EINTR) {
-                rcode = -EINTR;
+        if (status == -ERESTARTSYS) {
+                rcode = -ERESTARTSYS;
                 goto cleanup;
         }
 
@@ -810,7 +810,7 @@ cleanup:
         for(i=0; i <= sg_indx; i++){
                 kfree(sg_list[i]);
         }
-        if (rcode != -EINTR) {
+        if (rcode != -ERESTARTSYS) {
                 aac_fib_complete(srbfib);
                 aac_fib_free(srbfib);
         }
@@ -848,7 +848,7 @@ int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg)
          */
 
         status = aac_dev_ioctl(dev, cmd, arg);
-        if(status != -ENOTTY)
+        if (status != -ENOTTY)
                 return status;
 
         switch (cmd) {
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 666d5151d628..a7261486ccd4 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -194,7 +194,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 
         if (status >= 0)
                 aac_fib_complete(fibctx);
-        aac_fib_free(fibctx);
+        /* FIB should be freed only after getting the response from the F/W */
+        if (status != -ERESTARTSYS)
+                aac_fib_free(fibctx);
         return status;
 }
 
@@ -304,6 +306,8 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         /*
          *      Check the preferred comm settings, defaults from template.
          */
+        dev->management_fib_count = 0;
+        spin_lock_init(&dev->manage_lock);
         dev->max_fib_size = sizeof(struct hw_fib);
         dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size
                 - sizeof(struct aac_fibhdr)
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 956261f25181..94d2954d79ae 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -189,7 +189,14 @@ struct fib *aac_fib_alloc(struct aac_dev *dev)
 
 void aac_fib_free(struct fib *fibptr)
 {
-        unsigned long flags;
+        unsigned long flags, flagsv;
+
+        spin_lock_irqsave(&fibptr->event_lock, flagsv);
+        if (fibptr->done == 2) {
+                spin_unlock_irqrestore(&fibptr->event_lock, flagsv);
+                return;
+        }
+        spin_unlock_irqrestore(&fibptr->event_lock, flagsv);
 
         spin_lock_irqsave(&fibptr->dev->fib_lock, flags);
         if (unlikely(fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
@@ -390,6 +397,8 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         struct hw_fib * hw_fib = fibptr->hw_fib_va;
         unsigned long flags = 0;
         unsigned long qflags;
+        unsigned long mflags = 0;
+
 
         if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
                 return -EBUSY;
@@ -471,9 +480,31 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         if (!dev->queues)
                 return -EBUSY;
 
-        if(wait)
+        if (wait) {
+
+                spin_lock_irqsave(&dev->manage_lock, mflags);
+                if (dev->management_fib_count >= AAC_NUM_MGT_FIB) {
+                        printk(KERN_INFO "No management Fibs Available:%d\n",
+                                                dev->management_fib_count);
+                        spin_unlock_irqrestore(&dev->manage_lock, mflags);
+                        return -EBUSY;
+                }
+                dev->management_fib_count++;
+                spin_unlock_irqrestore(&dev->manage_lock, mflags);
                 spin_lock_irqsave(&fibptr->event_lock, flags);
-        aac_adapter_deliver(fibptr);
+        }
+
+        if (aac_adapter_deliver(fibptr) != 0) {
+                printk(KERN_ERR "aac_fib_send: returned -EBUSY\n");
+                if (wait) {
+                        spin_unlock_irqrestore(&fibptr->event_lock, flags);
+                        spin_lock_irqsave(&dev->manage_lock, mflags);
+                        dev->management_fib_count--;
+                        spin_unlock_irqrestore(&dev->manage_lock, mflags);
+                }
+                return -EBUSY;
+        }
+
 
         /*
          *      If the caller wanted us to wait for response wait now.
@@ -516,14 +547,15 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                                 udelay(5);
                         }
                 } else if (down_interruptible(&fibptr->event_wait)) {
-                        fibptr->done = 2;
-                        up(&fibptr->event_wait);
+                        /* Do nothing ... satisfy
+                         * down_interruptible must_check */
                 }
+
                 spin_lock_irqsave(&fibptr->event_lock, flags);
-                if ((fibptr->done == 0) || (fibptr->done == 2)) {
+                if (fibptr->done == 0) {
                         fibptr->done = 2; /* Tell interrupt we aborted */
                         spin_unlock_irqrestore(&fibptr->event_lock, flags);
-                        return -EINTR;
+                        return -ERESTARTSYS;
                 }
                 spin_unlock_irqrestore(&fibptr->event_lock, flags);
                 BUG_ON(fibptr->done == 0);
@@ -689,6 +721,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
 
 int aac_fib_complete(struct fib *fibptr)
 {
+        unsigned long flags;
         struct hw_fib * hw_fib = fibptr->hw_fib_va;
 
         /*
@@ -709,6 +742,13 @@ int aac_fib_complete(struct fib *fibptr)
          *      command is complete that we had sent to the adapter and this
          *      cdb could be reused.
          */
+        spin_lock_irqsave(&fibptr->event_lock, flags);
+        if (fibptr->done == 2) {
+                spin_unlock_irqrestore(&fibptr->event_lock, flags);
+                return 0;
+        }
+        spin_unlock_irqrestore(&fibptr->event_lock, flags);
+
         if((hw_fib->header.XferState & cpu_to_le32(SentFromHost)) &&
                 (hw_fib->header.XferState & cpu_to_le32(AdapterProcessed)))
         {
@@ -1355,7 +1395,10 @@ int aac_reset_adapter(struct aac_dev * aac, int forced)
 
                         if (status >= 0)
                                 aac_fib_complete(fibctx);
-                        aac_fib_free(fibctx);
+                        /* FIB should be freed only after getting
+                         * the response from the F/W */
+                        if (status != -ERESTARTSYS)
+                                aac_fib_free(fibctx);
                 }
         }
 
@@ -1759,6 +1802,7 @@ int aac_command_thread(void *data)
                                 struct fib *fibptr;
 
                                 if ((fibptr = aac_fib_alloc(dev))) {
+                                        int status;
                                         __le32 *info;
 
                                         aac_fib_init(fibptr);
@@ -1769,15 +1813,21 @@ int aac_command_thread(void *data)
 
                                         *info = cpu_to_le32(now.tv_sec);
 
-                                        (void)aac_fib_send(SendHostTime,
+                                        status = aac_fib_send(SendHostTime,
                                                 fibptr,
                                                 sizeof(*info),
                                                 FsaNormal,
                                                 1, 1,
                                                 NULL,
                                                 NULL);
-                                        aac_fib_complete(fibptr);
-                                        aac_fib_free(fibptr);
+                                        /* Do not set XferState to zero unless
+                                         * receives a response from F/W */
+                                        if (status >= 0)
+                                                aac_fib_complete(fibptr);
+                                        /* FIB should be freed only after
+                                         * getting the response from the F/W */
+                                        if (status != -ERESTARTSYS)
+                                                aac_fib_free(fibptr);
                                 }
                                 difference = (long)(unsigned)update_interval*HZ;
                         } else {
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index abc9ef5d1b10..9c7408fe8c7d 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -57,9 +57,9 @@ unsigned int aac_response_normal(struct aac_queue * q)
         struct hw_fib * hwfib;
         struct fib * fib;
         int consumed = 0;
-        unsigned long flags;
+        unsigned long flags, mflags;
 
-        spin_lock_irqsave(q->lock, flags);      
+        spin_lock_irqsave(q->lock, flags);
         /*
          *      Keep pulling response QEs off the response queue and waking
          *      up the waiters until there are no more QEs. We then return
@@ -125,12 +125,21 @@ unsigned int aac_response_normal(struct aac_queue * q)
                 } else {
                         unsigned long flagv;
                         spin_lock_irqsave(&fib->event_lock, flagv);
-                        if (!fib->done)
+                        if (!fib->done) {
                                 fib->done = 1;
-                        up(&fib->event_wait);
+                                up(&fib->event_wait);
+                        }
                         spin_unlock_irqrestore(&fib->event_lock, flagv);
+
+                        spin_lock_irqsave(&dev->manage_lock, mflags);
+                        dev->management_fib_count--;
+                        spin_unlock_irqrestore(&dev->manage_lock, mflags);
+
                         FIB_COUNTER_INCREMENT(aac_config.NormalRecved);
                         if (fib->done == 2) {
+                                spin_lock_irqsave(&fib->event_lock, flagv);
+                                fib->done = 0;
+                                spin_unlock_irqrestore(&fib->event_lock, flagv);
                                 aac_fib_complete(fib);
                                 aac_fib_free(fib);
                         }
@@ -232,6 +241,7 @@ unsigned int aac_command_normal(struct aac_queue *q)
 
 unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
 {
+        unsigned long mflags;
         dprintk((KERN_INFO "aac_intr_normal(%p,%x)\n", dev, index));
         if ((index & 0x00000002L)) {
                 struct hw_fib * hw_fib;
@@ -320,11 +330,25 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
                         unsigned long flagv;
                         dprintk((KERN_INFO "event_wait up\n"));
                         spin_lock_irqsave(&fib->event_lock, flagv);
-                        if (!fib->done)
+                        if (!fib->done) {
                                 fib->done = 1;
-                        up(&fib->event_wait);
+                                up(&fib->event_wait);
+                        }
                         spin_unlock_irqrestore(&fib->event_lock, flagv);
+
+                        spin_lock_irqsave(&dev->manage_lock, mflags);
+                        dev->management_fib_count--;
+                        spin_unlock_irqrestore(&dev->manage_lock, mflags);
+
                         FIB_COUNTER_INCREMENT(aac_config.NormalRecved);
+                        if (fib->done == 2) {
+                                spin_lock_irqsave(&fib->event_lock, flagv);
+                                fib->done = 0;
+                                spin_unlock_irqrestore(&fib->event_lock, flagv);
+                                aac_fib_complete(fib);
+                                aac_fib_free(fib);
+                        }
+
                 }
                 return 0;
         }
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 4d419c155ce9..78971db5b60e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -3171,13 +3171,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                 tinfo->curr.transport_version = 2;
                                 tinfo->goal.transport_version = 2;
                                 tinfo->goal.ppr_options = 0;
-                                /*
-                                 * Remove any SCBs in the waiting for selection
-                                 * queue that may also be for this target so
-                                 * that command ordering is preserved.
-                                 */
-                                ahd_freeze_devq(ahd, scb);
-                                ahd_qinfifo_requeue_tail(ahd, scb);
+                                if (scb != NULL) {
+                                        /*
+                                         * Remove any SCBs in the waiting
+                                         * for selection queue that may
+                                         * also be for this target so that
+                                         * command ordering is preserved.
+                                         */
+                                        ahd_freeze_devq(ahd, scb);
+                                        ahd_qinfifo_requeue_tail(ahd, scb);
+                                }
                                 printerror = 0;
                         }
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE)
@@ -3194,13 +3197,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                       MSG_EXT_WDTR_BUS_8_BIT,
                                       AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                       /*paused*/TRUE);
-                        /*
-                         * Remove any SCBs in the waiting for selection
-                         * queue that may also be for this target so that
-                         * command ordering is preserved.
-                         */
-                        ahd_freeze_devq(ahd, scb);
-                        ahd_qinfifo_requeue_tail(ahd, scb);
+                        if (scb != NULL) {
+                                /*
+                                 * Remove any SCBs in the waiting for
+                                 * selection queue that may also be for
+                                 * this target so that command ordering
+                                 * is preserved.
+                                 */
+                                ahd_freeze_devq(ahd, scb);
+                                ahd_qinfifo_requeue_tail(ahd, scb);
+                        }
                         printerror = 0;
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)
                         && ppr_busfree == 0) {
@@ -3217,13 +3223,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                         /*ppr_options*/0,
                                         AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                         /*paused*/TRUE);
-                        /*
-                         * Remove any SCBs in the waiting for selection
-                         * queue that may also be for this target so that
-                         * command ordering is preserved.
-                         */
-                        ahd_freeze_devq(ahd, scb);
-                        ahd_qinfifo_requeue_tail(ahd, scb);
+                        if (scb != NULL) {
+                                /*
+                                 * Remove any SCBs in the waiting for
+                                 * selection queue that may also be for
+                                 * this target so that command ordering
+                                 * is preserved.
+                                 */
+                                ahd_freeze_devq(ahd, scb);
+                                ahd_qinfifo_requeue_tail(ahd, scb);
+                        }
                         printerror = 0;
                 } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_IDE_BUSFREE) != 0
                         && ahd_sent_msg(ahd, AHDMSG_1B,
@@ -3251,7 +3260,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
          * the message phases.  We check it last in case we
          * had to send some other message that caused a busfree.
          */
-        if (printerror != 0
+        if (scb != NULL && printerror != 0
          && (lastphase == P_MESGIN || lastphase == P_MESGOUT)
          && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) {
 
diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.c b/drivers/scsi/cxgb3i/cxgb3i_offload.c
index 26ffdcd5a437..15a00e8b7122 100644
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
@@ -1440,6 +1440,10 @@ void cxgb3i_c3cn_release(struct s3_conn *c3cn)
 static int is_cxgb3_dev(struct net_device *dev)
 {
         struct cxgb3i_sdev_data *cdata;
+        struct net_device *ndev = dev;
+
+        if (dev->priv_flags & IFF_802_1Q_VLAN)
+                ndev = vlan_dev_real_dev(dev);
 
         write_lock(&cdata_rwlock);
         list_for_each_entry(cdata, &cdata_list, list) {
@@ -1447,7 +1451,7 @@ static int is_cxgb3_dev(struct net_device *dev)
                 int i;
 
                 for (i = 0; i < ports->nports; i++)
-                        if (dev == ports->lldevs[i]) {
+                        if (ndev == ports->lldevs[i]) {
                                 write_unlock(&cdata_rwlock);
                                 return 1;
                         }
@@ -1566,6 +1570,26 @@ out_err:
         return -EINVAL;
 }
 
+/**
+ * cxgb3i_find_dev - find the interface associated with the given address
+ * @ipaddr: ip address
+ */
+static struct net_device *
+cxgb3i_find_dev(struct net_device *dev, __be32 ipaddr)
+{
+        struct flowi fl;
+        int err;
+        struct rtable *rt;
+
+        memset(&fl, 0, sizeof(fl));
+        fl.nl_u.ip4_u.daddr = ipaddr;
+
+        err = ip_route_output_key(dev ? dev_net(dev) : &init_net, &rt, &fl);
+        if (!err)
+                return (&rt->u.dst)->dev;
+
+        return NULL;
+}
 
 /**
  * cxgb3i_c3cn_connect - initiates an iscsi tcp connection to a given address
@@ -1581,6 +1605,7 @@ int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn,
         struct cxgb3i_sdev_data *cdata;
         struct t3cdev *cdev;
         __be32 sipv4;
+        struct net_device *dstdev;
         int err;
 
         c3cn_conn_debug("c3cn 0x%p, dev 0x%p.\n", c3cn, dev);
@@ -1591,6 +1616,13 @@ int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn,
         c3cn->daddr.sin_port = usin->sin_port;
         c3cn->daddr.sin_addr.s_addr = usin->sin_addr.s_addr;
 
+        dstdev = cxgb3i_find_dev(dev, usin->sin_addr.s_addr);
+        if (!dstdev || !is_cxgb3_dev(dstdev))
+                return -ENETUNREACH;
+
+        if (dstdev->priv_flags & IFF_802_1Q_VLAN)
+                dev = dstdev;
+
         rt = find_route(dev, c3cn->saddr.sin_addr.s_addr,
                         c3cn->daddr.sin_addr.s_addr,
                         c3cn->saddr.sin_port,
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index ce522702a6c1..2cc39684ce97 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -4142,8 +4142,8 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
         spin_lock_irq(shost->host_lock);
         if (vport->fc_rscn_flush) {
                 /* Another thread is walking fc_rscn_id_list on this vport */
-                spin_unlock_irq(shost->host_lock);
                 vport->fc_flag |= FC_RSCN_DISCOVERY;
+                spin_unlock_irq(shost->host_lock);
                 /* Send back ACC */
                 lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
                 return 0;
@@ -5948,8 +5948,8 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                                 lpfc_initial_fdisc(vport);
                         break;
                 }
-
         } else {
+                vport->vpi_state |= LPFC_VPI_REGISTERED;
                 if (vport == phba->pport)
                         if (phba->sli_rev < LPFC_SLI_REV4)
                                 lpfc_issue_fabric_reglogin(vport);
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 3b9424427652..2445e399fd60 100755..100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -747,6 +747,10 @@ lpfc_linkdown(struct lpfc_hba *phba)
 
         if (phba->link_state == LPFC_LINK_DOWN)
                 return 0;
+
+        /* Block all SCSI stack I/Os */
+        lpfc_scsi_dev_block(phba);
+
         spin_lock_irq(&phba->hbalock);
         phba->fcf.fcf_flag &= ~(FCF_AVAILABLE | FCF_DISCOVERED);
         if (phba->link_state > LPFC_LINK_DOWN) {
@@ -1555,10 +1559,16 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
          * to book keeping the FCFIs can be used.
          */
         if (shdr_status || shdr_add_status) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                                "2521 READ_FCF_RECORD mailbox failed "
-                                "with status x%x add_status x%x, mbx\n",
-                                shdr_status, shdr_add_status);
+                if (shdr_status == STATUS_FCF_TABLE_EMPTY) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                        "2726 READ_FCF_RECORD Indicates empty "
+                                        "FCF table.\n");
+                } else {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                        "2521 READ_FCF_RECORD mailbox failed "
+                                        "with status x%x add_status x%x, mbx\n",
+                                        shdr_status, shdr_add_status);
+                }
                 goto out;
         }
         /* Interpreting the returned information of FCF records */
@@ -1698,7 +1708,9 @@ lpfc_init_vpi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                 return;
         }
+        spin_lock_irq(&phba->hbalock);
         vport->fc_flag &= ~FC_VPORT_NEEDS_INIT_VPI;
+        spin_unlock_irq(&phba->hbalock);
 
         if (phba->link_flag & LS_NPIV_FAB_SUPPORTED)
                 lpfc_initial_fdisc(vport);
@@ -2259,7 +2271,10 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                                  mb->mbxStatus);
                 break;
         }
+        spin_lock_irq(&phba->hbalock);
         vport->vpi_state &= ~LPFC_VPI_REGISTERED;
+        vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+        spin_unlock_irq(&phba->hbalock);
         vport->unreg_vpi_cmpl = VPORT_OK;
         mempool_free(pmb, phba->mbox_mem_pool);
         /*
@@ -4475,8 +4490,10 @@ lpfc_unregister_unused_fcf(struct lpfc_hba *phba)
                 (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED))
                 for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {
                         lpfc_mbx_unreg_vpi(vports[i]);
+                        spin_lock_irq(&phba->hbalock);
                         vports[i]->fc_flag |= FC_VPORT_NEEDS_INIT_VPI;
                         vports[i]->vpi_state &= ~LPFC_VPI_REGISTERED;
+                        spin_unlock_irq(&phba->hbalock);
                 }
         lpfc_destroy_vport_work_array(phba, vports);
 
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 1585148a17e5..8a2a1c5935c6 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -1013,7 +1013,7 @@ struct lpfc_mbx_wq_destroy {
 };
 
 #define LPFC_HDR_BUF_SIZE 128
-#define LPFC_DATA_BUF_SIZE 4096
+#define LPFC_DATA_BUF_SIZE 2048
 struct rq_context {
         uint32_t word0;
 #define lpfc_rq_context_rq_size_SHIFT   16
@@ -1371,6 +1371,7 @@ struct lpfc_mbx_query_fw_cfg {
 #define STATUS_ERROR_ACITMAIN                           0x2a
 #define STATUS_REBOOT_REQUIRED                          0x2c
 #define STATUS_FCF_IN_USE                               0x3a
+#define STATUS_FCF_TABLE_EMPTY                          0x43
 
 struct lpfc_mbx_sli4_config {
         struct mbox_header header;
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index d4da6bdd0e73..b8eb1b6e5e77 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -3006,6 +3006,7 @@ lpfc_sli4_async_fcoe_evt(struct lpfc_hba *phba,
         struct lpfc_vport *vport;
         struct lpfc_nodelist *ndlp;
         struct Scsi_Host  *shost;
+        uint32_t link_state;
 
         phba->fc_eventTag = acqe_fcoe->event_tag;
         phba->fcoe_eventtag = acqe_fcoe->event_tag;
@@ -3052,9 +3053,12 @@ lpfc_sli4_async_fcoe_evt(struct lpfc_hba *phba,
                         break;
                 /*
                  * Currently, driver support only one FCF - so treat this as
-                 * a link down.
+                 * a link down, but save the link state because we don't want
+                 * it to be changed to Link Down unless it is already down.
                  */
+                link_state = phba->link_state;
                 lpfc_linkdown(phba);
+                phba->link_state = link_state;
                 /* Unregister FCF if no devices connected to it */
                 lpfc_unregister_unused_fcf(phba);
                 break;
@@ -7226,8 +7230,6 @@ lpfc_prep_dev_for_perm_failure(struct lpfc_hba *phba)
 {
         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                         "2711 PCI channel permanent disable for failure\n");
-        /* Block all SCSI devices' I/Os on the host */
-        lpfc_scsi_dev_block(phba);
         /* Clean up all driver's outstanding SCSI I/Os */
         lpfc_sli_flush_fcp_rings(phba);
 }
@@ -7256,6 +7258,9 @@ lpfc_io_error_detected_s3(struct pci_dev *pdev, pci_channel_state_t state)
         struct Scsi_Host *shost = pci_get_drvdata(pdev);
         struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
 
+        /* Block all SCSI devices' I/Os on the host */
+        lpfc_scsi_dev_block(phba);
+
         switch (state) {
         case pci_channel_io_normal:
                 /* Non-fatal error, prepare for recovery */
@@ -7507,6 +7512,9 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid)
                         error = -ENODEV;
                         goto out_free_sysfs_attr;
                 }
+                /* Default to single FCP EQ for non-MSI-X */
+                if (phba->intr_type != MSIX)
+                        phba->cfg_fcp_eq_count = 1;
                 /* Set up SLI-4 HBA */
                 if (lpfc_sli4_hba_setup(phba)) {
                         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 7935667b81a5..589549b2bf0e 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1383,7 +1383,7 @@ lpfc_sli_hbq_to_firmware_s4(struct lpfc_hba *phba, uint32_t hbqno,
 /* HBQ for ELS and CT traffic. */
 static struct lpfc_hbq_init lpfc_els_hbq = {
         .rn = 1,
-        .entry_count = 200,
+        .entry_count = 256,
         .mask_count = 0,
         .profile = 0,
         .ring_mask = (1 << LPFC_ELS_RING),
@@ -1482,8 +1482,11 @@ err:
 int
 lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
 {
-        return(lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
-                                         lpfc_hbq_defs[qno]->add_count));
+        if (phba->sli_rev == LPFC_SLI_REV4)
+                return 0;
+        else
+                return lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
+                                         lpfc_hbq_defs[qno]->add_count);
 }
 
 /**
@@ -1498,8 +1501,12 @@ lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
 static int
 lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)
 {
-        return(lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
-                                         lpfc_hbq_defs[qno]->init_count));
+        if (phba->sli_rev == LPFC_SLI_REV4)
+                return lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
+                                         lpfc_hbq_defs[qno]->entry_count);
+        else
+                return lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
+                                         lpfc_hbq_defs[qno]->init_count);
 }
 
 /**
@@ -4110,6 +4117,7 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
         if (rc) {
                 dma_free_coherent(&phba->pcidev->dev, dma_size,
                                   dmabuf->virt, dmabuf->phys);
+                kfree(dmabuf);
                 return -EIO;
         }
 
@@ -5848,7 +5856,6 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                                         iocbq->iocb.un.ulpWord[3]);
                 wqe->generic.word3 = 0;
                 bf_set(wqe_rcvoxid, &wqe->generic, iocbq->iocb.ulpContext);
-                bf_set(wqe_xc, &wqe->generic, 1);
                 /* The entire sequence is transmitted for this IOCB */
                 xmit_len = total_len;
                 cmnd = CMD_XMIT_SEQUENCE64_CR;
@@ -10944,7 +10951,8 @@ lpfc_fc_frame_add(struct lpfc_vport *vport, struct hbq_dmabuf *dmabuf)
                 return dmabuf;
         }
         temp_hdr = seq_dmabuf->hbuf.virt;
-        if (new_hdr->fh_seq_cnt < temp_hdr->fh_seq_cnt) {
+        if (be16_to_cpu(new_hdr->fh_seq_cnt) <
+                be16_to_cpu(temp_hdr->fh_seq_cnt)) {
                 list_del_init(&seq_dmabuf->hbuf.list);
                 list_add_tail(&dmabuf->hbuf.list, &vport->rcv_buffer_list);
                 list_add_tail(&dmabuf->dbuf.list, &seq_dmabuf->dbuf.list);
@@ -10955,6 +10963,11 @@ lpfc_fc_frame_add(struct lpfc_vport *vport, struct hbq_dmabuf *dmabuf)
         list_move_tail(&seq_dmabuf->hbuf.list, &vport->rcv_buffer_list);
         seq_dmabuf->time_stamp = jiffies;
         lpfc_update_rcv_time_stamp(vport);
+        if (list_empty(&seq_dmabuf->dbuf.list)) {
+                temp_hdr = dmabuf->hbuf.virt;
+                list_add_tail(&dmabuf->dbuf.list, &seq_dmabuf->dbuf.list);
+                return seq_dmabuf;
+        }
         /* find the correct place in the sequence to insert this frame */
         list_for_each_entry_reverse(d_buf, &seq_dmabuf->dbuf.list, list) {
                 temp_dmabuf = container_of(d_buf, struct hbq_dmabuf, dbuf);
@@ -10963,7 +10976,8 @@ lpfc_fc_frame_add(struct lpfc_vport *vport, struct hbq_dmabuf *dmabuf)
                  * If the frame's sequence count is greater than the frame on
                  * the list then insert the frame right after this frame
                  */
-                if (new_hdr->fh_seq_cnt > temp_hdr->fh_seq_cnt) {
+                if (be16_to_cpu(new_hdr->fh_seq_cnt) >
+                        be16_to_cpu(temp_hdr->fh_seq_cnt)) {
                         list_add(&dmabuf->dbuf.list, &temp_dmabuf->dbuf.list);
                         return seq_dmabuf;
                 }
@@ -11210,7 +11224,7 @@ lpfc_seq_complete(struct hbq_dmabuf *dmabuf)
                 seq_dmabuf = container_of(d_buf, struct hbq_dmabuf, dbuf);
                 hdr = (struct fc_frame_header *)seq_dmabuf->hbuf.virt;
                 /* If there is a hole in the sequence count then fail. */
-                if (++seq_count != hdr->fh_seq_cnt)
+                if (++seq_count != be16_to_cpu(hdr->fh_seq_cnt))
                         return 0;
                 fctl = (hdr->fh_f_ctl[0] << 16 |
                         hdr->fh_f_ctl[1] << 8 |
@@ -11242,6 +11256,7 @@ lpfc_prep_seq(struct lpfc_vport *vport, struct hbq_dmabuf *seq_dmabuf)
         struct lpfc_iocbq *first_iocbq, *iocbq;
         struct fc_frame_header *fc_hdr;
         uint32_t sid;
+        struct ulp_bde64 *pbde;
 
         fc_hdr = (struct fc_frame_header *)seq_dmabuf->hbuf.virt;
         /* remove from receive buffer list */
@@ -11283,8 +11298,9 @@ lpfc_prep_seq(struct lpfc_vport *vport, struct hbq_dmabuf *seq_dmabuf)
                 if (!iocbq->context3) {
                         iocbq->context3 = d_buf;
                         iocbq->iocb.ulpBdeCount++;
-                        iocbq->iocb.unsli3.rcvsli3.bde2.tus.f.bdeSize =
-                                                        LPFC_DATA_BUF_SIZE;
+                        pbde = (struct ulp_bde64 *)
+                                        &iocbq->iocb.unsli3.sli3Words[4];
+                        pbde->tus.f.bdeSize = LPFC_DATA_BUF_SIZE;
                         first_iocbq->iocb.unsli3.rcvsli3.acc_len +=
                                 bf_get(lpfc_rcqe_length,
                                        &seq_dmabuf->cq_event.cqe.rcqe_cmpl);
@@ -11401,15 +11417,9 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba,
                 return;
         }
         /* If not last frame in sequence continue processing frames. */
-        if (!lpfc_seq_complete(seq_dmabuf)) {
-                /*
-                 * When saving off frames post a new one and mark this
-                 * frame to be freed when it is finished.
-                 **/
-                lpfc_sli_hbqbuf_fill_hbqs(phba, LPFC_ELS_HBQ, 1);
-                dmabuf->tag = -1;
+        if (!lpfc_seq_complete(seq_dmabuf))
                 return;
-        }
+
         /* Send the complete sequence to the upper layer protocol */
         lpfc_sli4_send_seq_to_ulp(vport, seq_dmabuf);
 }
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 25d66d070cf8..44e5f574236b 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -28,7 +28,7 @@
 /* Multi-queue arrangement for fast-path FCP work queues */
 #define LPFC_FN_EQN_MAX       8
 #define LPFC_SP_EQN_DEF       1
-#define LPFC_FP_EQN_DEF       1
+#define LPFC_FP_EQN_DEF       4
 #define LPFC_FP_EQN_MIN       1
 #define LPFC_FP_EQN_MAX       (LPFC_FN_EQN_MAX - LPFC_SP_EQN_DEF)
 
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index c7f3aed2aab8..792f72263f1a 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.3.6"
+#define LPFC_DRIVER_VERSION "8.3.7"
 #define LPFC_DRIVER_NAME                "lpfc"
 #define LPFC_SP_DRIVER_HANDLER_NAME     "lpfc:sp"
 #define LPFC_FP_DRIVER_HANDLER_NAME     "lpfc:fp"
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index 7d6dd83d3592..e3c7fa642306 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -512,8 +512,10 @@ enable_vport(struct fc_vport *fc_vport)
                 return VPORT_OK;
         }
 
+        spin_lock_irq(&phba->hbalock);
         vport->load_flag |= FC_LOADING;
         vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+        spin_unlock_irq(&phba->hbalock);
 
         /* Use the Physical nodes Fabric NDLP to determine if the link is
          * up and ready to FDISC.
@@ -700,7 +702,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
                         }
                         spin_unlock_irq(&phba->ndlp_lock);
                 }
-                if (vport->vpi_state != LPFC_VPI_REGISTERED)
+                if (!(vport->vpi_state & LPFC_VPI_REGISTERED))
                         goto skip_logo;
                 vport->unreg_vpi_cmpl = VPORT_INVAL;
                 timeout = msecs_to_jiffies(phba->fc_ratov * 2000);
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 99ff99e45bee..708ea3157b60 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -4046,7 +4046,7 @@ megasas_aen_polling(struct work_struct *work)
 }
 
 
-static DRIVER_ATTR(poll_mode_io, S_IRUGO|S_IWUGO,
+static DRIVER_ATTR(poll_mode_io, S_IRUGO|S_IWUSR,
                 megasas_sysfs_show_poll_mode_io,
                 megasas_sysfs_set_poll_mode_io);
 
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index e7d2688fbeba..b6f1ef954af1 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -2483,14 +2483,12 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
                         sense_copied = 1;
                 }
 
-                if (RES_IS_GSCSI(res->cfg_entry)) {
+                if (RES_IS_GSCSI(res->cfg_entry))
                         pmcraid_cancel_all(cmd, sense_copied);
-                } else if (sense_copied) {
+                else if (sense_copied)
                         pmcraid_erp_done(cmd);
-                        return 0;
-                } else  {
+                else
                         pmcraid_request_sense(cmd);
-                }
 
                 return 1;
 
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 21e2bc4d7401..3a9f5b288aee 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -232,6 +232,9 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
         if (off)
                 return 0;
 
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                return 0;
+
         if (sscanf(buf, "%d:%x:%x", &val, &start, &size) < 1)
                 return -EINVAL;
         if (start > ha->optrom_size)
@@ -379,6 +382,9 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,
             struct device, kobj)));
         struct qla_hw_data *ha = vha->hw;
 
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                return 0;
+
         if (!capable(CAP_SYS_ADMIN))
                 return 0;
 
@@ -398,6 +404,9 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
         uint8_t *tmp_data;
 
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                return 0;
+
         if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->vpd_size ||
             !ha->isp_ops->write_nvram)
                 return 0;
@@ -1238,10 +1247,11 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
     char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        int rval;
+        int rval = QLA_FUNCTION_FAILED;
         uint16_t state[5];
 
-        rval = qla2x00_get_firmware_state(vha, state);
+        if (!vha->hw->flags.eeh_busy)
+                rval = qla2x00_get_firmware_state(vha, state);
         if (rval != QLA_SUCCESS)
                 memset(state, -1, sizeof(state));
 
@@ -1452,10 +1462,13 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
         if (!fcport)
                 return;
 
-        if (unlikely(pci_channel_offline(fcport->vha->hw->pdev)))
+        if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
+                return;
+
+        if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
                 qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
-        else
-                qla2x00_abort_fcport_cmds(fcport);
+                return;
+        }
 
         /*
          * Transport has effectively 'deleted' the rport, clear
@@ -1475,6 +1488,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
         if (!fcport)
                 return;
 
+        if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags))
+                return;
+
         if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) {
                 qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16);
                 return;
@@ -1515,6 +1531,12 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         pfc_host_stat = &ha->fc_host_stat;
         memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
 
+        if (test_bit(UNLOADING, &vha->dpc_flags))
+                goto done;
+
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                goto done;
+
         stats = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &stats_dma);
         if (stats == NULL) {
                 DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n",
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index f660dd70b72e..d6d9c86cb058 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -26,7 +26,7 @@
 /* #define QL_DEBUG_LEVEL_14 */ /* Output RSCN trace msgs */
 /* #define QL_DEBUG_LEVEL_15 */ /* Output NPIV trace msgs */
 /* #define QL_DEBUG_LEVEL_16 */ /* Output ISP84XX trace msgs */
-/* #define QL_DEBUG_LEVEL_17 */ /* Output MULTI-Q trace messages */
+/* #define QL_DEBUG_LEVEL_17 */ /* Output EEH trace messages */
 
 /*
 * Macros use for debugging the driver.
@@ -132,6 +132,13 @@
 #else
 #define DEBUG16(x)      do {} while (0)
 #endif
+
+#if defined(QL_DEBUG_LEVEL_17)
+#define DEBUG17(x)      do {x;} while (0)
+#else
+#define DEBUG17(x)      do {} while (0)
+#endif
+
 /*
  * Firmware Dump structure definition
  */
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 384afda7dbe9..1263d9796e89 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1586,8 +1586,7 @@ typedef struct fc_port {
  */
 #define FCF_FABRIC_DEVICE       BIT_0
 #define FCF_LOGIN_NEEDED        BIT_1
-#define FCF_TAPE_PRESENT        BIT_2
-#define FCF_FCP2_DEVICE         BIT_3
+#define FCF_FCP2_DEVICE         BIT_2
 
 /* No loop ID flag. */
 #define FC_NO_LOOP_ID           0x1000
@@ -2256,11 +2255,13 @@ struct qla_hw_data {
                 uint32_t        disable_serdes          :1;
                 uint32_t        gpsc_supported          :1;
                 uint32_t        npiv_supported          :1;
+                uint32_t        pci_channel_io_perm_failure     :1;
                 uint32_t        fce_enabled             :1;
                 uint32_t        fac_supported           :1;
                 uint32_t        chip_reset_done         :1;
                 uint32_t        port0                   :1;
                 uint32_t        running_gold_fw         :1;
+                uint32_t        eeh_busy                :1;
                 uint32_t        cpu_affinity_enabled    :1;
                 uint32_t        disable_msix_handshake  :1;
         } flags;
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 0b6801fc6389..f61fb8d01330 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -324,6 +324,7 @@ qla2x00_read_ram_word(scsi_qla_host_t *, uint32_t, uint32_t *);
 extern int
 qla2x00_write_ram_word(scsi_qla_host_t *, uint32_t, uint32_t);
 
+extern int qla2x00_get_data_rate(scsi_qla_host_t *);
 /*
  * Global Function Prototypes in qla_isr.c source file.
  */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 73a793539d45..3f8e8495b743 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -205,7 +205,7 @@ qla2x00_async_login_done(struct scsi_qla_host *vha, fc_port_t *fcport,
 
         switch (data[0]) {
         case MBS_COMMAND_COMPLETE:
-                if (fcport->flags & FCF_TAPE_PRESENT)
+                if (fcport->flags & FCF_FCP2_DEVICE)
                         opts |= BIT_1;
                 rval = qla2x00_get_port_database(vha, fcport, opts);
                 if (rval != QLA_SUCCESS)
@@ -269,6 +269,8 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
         vha->flags.online = 0;
         ha->flags.chip_reset_done = 0;
         vha->flags.reset_active = 0;
+        ha->flags.pci_channel_io_perm_failure = 0;
+        ha->flags.eeh_busy = 0;
         atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
         atomic_set(&vha->loop_state, LOOP_DOWN);
         vha->device_flags = DFLG_NO_CABLE;
@@ -581,6 +583,9 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)
         uint32_t        cnt;
         uint16_t        cmd;
 
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                return;
+
         ha->isp_ops->disable_intrs(ha);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -786,6 +791,12 @@ void
 qla24xx_reset_chip(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
+
+        if (pci_channel_offline(ha->pdev) &&
+            ha->flags.pci_channel_io_perm_failure) {
+                return;
+        }
+
         ha->isp_ops->disable_intrs(ha);
 
         /* Perform RISC reset. */
@@ -2266,6 +2277,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
         clear_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
         clear_bit(RSCN_UPDATE, &vha->dpc_flags);
 
+        qla2x00_get_data_rate(vha);
+
         /* Determine what we need to do */
         if (ha->current_topology == ISP_CFG_FL &&
             (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
@@ -2713,7 +2726,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
 
                 /*
                  * Logout all previous fabric devices marked lost, except
-                 * tape devices.
+                 * FCP2 devices.
                  */
                 list_for_each_entry(fcport, &vha->vp_fcports, list) {
                         if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
@@ -2726,7 +2739,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                                 qla2x00_mark_device_lost(vha, fcport,
                                     ql2xplogiabsentdevice, 0);
                                 if (fcport->loop_id != FC_NO_LOOP_ID &&
-                                    (fcport->flags & FCF_TAPE_PRESENT) == 0 &&
+                                    (fcport->flags & FCF_FCP2_DEVICE) == 0 &&
                                     fcport->port_type != FCT_INITIATOR &&
                                     fcport->port_type != FCT_BROADCAST) {
                                         ha->isp_ops->fabric_logout(vha,
@@ -3005,7 +3018,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                         fcport->d_id.b24 = new_fcport->d_id.b24;
                         fcport->flags |= FCF_LOGIN_NEEDED;
                         if (fcport->loop_id != FC_NO_LOOP_ID &&
-                            (fcport->flags & FCF_TAPE_PRESENT) == 0 &&
+                            (fcport->flags & FCF_FCP2_DEVICE) == 0 &&
                             fcport->port_type != FCT_INITIATOR &&
                             fcport->port_type != FCT_BROADCAST) {
                                 ha->isp_ops->fabric_logout(vha, fcport->loop_id,
@@ -3259,9 +3272,9 @@ qla2x00_fabric_dev_login(scsi_qla_host_t *vha, fc_port_t *fcport,
 
         rval = qla2x00_fabric_login(vha, fcport, next_loopid);
         if (rval == QLA_SUCCESS) {
-                /* Send an ADISC to tape devices.*/
+                /* Send an ADISC to FCP2 devices.*/
                 opts = 0;
-                if (fcport->flags & FCF_TAPE_PRESENT)
+                if (fcport->flags & FCF_FCP2_DEVICE)
                         opts |= BIT_1;
                 rval = qla2x00_get_port_database(vha, fcport, opts);
                 if (rval != QLA_SUCCESS) {
@@ -3560,6 +3573,13 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
                 /* Requeue all commands in outstanding command list. */
                 qla2x00_abort_all_cmds(vha, DID_RESET << 16);
 
+                if (unlikely(pci_channel_offline(ha->pdev) &&
+                    ha->flags.pci_channel_io_perm_failure)) {
+                        clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
+                        status = 0;
+                        return status;
+                }
+
                 ha->isp_ops->get_flash_version(vha, req->ring);
 
                 ha->isp_ops->nvram_config(vha);
@@ -4458,6 +4478,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha)
         int ret, retries;
         struct qla_hw_data *ha = vha->hw;
 
+        if (ha->flags.pci_channel_io_perm_failure)
+                return;
         if (!IS_FWI2_CAPABLE(ha))
                 return;
         if (!ha->fw_major_version)
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 1692a883f4de..ffd0efdff40e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -152,7 +152,7 @@ qla2300_intr_handler(int irq, void *dev_id)
         for (iter = 50; iter--; ) {
                 stat = RD_REG_DWORD(&reg->u.isp2300.host_status);
                 if (stat & HSR_RISC_PAUSED) {
-                        if (pci_channel_offline(ha->pdev))
+                        if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
 
                         hccr = RD_REG_WORD(&reg->hccr);
@@ -1846,12 +1846,15 @@ qla24xx_intr_handler(int irq, void *dev_id)
         reg = &ha->iobase->isp24;
         status = 0;
 
+        if (unlikely(pci_channel_offline(ha->pdev)))
+                return IRQ_HANDLED;
+
         spin_lock_irqsave(&ha->hardware_lock, flags);
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; ) {
                 stat = RD_REG_DWORD(&reg->host_status);
                 if (stat & HSRX_RISC_PAUSED) {
-                        if (pci_channel_offline(ha->pdev))
+                        if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
 
                         hccr = RD_REG_DWORD(&reg->hccr);
@@ -1992,7 +1995,7 @@ qla24xx_msix_default(int irq, void *dev_id)
         do {
                 stat = RD_REG_DWORD(&reg->host_status);
                 if (stat & HSRX_RISC_PAUSED) {
-                        if (pci_channel_offline(ha->pdev))
+                        if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
 
                         hccr = RD_REG_DWORD(&reg->hccr);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 05d595d9a7ef..056e4d4505f3 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -56,6 +56,12 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 
         DEBUG11(printk("%s(%ld): entered.\n", __func__, base_vha->host_no));
 
+        if (ha->flags.pci_channel_io_perm_failure) {
+                DEBUG(printk("%s(%ld): Perm failure on EEH, timeout MBX "
+                             "Exiting.\n", __func__, vha->host_no));
+                return QLA_FUNCTION_TIMEOUT;
+        }
+
         /*
          * Wait for active mailbox commands to finish by waiting at most tov
          * seconds. This is to serialize actual issuing of mailbox cmds during
@@ -154,10 +160,14 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                         /* Check for pending interrupts. */
                         qla2x00_poll(ha->rsp_q_map[0]);
 
-                        if (command != MBC_LOAD_RISC_RAM_EXTENDED &&
-                            !ha->flags.mbox_int)
+                        if (!ha->flags.mbox_int &&
+                            !(IS_QLA2200(ha) &&
+                            command == MBC_LOAD_RISC_RAM_EXTENDED))
                                 msleep(10);
                 } /* while */
+                DEBUG17(qla_printk(KERN_WARNING, ha,
+                        "Waited %d sec\n",
+                        (uint)((jiffies - (wait_time - (mcp->tov * HZ)))/HZ)));
         }
 
         /* Check whether we timed out */
@@ -227,7 +237,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 
         if (rval == QLA_FUNCTION_TIMEOUT &&
             mcp->mb[0] != MBC_GEN_SYSTEM_ERROR) {
-                if (!io_lock_on || (mcp->flags & IOCTL_CMD)) {
+                if (!io_lock_on || (mcp->flags & IOCTL_CMD) ||
+                    ha->flags.eeh_busy) {
                         /* not in dpc. schedule it for dpc to take over. */
                         DEBUG(printk("%s(%ld): timeout schedule "
                         "isp_abort_needed.\n", __func__,
@@ -237,7 +248,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                         base_vha->host_no));
                         qla_printk(KERN_WARNING, ha,
                             "Mailbox command timeout occurred. Scheduling ISP "
-                            "abort.\n");
+                            "abort. eeh_busy: 0x%x\n", ha->flags.eeh_busy);
                         set_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags);
                         qla2xxx_wake_dpc(vha);
                 } else if (!abort_active) {
@@ -2530,6 +2541,9 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
+        if (unlikely(pci_channel_offline(vha->hw->pdev)))
+                return QLA_FUNCTION_FAILED;
+
         DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));
 
         mcp->mb[0] = MBC_TRACE_CONTROL;
@@ -2565,6 +2579,9 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
+        if (unlikely(pci_channel_offline(vha->hw->pdev)))
+                return QLA_FUNCTION_FAILED;
+
         DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));
 
         mcp->mb[0] = MBC_TRACE_CONTROL;
@@ -2595,6 +2612,9 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
         if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
+        if (unlikely(pci_channel_offline(vha->hw->pdev)))
+                return QLA_FUNCTION_FAILED;
+
         DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));
 
         mcp->mb[0] = MBC_TRACE_CONTROL;
@@ -2639,6 +2659,9 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
+        if (unlikely(pci_channel_offline(vha->hw->pdev)))
+                return QLA_FUNCTION_FAILED;
+
         DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));
 
         mcp->mb[0] = MBC_TRACE_CONTROL;
@@ -3643,3 +3666,36 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
 
         return rval;
 }
+
+int
+qla2x00_get_data_rate(scsi_qla_host_t *vha)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+        struct qla_hw_data *ha = vha->hw;
+
+        if (!IS_FWI2_CAPABLE(ha))
+                return QLA_FUNCTION_FAILED;
+
+        DEBUG11(printk(KERN_INFO "%s(%ld): entered.\n", __func__, vha->host_no));
+
+        mcp->mb[0] = MBC_DATA_RATE;
+        mcp->mb[1] = 0;
+        mcp->out_mb = MBX_1|MBX_0;
+        mcp->in_mb = MBX_2|MBX_1|MBX_0;
+        mcp->tov = MBX_TOV_SECONDS;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(vha, mcp);
+        if (rval != QLA_SUCCESS) {
+                DEBUG2_3_11(printk(KERN_INFO "%s(%ld): failed=%x mb[0]=%x.\n",
+                    __func__, vha->host_no, rval, mcp->mb[0]));
+        } else {
+                DEBUG11(printk(KERN_INFO
+                    "%s(%ld): done.\n", __func__, vha->host_no));
+                if (mcp->mb[1] != 0x7)
+                        ha->link_data_rate = mcp->mb[1];
+        }
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 2a4c7f4e7b69..b901aa267e7d 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -639,8 +639,10 @@ static void qla_do_work(struct work_struct *work)
         struct rsp_que *rsp = container_of(work, struct rsp_que, q_work);
         struct scsi_qla_host *vha;
 
+        spin_lock_irq(&rsp->hw->hardware_lock);
         vha = qla25xx_get_host(rsp);
         qla24xx_process_response_queue(vha, rsp);
+        spin_unlock_irq(&rsp->hw->hardware_lock);
 }
 
 /* create response queue */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2f873d237325..8529eb1f3cd4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -475,11 +475,11 @@ qla2xxx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         srb_t *sp;
         int rval;
 
-        if (unlikely(pci_channel_offline(ha->pdev))) {
-                if (ha->pdev->error_state == pci_channel_io_frozen)
-                        cmd->result = DID_REQUEUE << 16;
-                else
+        if (ha->flags.eeh_busy) {
+                if (ha->flags.pci_channel_io_perm_failure)
                         cmd->result = DID_NO_CONNECT << 16;
+                else
+                        cmd->result = DID_REQUEUE << 16;
                 goto qc24_fail_command;
         }
 
@@ -552,8 +552,15 @@ qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd)
 #define ABORT_POLLING_PERIOD    1000
 #define ABORT_WAIT_ITER         ((10 * 1000) / (ABORT_POLLING_PERIOD))
         unsigned long wait_iter = ABORT_WAIT_ITER;
+        scsi_qla_host_t *vha = shost_priv(cmd->device->host);
+        struct qla_hw_data *ha = vha->hw;
         int ret = QLA_SUCCESS;
 
+        if (unlikely(pci_channel_offline(ha->pdev)) || ha->flags.eeh_busy) {
+                DEBUG17(qla_printk(KERN_WARNING, ha, "return:eh_wait\n"));
+                return ret;
+        }
+
         while (CMD_SP(cmd) && wait_iter--) {
                 msleep(ABORT_POLLING_PERIOD);
         }
@@ -1181,7 +1188,6 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
         scsi_qla_host_t *vha = shost_priv(sdev->host);
         struct qla_hw_data *ha = vha->hw;
         struct fc_rport *rport = starget_to_rport(sdev->sdev_target);
-        fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
         struct req_que *req = vha->req;
 
         if (sdev->tagged_supported)
@@ -1190,8 +1196,6 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
                 scsi_deactivate_tcq(sdev, req->max_q_depth);
 
         rport->dev_loss_tmo = ha->port_down_retry_count;
-        if (sdev->type == TYPE_TAPE)
-                fcport->flags |= FCF_TAPE_PRESENT;
 
         return 0;
 }
@@ -1810,6 +1814,13 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Set ISP-type information. */
         qla2x00_set_isp_flags(ha);
+
+        /* Set EEH reset type to fundamental if required by hba */
+        if ( IS_QLA24XX(ha) || IS_QLA25XX(ha) || IS_QLA81XX(ha)) {
+                pdev->needs_freset = 1;
+                pci_save_state(pdev);
+        }
+
         /* Configure PCI I/O space */
         ret = qla2x00_iospace_config(ha);
         if (ret)
@@ -2174,6 +2185,24 @@ qla2x00_free_device(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
 
+        qla2x00_abort_all_cmds(vha, DID_NO_CONNECT << 16);
+
+        /* Disable timer */
+        if (vha->timer_active)
+                qla2x00_stop_timer(vha);
+
+        /* Kill the kernel thread for this host */
+        if (ha->dpc_thread) {
+                struct task_struct *t = ha->dpc_thread;
+
+                /*
+                 * qla2xxx_wake_dpc checks for ->dpc_thread
+                 * so we need to zero it out.
+                 */
+                ha->dpc_thread = NULL;
+                kthread_stop(t);
+        }
+
         qla25xx_delete_queues(vha);
 
         if (ha->flags.fce_enabled)
@@ -2185,6 +2214,8 @@ qla2x00_free_device(scsi_qla_host_t *vha)
         /* Stop currently executing firmware. */
         qla2x00_try_to_stop_firmware(vha);
 
+        vha->flags.online = 0;
+
         /* turn-off interrupts on the card */
         if (ha->interrupts_on)
                 ha->isp_ops->disable_intrs(ha);
@@ -2771,7 +2802,7 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
 
                         fcport->login_retry--;
                         if (fcport->flags & FCF_FABRIC_DEVICE) {
-                                if (fcport->flags & FCF_TAPE_PRESENT)
+                                if (fcport->flags & FCF_FCP2_DEVICE)
                                         ha->isp_ops->fabric_logout(vha,
                                                         fcport->loop_id,
                                                         fcport->d_id.b.domain,
@@ -2859,6 +2890,13 @@ qla2x00_do_dpc(void *data)
                 if (!base_vha->flags.init_done)
                         continue;
 
+                if (ha->flags.eeh_busy) {
+                        DEBUG17(qla_printk(KERN_WARNING, ha,
+                            "qla2x00_do_dpc: dpc_flags: %lx\n",
+                            base_vha->dpc_flags));
+                        continue;
+                }
+
                 DEBUG3(printk("scsi(%ld): DPC handler\n", base_vha->host_no));
 
                 ha->dpc_active = 1;
@@ -3049,8 +3087,13 @@ qla2x00_timer(scsi_qla_host_t *vha)
         int             index;
         srb_t           *sp;
         int             t;
+        uint16_t        w;
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req;
+
+        /* Hardware read to raise pending EEH errors during mailbox waits. */
+        if (!pci_channel_offline(ha->pdev))
+                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
         /*
          * Ports - Port down timer.
          *
@@ -3095,7 +3138,10 @@ qla2x00_timer(scsi_qla_host_t *vha)
                         if (!IS_QLA2100(ha) && vha->link_down_timeout)
                                 atomic_set(&vha->loop_state, LOOP_DEAD);
 
-                        /* Schedule an ISP abort to return any tape commands. */
+                        /*
+                         * Schedule an ISP abort to return any FCP2-device
+                         * commands.
+                         */
                         /* NPIV - scan physical port only */
                         if (!vha->vp_idx) {
                                 spin_lock_irqsave(&ha->hardware_lock,
@@ -3112,7 +3158,7 @@ qla2x00_timer(scsi_qla_host_t *vha)
                                         if (sp->ctx)
                                                 continue;
                                         sfcp = sp->fcport;
-                                        if (!(sfcp->flags & FCF_TAPE_PRESENT))
+                                        if (!(sfcp->flags & FCF_FCP2_DEVICE))
                                                 continue;
 
                                         set_bit(ISP_ABORT_NEEDED,
@@ -3252,16 +3298,23 @@ qla2x00_release_firmware(void)
 static pci_ers_result_t
 qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
 {
-        scsi_qla_host_t *base_vha = pci_get_drvdata(pdev);
+        scsi_qla_host_t *vha = pci_get_drvdata(pdev);
+        struct qla_hw_data *ha = vha->hw;
+
+        DEBUG2(qla_printk(KERN_WARNING, ha, "error_detected:state %x\n",
+            state));
 
         switch (state) {
         case pci_channel_io_normal:
+                ha->flags.eeh_busy = 0;
                 return PCI_ERS_RESULT_CAN_RECOVER;
         case pci_channel_io_frozen:
+                ha->flags.eeh_busy = 1;
                 pci_disable_device(pdev);
                 return PCI_ERS_RESULT_NEED_RESET;
         case pci_channel_io_perm_failure:
-                qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT << 16);
+                ha->flags.pci_channel_io_perm_failure = 1;
+                qla2x00_abort_all_cmds(vha, DID_NO_CONNECT << 16);
                 return PCI_ERS_RESULT_DISCONNECT;
         }
         return PCI_ERS_RESULT_NEED_RESET;
@@ -3312,6 +3365,8 @@ qla2xxx_pci_slot_reset(struct pci_dev *pdev)
         struct qla_hw_data *ha = base_vha->hw;
         int rc;
 
+        DEBUG17(qla_printk(KERN_WARNING, ha, "slot_reset\n"));
+
         if (ha->mem_only)
                 rc = pci_enable_device_mem(pdev);
         else
@@ -3320,19 +3375,33 @@ qla2xxx_pci_slot_reset(struct pci_dev *pdev)
         if (rc) {
                 qla_printk(KERN_WARNING, ha,
                     "Can't re-enable PCI device after reset.\n");
-
                 return ret;
         }
-        pci_set_master(pdev);
 
         if (ha->isp_ops->pci_config(base_vha))
                 return ret;
 
+#ifdef QL_DEBUG_LEVEL_17
+        {
+                uint8_t b;
+                uint32_t i;
+
+                printk("slot_reset_1: ");
+                for (i = 0; i < 256; i++) {
+                        pci_read_config_byte(ha->pdev, i, &b);
+                        printk("%s%02x", (i%16) ? " " : "\n", b);
+                }
+                printk("\n");
+        }
+#endif
         set_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags);
         if (qla2x00_abort_isp(base_vha) == QLA_SUCCESS)
                 ret =  PCI_ERS_RESULT_RECOVERED;
         clear_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags);
 
+        DEBUG17(qla_printk(KERN_WARNING, ha,
+            "slot_reset-return:ret=%x\n", ret));
+
         return ret;
 }
 
@@ -3343,12 +3412,17 @@ qla2xxx_pci_resume(struct pci_dev *pdev)
         struct qla_hw_data *ha = base_vha->hw;
         int ret;
 
+        DEBUG17(qla_printk(KERN_WARNING, ha, "pci_resume\n"));
+
         ret = qla2x00_wait_for_hba_online(base_vha);
         if (ret != QLA_SUCCESS) {
                 qla_printk(KERN_ERR, ha,
                     "the device failed to resume I/O "
                     "from slot/link_reset");
         }
+
+        ha->flags.eeh_busy = 0;
+
         pci_cleanup_aer_uncorrect_error_status(pdev);
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 010e69b29afe..371dc895972a 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -2292,11 +2292,14 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
         uint32_t faddr, left, burst;
         struct qla_hw_data *ha = vha->hw;
 
+        if (IS_QLA25XX(ha) || IS_QLA81XX(ha))
+                goto try_fast;
         if (offset & 0xfff)
                 goto slow_read;
         if (length < OPTROM_BURST_SIZE)
                 goto slow_read;
 
+try_fast:
         optrom = dma_alloc_coherent(&ha->pdev->dev, OPTROM_BURST_SIZE,
             &optrom_dma, GFP_KERNEL);
         if (!optrom) {
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index c482220f7eed..ed36279a33c1 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.03.01-k8"
+#define QLA2XXX_VERSION      "8.03.01-k10"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    3
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d8927681ec88..c6642423cc67 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -749,9 +749,9 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                          */
                         req->next_rq->resid_len = scsi_in(cmd)->resid;
 
+                        scsi_release_buffers(cmd);
                         blk_end_request_all(req, 0);
 
-                        scsi_release_buffers(cmd);
                         scsi_next_command(cmd);
                         return;
                 }
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index ddfcecd5099f..653f22a8deb9 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3527,7 +3527,10 @@ fc_bsg_job_timeout(struct request *req)
         if (!done && i->f->bsg_timeout) {
                 /* call LLDD to abort the i/o as it has timed out */
                 err = i->f->bsg_timeout(job);
-                if (err)
+                if (err == -EAGAIN) {
+                        job->ref_cnt--;
+                        return BLK_EH_RESET_TIMER;
+                } else if (err)
                         printk(KERN_ERR "ERROR: FC BSG request timeout - LLD "
                                 "abort failed with status %d\n", err);
         }
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 3058bb1aff95..fd7b15be7640 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -623,6 +623,11 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
                 }
                 break;
         case INQUIRY:
+                if (lun >= host->max_lun) {
+                        cmd->result = DID_NO_CONNECT << 16;
+                        done(cmd);
+                        return 0;
+                }
                 if (id != host->max_id - 1)
                         break;
                 if (!lun && !cmd->device->channel &&
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 1e3d19397a59..8681f1345056 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -58,7 +58,7 @@ static const char serial21285_name[] = "Footbridge UART";
 static void serial21285_stop_tx(struct uart_port *port)
 {
         if (tx_enabled(port)) {
-                disable_irq(IRQ_CONTX);
+                disable_irq_nosync(IRQ_CONTX);
                 tx_enabled(port) = 0;
         }
 }
@@ -74,7 +74,7 @@ static void serial21285_start_tx(struct uart_port *port)
 static void serial21285_stop_rx(struct uart_port *port)
 {
         if (rx_enabled(port)) {
-                disable_irq(IRQ_CONRX);
+                disable_irq_nosync(IRQ_CONRX);
                 rx_enabled(port) = 0;
         }
 }
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 36ede02ceacf..24485cc62ff8 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -328,15 +328,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
         /* U.S. Robotics 56K Voice INT PnP*/
         {       "USR9190",              0       },
         /* Wacom tablets */
-        {       "WACF004",              0       },
-        {       "WACF005",              0       },
-        {       "WACF006",              0       },
-        {       "WACF007",              0       },
-        {       "WACF008",              0       },
-        {       "WACF009",              0       },
-        {       "WACF00A",              0       },
-        {       "WACF00B",              0       },
-        {       "WACF00C",              0       },
+        {       "WACFXXX",              0       },
         /* Compaq touchscreen */
         {       "FPI2002",              0 },
         /* Fujitsu Stylistic touchscreens */
@@ -354,6 +346,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
         {       "FUJ02E5",              0       },
         /* Fujitsu P-series tablet PC device */
         {       "FUJ02E6",              0       },
+        /* Fujitsu Wacom 2FGT Tablet PC device */
+        {       "FUJ02E7",              0       },
         /*
          * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
          * disguise)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 18130f11238e..60d665a17a88 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                            int *parity, int *bits)
 {
 
-        if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
+        if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) {
                 /* ok, the port was enabled */
                 unsigned int ucr2, ubir,ubmr, uartclk;
                 unsigned int baud_raw;
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 0700cd10b97c..683e66f18e8c 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -411,6 +411,17 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                 goto ack_tx_int;
         }
 
+        /* Under some circumstances, we see interrupts reported for
+         * a closed channel. The interrupt mask in R1 is clear, but
+         * R3 still signals the interrupts and we see them when taking
+         * an interrupt for the other channel (this could be a qemu
+         * bug but since the ESCC doc doesn't specify precsiely whether
+         * R3 interrup status bits are masked by R1 interrupt enable
+         * bits, better safe than sorry). --BenH.
+         */
+        if (!ZS_IS_OPEN(uap))
+                goto ack_tx_int;
+
         if (uap->port.x_char) {
                 uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
                 write_zsdata(uap, uap->port.x_char);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 047530b285bb..7f2830709512 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -385,13 +385,20 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 }
 
                 /*
-                 * As a last resort, if the quotient is zero,
-                 * default to 9600 bps
+                 * As a last resort, if the range cannot be met then clip to
+                 * the nearest chip supported rate.
                  */
-                if (!hung_up)
-                        tty_termios_encode_baud_rate(termios, 9600, 9600);
+                if (!hung_up) {
+                        if (baud <= min)
+                                tty_termios_encode_baud_rate(termios,
+                                                        min + 1, min + 1);
+                        else
+                                tty_termios_encode_baud_rate(termios,
+                                                        max - 1, max - 1);
+                }
         }
-
+        /* Should never happen */
+        WARN_ON(1);
         return 0;
 }
 
@@ -2006,12 +2013,6 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 
         mutex_lock(&port->mutex);
 
-        if (!console_suspend_enabled && uart_console(uport)) {
-                /* we're going to avoid suspending serial console */
-                mutex_unlock(&port->mutex);
-                return 0;
-        }
-
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (device_may_wakeup(tty_dev)) {
                 enable_irq_wake(uport->irq);
@@ -2019,20 +2020,23 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
                 mutex_unlock(&port->mutex);
                 return 0;
         }
-        uport->suspended = 1;
+        if (console_suspend_enabled || !uart_console(uport))
+                uport->suspended = 1;
 
         if (port->flags & ASYNC_INITIALIZED) {
                 const struct uart_ops *ops = uport->ops;
                 int tries;
 
-                set_bit(ASYNCB_SUSPENDED, &port->flags);
-                clear_bit(ASYNCB_INITIALIZED, &port->flags);
+                if (console_suspend_enabled || !uart_console(uport)) {
+                        set_bit(ASYNCB_SUSPENDED, &port->flags);
+                        clear_bit(ASYNCB_INITIALIZED, &port->flags);
 
-                spin_lock_irq(&uport->lock);
-                ops->stop_tx(uport);
-                ops->set_mctrl(uport, 0);
-                ops->stop_rx(uport);
-                spin_unlock_irq(&uport->lock);
+                        spin_lock_irq(&uport->lock);
+                        ops->stop_tx(uport);
+                        ops->set_mctrl(uport, 0);
+                        ops->stop_rx(uport);
+                        spin_unlock_irq(&uport->lock);
+                }
 
                 /*
                  * Wait for the transmitter to empty.
@@ -2047,16 +2051,18 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
                                drv->dev_name,
                                drv->tty_driver->name_base + uport->line);
 
-                ops->shutdown(uport);
+                if (console_suspend_enabled || !uart_console(uport))
+                        ops->shutdown(uport);
         }
 
         /*
          * Disable the console device before suspending.
          */
-        if (uart_console(uport))
+        if (console_suspend_enabled && uart_console(uport))
                 console_stop(uport->cons);
 
-        uart_change_pm(state, 3);
+        if (console_suspend_enabled || !uart_console(uport))
+                uart_change_pm(state, 3);
 
         mutex_unlock(&port->mutex);
 
@@ -2073,29 +2079,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 
         mutex_lock(&port->mutex);
 
-        if (!console_suspend_enabled && uart_console(uport)) {
-                /* no need to resume serial console, it wasn't suspended */
-                /*
-                 * First try to use the console cflag setting.
-                 */
-                memset(&termios, 0, sizeof(struct ktermios));
-                termios.c_cflag = uport->cons->cflag;
-                /*
-                 * If that's unset, use the tty termios setting.
-                 */
-                if (termios.c_cflag == 0)
-                        termios = *state->port.tty->termios;
-                else {
-                        termios.c_ispeed = termios.c_ospeed =
-                                tty_termios_input_baud_rate(&termios);
-                        termios.c_ispeed = termios.c_ospeed =
-                                tty_termios_baud_rate(&termios);
-                }
-                uport->ops->set_termios(uport, &termios, NULL);
-                mutex_unlock(&port->mutex);
-                return 0;
-        }
-
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (!uport->suspended && device_may_wakeup(tty_dev)) {
                 disable_irq_wake(uport->irq);
@@ -2121,21 +2104,23 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                 spin_lock_irq(&uport->lock);
                 ops->set_mctrl(uport, 0);
                 spin_unlock_irq(&uport->lock);
-                ret = ops->startup(uport);
-                if (ret == 0) {
-                        uart_change_speed(state, NULL);
-                        spin_lock_irq(&uport->lock);
-                        ops->set_mctrl(uport, uport->mctrl);
-                        ops->start_tx(uport);
-                        spin_unlock_irq(&uport->lock);
-                        set_bit(ASYNCB_INITIALIZED, &port->flags);
-                } else {
-                        /*
-                         * Failed to resume - maybe hardware went away?
-                         * Clear the "initialized" flag so we won't try
-                         * to call the low level drivers shutdown method.
-                         */
-                        uart_shutdown(state);
+                if (console_suspend_enabled || !uart_console(uport)) {
+                        ret = ops->startup(uport);
+                        if (ret == 0) {
+                                uart_change_speed(state, NULL);
+                                spin_lock_irq(&uport->lock);
+                                ops->set_mctrl(uport, uport->mctrl);
+                                ops->start_tx(uport);
+                                spin_unlock_irq(&uport->lock);
+                                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                        } else {
+                                /*
+                                 * Failed to resume - maybe hardware went away?
+                                 * Clear the "initialized" flag so we won't try
+                                 * to call the low level drivers shutdown method.
+                                 */
+                                uart_shutdown(state);
+                        }
                 }
 
                 clear_bit(ASYNCB_SUSPENDED, &port->flags);
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index fc413f0f8dd2..95421fa3b304 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -146,7 +146,8 @@ static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
 {
         struct serial_info *info = link->priv;
 
-        outb(12, info->c950ctrl + 1);
+        if (info->c950ctrl)
+                outb(12, info->c950ctrl + 1);
 }
 
 /* request_region? oxsemi branch does no request_region too... */
@@ -757,6 +758,7 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
         PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
+        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0e01),
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
         PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
@@ -819,6 +821,7 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"),
         PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
+        PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC860", 0xd85f6206, 0x698f93db, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC860 3G Network Adapter R1 */
         PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"),  /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
         PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
         PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
@@ -827,7 +830,7 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
-        PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
+        PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"),
         PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100  1.00.",0x19ca78af,0xf964f42b),
         PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
         PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232  1.00.",0x19ca78af,0x69fb7490),
@@ -861,6 +864,18 @@ static struct pcmcia_device_id serial_ids[] = {
 };
 MODULE_DEVICE_TABLE(pcmcia, serial_ids);
 
+MODULE_FIRMWARE("cis/PCMLM28.cis");
+MODULE_FIRMWARE("cis/DP83903.cis");
+MODULE_FIRMWARE("cis/3CCFEM556.cis");
+MODULE_FIRMWARE("cis/3CXEM556.cis");
+MODULE_FIRMWARE("cis/SW_8xx_SER.cis");
+MODULE_FIRMWARE("cis/SW_7xx_SER.cis");
+MODULE_FIRMWARE("cis/SW_555_SER.cis");
+MODULE_FIRMWARE("cis/MT5634ZLX.cis");
+MODULE_FIRMWARE("cis/COMpad2.cis");
+MODULE_FIRMWARE("cis/COMpad4.cis");
+MODULE_FIRMWARE("cis/RS-COM-2P.cis");
+
 static struct pcmcia_driver serial_cs_driver = {
         .owner          = THIS_MODULE,
         .drv            = {
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 37f0de9dd9ce..42f3333c4ad0 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1052,7 +1052,18 @@ static void __devinit sci_init_single(struct platform_device *dev,
         sci_port->port.ops      = &sci_uart_ops;
         sci_port->port.iotype   = UPIO_MEM;
         sci_port->port.line     = index;
-        sci_port->port.fifosize = 1;
+
+        switch (p->type) {
+        case PORT_SCIFA:
+                sci_port->port.fifosize = 64;
+                break;
+        case PORT_SCIF:
+                sci_port->port.fifosize = 16;
+                break;
+        default:
+                sci_port->port.fifosize = 1;
+                break;
+        }
 
         if (dev) {
                 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 94eb86319ff3..fc2e963e65e9 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -99,8 +99,6 @@ source "drivers/staging/line6/Kconfig"
 
 source "drivers/gpu/drm/vmwgfx/Kconfig"
 
-source "drivers/gpu/drm/radeon/Kconfig"
-
 source "drivers/gpu/drm/nouveau/Kconfig"
 
 source "drivers/staging/octeon/Kconfig"
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c
index f4c26572c7df..43c57b7688ab 100644
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
@@ -194,9 +194,11 @@ static ssize_t set_enabled(struct device *dev, struct device_attribute *attr,
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct asus_oled_dev *odev = usb_get_intfdata(intf);
-        int temp = strict_strtoul(buf, 10, NULL);
+        unsigned long value;
+        if (strict_strtoul(buf, 10, &value))
+                return -EINVAL;
 
-        enable_oled(odev, temp);
+        enable_oled(odev, value);
 
         return count;
 }
@@ -207,10 +209,12 @@ static ssize_t class_set_enabled(struct device *device,
 {
         struct asus_oled_dev *odev =
                 (struct asus_oled_dev *) dev_get_drvdata(device);
+        unsigned long value;
 
-        int temp = strict_strtoul(buf, 10, NULL);
+        if (strict_strtoul(buf, 10, &value))
+                return -EINVAL;
 
-        enable_oled(odev, temp);
+        enable_oled(odev, value);
 
         return count;
 }
diff --git a/drivers/staging/cx25821/cx25821-medusa-video.c b/drivers/staging/cx25821/cx25821-medusa-video.c
index e4df8134f059..1eb079b3d429 100644
--- a/drivers/staging/cx25821/cx25821-medusa-video.c
+++ b/drivers/staging/cx25821/cx25821-medusa-video.c
@@ -860,10 +860,8 @@ int medusa_video_init(struct cx25821_dev *dev)
 
         ret_val = medusa_set_videostandard(dev);
 
-        if (ret_val < 0) {
-                mutex_unlock(&dev->lock);
+        if (ret_val < 0)
                 return -EINVAL;
-        }
 
         return 1;
 }
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 6da843cc343c..e715e4dcb523 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -203,11 +203,14 @@ typedef struct _GLOBAL_t {			/* Location: */
  * 9-0: pr ndes
  */
 
-#define ET_DMA10_MASK           0x3FF   /* 10 bit mask for DMA10W types */
-#define ET_DMA10_WRAP           0x400
-#define ET_DMA4_MASK            0x00F   /* 4 bit mask for DMA4W types */
-#define ET_DMA4_WRAP            0x010
-
+#define ET_DMA12_MASK           0x0FFF  /* 12 bit mask for DMA12W types */
+#define ET_DMA12_WRAP           0x1000
+#define ET_DMA10_MASK           0x03FF  /* 10 bit mask for DMA10W types */
+#define ET_DMA10_WRAP           0x0400
+#define ET_DMA4_MASK            0x000F  /* 4 bit mask for DMA4W types */
+#define ET_DMA4_WRAP            0x0010
+
+#define INDEX12(x)      ((x) & ET_DMA12_MASK)
 #define INDEX10(x)      ((x) & ET_DMA10_MASK)
 #define INDEX4(x)       ((x) & ET_DMA4_MASK)
 
@@ -216,6 +219,11 @@ extern inline void add_10bit(u32 *v, int n)
         *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP);
 }
 
+extern inline void add_12bit(u32 *v, int n)
+{
+        *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP);
+}
+
 /*
  * 10bit DMA with wrap
  * txdma tx queue write address reg in txdma address map at 0x1010
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index 3ddc9b12b8db..81c1a7478ad6 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -831,10 +831,10 @@ PMP_RFD nic_rx_pkts(struct et131x_adapter *etdev)
 
         /* Indicate that we have used this PSR entry. */
         /* FIXME wrap 12 */
-        rx_local->local_psr_full = (rx_local->local_psr_full + 1) & 0xFFF;
-        if (rx_local->local_psr_full  > rx_local->PsrNumEntries - 1) {
+        add_12bit(&rx_local->local_psr_full, 1);
+        if ((rx_local->local_psr_full & 0xFFF)  > rx_local->PsrNumEntries - 1) {
                 /* Clear psr full and toggle the wrap bit */
-                rx_local->local_psr_full &=  0xFFF;
+                rx_local->local_psr_full &=  ~0xFFF;
                 rx_local->local_psr_full ^= 0x1000;
         }
 
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index c5b6613f2f2f..c2809f2a2ce0 100644
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -386,7 +386,7 @@ u16 HvSignalEvent(void)
  * retrieve the initialized message and event pages.  Otherwise, we create and
  * initialize the message and event pages.
  */
-int HvSynicInit(u32 irqVector)
+void HvSynicInit(void *irqarg)
 {
         u64 version;
         union hv_synic_simp simp;
@@ -394,13 +394,14 @@ int HvSynicInit(u32 irqVector)
         union hv_synic_sint sharedSint;
         union hv_synic_scontrol sctrl;
         u64 guestID;
-        int ret = 0;
+        u32 irqVector = *((u32 *)(irqarg));
+        int cpu = smp_processor_id();
 
         DPRINT_ENTER(VMBUS);
 
         if (!gHvContext.HypercallPage) {
                 DPRINT_EXIT(VMBUS);
-                return ret;
+                return;
         }
 
         /* Check the version */
@@ -425,27 +426,27 @@ int HvSynicInit(u32 irqVector)
                  */
                 rdmsrl(HV_X64_MSR_GUEST_OS_ID, guestID);
                 if (guestID == HV_LINUX_GUEST_ID) {
-                        gHvContext.synICMessagePage[0] =
+                        gHvContext.synICMessagePage[cpu] =
                                 phys_to_virt(simp.BaseSimpGpa << PAGE_SHIFT);
-                        gHvContext.synICEventPage[0] =
+                        gHvContext.synICEventPage[cpu] =
                                 phys_to_virt(siefp.BaseSiefpGpa << PAGE_SHIFT);
                 } else {
                         DPRINT_ERR(VMBUS, "unknown guest id!!");
                         goto Cleanup;
                 }
                 DPRINT_DBG(VMBUS, "MAPPED: Simp: %p, Sifep: %p",
-                           gHvContext.synICMessagePage[0],
-                           gHvContext.synICEventPage[0]);
+                           gHvContext.synICMessagePage[cpu],
+                           gHvContext.synICEventPage[cpu]);
         } else {
-                gHvContext.synICMessagePage[0] = osd_PageAlloc(1);
-                if (gHvContext.synICMessagePage[0] == NULL) {
+                gHvContext.synICMessagePage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
+                if (gHvContext.synICMessagePage[cpu] == NULL) {
                         DPRINT_ERR(VMBUS,
                                    "unable to allocate SYNIC message page!!");
                         goto Cleanup;
                 }
 
-                gHvContext.synICEventPage[0] = osd_PageAlloc(1);
-                if (gHvContext.synICEventPage[0] == NULL) {
+                gHvContext.synICEventPage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
+                if (gHvContext.synICEventPage[cpu] == NULL) {
                         DPRINT_ERR(VMBUS,
                                    "unable to allocate SYNIC event page!!");
                         goto Cleanup;
@@ -454,7 +455,7 @@ int HvSynicInit(u32 irqVector)
                 /* Setup the Synic's message page */
                 rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
                 simp.SimpEnabled = 1;
-                simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[0])
+                simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[cpu])
                                         >> PAGE_SHIFT;
 
                 DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx",
@@ -465,7 +466,7 @@ int HvSynicInit(u32 irqVector)
                 /* Setup the Synic's event page */
                 rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
                 siefp.SiefpEnabled = 1;
-                siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[0])
+                siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[cpu])
                                         >> PAGE_SHIFT;
 
                 DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx",
@@ -501,32 +502,30 @@ int HvSynicInit(u32 irqVector)
 
         DPRINT_EXIT(VMBUS);
 
-        return ret;
+        return;
 
 Cleanup:
-        ret = -1;
-
         if (gHvContext.GuestId == HV_LINUX_GUEST_ID) {
-                if (gHvContext.synICEventPage[0])
-                        osd_PageFree(gHvContext.synICEventPage[0], 1);
+                if (gHvContext.synICEventPage[cpu])
+                        osd_PageFree(gHvContext.synICEventPage[cpu], 1);
 
-                if (gHvContext.synICMessagePage[0])
-                        osd_PageFree(gHvContext.synICMessagePage[0], 1);
+                if (gHvContext.synICMessagePage[cpu])
+                        osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
         }
 
         DPRINT_EXIT(VMBUS);
-
-        return ret;
+        return;
 }
 
 /**
  * HvSynicCleanup - Cleanup routine for HvSynicInit().
  */
-void HvSynicCleanup(void)
+void HvSynicCleanup(void *arg)
 {
         union hv_synic_sint sharedSint;
         union hv_synic_simp simp;
         union hv_synic_siefp siefp;
+        int cpu = smp_processor_id();
 
         DPRINT_ENTER(VMBUS);
 
@@ -539,6 +538,7 @@ void HvSynicCleanup(void)
 
         sharedSint.Masked = 1;
 
+        /* Need to correctly cleanup in the case of SMP!!! */
         /* Disable the interrupt */
         wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
 
@@ -560,8 +560,8 @@ void HvSynicCleanup(void)
 
                 wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
 
-                osd_PageFree(gHvContext.synICMessagePage[0], 1);
-                osd_PageFree(gHvContext.synICEventPage[0], 1);
+                osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
+                osd_PageFree(gHvContext.synICEventPage[cpu], 1);
         }
 
         DPRINT_EXIT(VMBUS);
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index 5379e4bfc56e..fce4b5cdac30 100644
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -93,7 +93,7 @@ static const struct hv_guid VMBUS_SERVICE_ID = {
         },
 };
 
-#define MAX_NUM_CPUS    1
+#define MAX_NUM_CPUS    32
 
 
 struct hv_input_signal_event_buffer {
@@ -137,8 +137,8 @@ extern u16 HvPostMessage(union hv_connection_id connectionId,
 
 extern u16 HvSignalEvent(void);
 
-extern int HvSynicInit(u32 irqVector);
+extern void HvSynicInit(void *irqarg);
 
-extern void HvSynicCleanup(void);
+extern void HvSynicCleanup(void *arg);
 
 #endif /* __HV_H__ */
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index a4dd06f6d459..35a023e9f9d1 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -129,7 +129,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
 
         /* strcpy(dev->name, "vmbus"); */
         /* SynIC setup... */
-        ret = HvSynicInit(*irqvector);
+        on_each_cpu(HvSynicInit, (void *)irqvector, 1);
 
         /* Connect to VMBus in the root partition */
         ret = VmbusConnect();
@@ -150,7 +150,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
         DPRINT_ENTER(VMBUS);
         VmbusChannelReleaseUnattachedChannels();
         VmbusDisconnect();
-        HvSynicCleanup();
+        on_each_cpu(HvSynicCleanup, NULL, 1);
         DPRINT_EXIT(VMBUS);
 
         return ret;
@@ -173,7 +173,8 @@ static void VmbusOnCleanup(struct hv_driver *drv)
  */
 static void VmbusOnMsgDPC(struct hv_driver *drv)
 {
-        void *page_addr = gHvContext.synICMessagePage[0];
+        int cpu = smp_processor_id();
+        void *page_addr = gHvContext.synICMessagePage[cpu];
         struct hv_message *msg = (struct hv_message *)page_addr +
                                   VMBUS_MESSAGE_SINT;
         struct hv_message *copied;
@@ -230,11 +231,12 @@ static void VmbusOnEventDPC(struct hv_driver *drv)
 static int VmbusOnISR(struct hv_driver *drv)
 {
         int ret = 0;
+        int cpu = smp_processor_id();
         void *page_addr;
         struct hv_message *msg;
         union hv_synic_event_flags *event;
 
-        page_addr = gHvContext.synICMessagePage[0];
+        page_addr = gHvContext.synICMessagePage[cpu];
         msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
 
         DPRINT_ENTER(VMBUS);
@@ -248,7 +250,7 @@ static int VmbusOnISR(struct hv_driver *drv)
         }
 
         /* TODO: Check if there are events to be process */
-        page_addr = gHvContext.synICEventPage[0];
+        page_addr = gHvContext.synICEventPage[cpu];
         event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
 
         /* Since we are a child, we only need to check bit 0 */
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 96f11715cd26..355dffcc23b0 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -494,7 +494,7 @@ static ssize_t usb_device_dump(char __user **buffer, size_t *nbytes,
                 return 0;
         /* allocate 2^1 pages = 8K (on i386);
          * should be more than enough for one device */
-        pages_start = (char *)__get_free_pages(GFP_KERNEL, 1);
+        pages_start = (char *)__get_free_pages(GFP_NOIO, 1);
         if (!pages_start)
                 return -ENOMEM;
 
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 0495fa651225..80995ef0868c 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1684,6 +1684,24 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
                 }
         }
         if (cur_alt && new_alt) {
+                struct usb_interface *iface = usb_ifnum_to_if(udev,
+                                cur_alt->desc.bInterfaceNumber);
+
+                if (iface->resetting_device) {
+                        /*
+                         * The USB core just reset the device, so the xHCI host
+                         * and the device will think alt setting 0 is installed.
+                         * However, the USB core will pass in the alternate
+                         * setting installed before the reset as cur_alt.  Dig
+                         * out the alternate setting 0 structure, or the first
+                         * alternate setting if a broken device doesn't have alt
+                         * setting 0.
+                         */
+                        cur_alt = usb_altnum_to_altsetting(iface, 0);
+                        if (!cur_alt)
+                                cur_alt = &iface->altsetting[0];
+                }
+
                 /* Drop all the endpoints in the current alt setting */
                 for (i = 0; i < cur_alt->desc.bNumEndpoints; i++) {
                         ret = hcd->driver->drop_endpoint(hcd, udev,
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 0cec6caf6e9b..35cc8b9ba1f5 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3347,6 +3347,9 @@ static void hub_events(void)
                                         USB_PORT_FEAT_C_SUSPEND);
                                 udev = hdev->children[i-1];
                                 if (udev) {
+                                        /* TRSMRCY = 10 msec */
+                                        msleep(10);
+
                                         usb_lock_device(udev);
                                         ret = remote_wakeup(hdev->
                                                         children[i-1]);
@@ -3692,19 +3695,14 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
                         usb_enable_interface(udev, intf, true);
                         ret = 0;
                 } else {
-                        /* We've just reset the device, so it will think alt
-                         * setting 0 is installed.  For usb_set_interface() to
-                         * work properly, we need to set the current alternate
-                         * interface setting to 0 (or the first alt setting, if
-                         * the device doesn't have alt setting 0).
+                        /* Let the bandwidth allocation function know that this
+                         * device has been reset, and it will have to use
+                         * alternate setting 0 as the current alternate setting.
                          */
-                        intf->cur_altsetting =
-                                usb_find_alt_setting(config, i, 0);
-                        if (!intf->cur_altsetting)
-                                intf->cur_altsetting =
-                                        &config->intf_cache[i]->altsetting[0];
+                        intf->resetting_device = 1;
                         ret = usb_set_interface(udev, desc->bInterfaceNumber,
                                         desc->bAlternateSetting);
+                        intf->resetting_device = 0;
                 }
                 if (ret < 0) {
                         dev_err(&udev->dev, "failed to restore interface %d "
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 1b994846e8e0..9bc95fec793f 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -906,11 +906,11 @@ char *usb_cache_string(struct usb_device *udev, int index)
         if (index <= 0)
                 return NULL;
 
-        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_KERNEL);
+        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
         if (buf) {
                 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
                 if (len > 0) {
-                        smallbuf = kmalloc(++len, GFP_KERNEL);
+                        smallbuf = kmalloc(++len, GFP_NOIO);
                         if (!smallbuf)
                                 return buf;
                         memcpy(smallbuf, buf, len);
@@ -1731,7 +1731,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
         if (cp) {
                 nintf = cp->desc.bNumInterfaces;
                 new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),
-                                GFP_KERNEL);
+                                GFP_NOIO);
                 if (!new_interfaces) {
                         dev_err(&dev->dev, "Out of memory\n");
                         return -ENOMEM;
@@ -1740,7 +1740,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
                 for (; n < nintf; ++n) {
                         new_interfaces[n] = kzalloc(
                                         sizeof(struct usb_interface),
-                                        GFP_KERNEL);
+                                        GFP_NOIO);
                         if (!new_interfaces[n]) {
                                 dev_err(&dev->dev, "Out of memory\n");
                                 ret = -ENOMEM;
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 485edf937f25..5f3908f6e2dc 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -115,6 +115,12 @@ show_speed(struct device *dev, struct device_attribute *attr, char *buf)
         case USB_SPEED_HIGH:
                 speed = "480";
                 break;
+        case USB_SPEED_VARIABLE:
+                speed = "480";
+                break;
+        case USB_SPEED_SUPER:
+                speed = "5000";
+                break;
         default:
                 speed = "unknown";
         }
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 5859522d6edd..1ec3857f22e6 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -787,9 +787,10 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
 
                         /* start 20 msec resume signaling from this port,
                          * and make khubd collect PORT_STAT_C_SUSPEND to
-                         * stop that signaling.
+                         * stop that signaling.  Use 5 ms extra for safety,
+                         * like usb_port_resume() does.
                          */
-                        ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);
+                        ehci->reset_done[i] = jiffies + msecs_to_jiffies(25);
                         ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);
                         mod_timer(&hcd->rh_timer, ehci->reset_done[i]);
                 }
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 2c6571c05f35..c75d9270c752 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -120,9 +120,26 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
         del_timer_sync(&ehci->watchdog);
         del_timer_sync(&ehci->iaa_watchdog);
 
-        port = HCS_N_PORTS (ehci->hcs_params);
         spin_lock_irq (&ehci->lock);
 
+        /* Once the controller is stopped, port resumes that are already
+         * in progress won't complete.  Hence if remote wakeup is enabled
+         * for the root hub and any ports are in the middle of a resume or
+         * remote wakeup, we must fail the suspend.
+         */
+        if (hcd->self.root_hub->do_remote_wakeup) {
+                port = HCS_N_PORTS(ehci->hcs_params);
+                while (port--) {
+                        if (ehci->reset_done[port] != 0) {
+                                spin_unlock_irq(&ehci->lock);
+                                ehci_dbg(ehci, "suspend failed because "
+                                                "port %d is resuming\n",
+                                                port + 1);
+                                return -EBUSY;
+                        }
+                }
+        }
+
         /* stop schedules, clean any completed work */
         if (HC_IS_RUNNING(hcd->state)) {
                 ehci_quiesce (ehci);
@@ -138,6 +155,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
          */
         ehci->bus_suspended = 0;
         ehci->owned_ports = 0;
+        port = HCS_N_PORTS(ehci->hcs_params);
         while (port--) {
                 u32 __iomem     *reg = &ehci->regs->port_status [port];
                 u32             t1 = ehci_readl(ehci, reg) & ~PORT_RWC_BITS;
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index a427d3b00634..89521775c567 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -849,9 +849,10 @@ qh_make (
                                  * But interval 1 scheduling is simpler, and
                                  * includes high bandwidth.
                                  */
-                                dbg ("intr period %d uframes, NYET!",
-                                                urb->interval);
-                                goto done;
+                                urb->interval = 1;
+                        } else if (qh->period > ehci->periodic_size) {
+                                qh->period = ehci->periodic_size;
+                                urb->interval = qh->period << 3;
                         }
                 } else {
                         int             think_time;
@@ -874,6 +875,10 @@ qh_make (
                                         usb_calc_bus_time (urb->dev->speed,
                                         is_input, 0, max_packet (maxp)));
                         qh->period = urb->interval;
+                        if (qh->period > ehci->periodic_size) {
+                                qh->period = ehci->periodic_size;
+                                urb->interval = qh->period;
+                        }
                 }
         }
 
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 0951818ef93b..78e7c3cfcb72 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -242,9 +242,10 @@ err:
 static void fhci_usb_free(void *lld)
 {
         struct fhci_usb *usb = lld;
-        struct fhci_hcd *fhci = usb->fhci;
+        struct fhci_hcd *fhci;
 
         if (usb) {
+                fhci = usb->fhci;
                 fhci_config_transceiver(fhci, FHCI_PORT_POWER_OFF);
                 fhci_ep0_free(usb);
                 kfree(usb->actual_frame);
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 73352f3739b5..42971657fde2 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -2270,10 +2270,10 @@ static int isp1362_mem_config(struct usb_hcd *hcd)
         dev_info(hcd->self.controller, "ISP1362 Memory usage:\n");
         dev_info(hcd->self.controller, "  ISTL:    2 * %4d:     %4d @ $%04x:$%04x\n",
                  istl_size / 2, istl_size, 0, istl_size / 2);
-        dev_info(hcd->self.controller, "  INTL: %4d * (%3lu+8):  %4d @ $%04x\n",
+        dev_info(hcd->self.controller, "  INTL: %4d * (%3zu+8):  %4d @ $%04x\n",
                  ISP1362_INTL_BUFFERS, intl_blksize - PTD_HEADER_SIZE,
                  intl_size, istl_size);
-        dev_info(hcd->self.controller, "  ATL : %4d * (%3lu+8):  %4d @ $%04x\n",
+        dev_info(hcd->self.controller, "  ATL : %4d * (%3zu+8):  %4d @ $%04x\n",
                  atl_buffers, atl_blksize - PTD_HEADER_SIZE,
                  atl_size, istl_size + intl_size);
         dev_info(hcd->self.controller, "  USED/FREE:   %4d      %4d\n", total,
@@ -2697,6 +2697,8 @@ static int __init isp1362_probe(struct platform_device *pdev)
         void __iomem *data_reg;
         int irq;
         int retval = 0;
+        struct resource *irq_res;
+        unsigned int irq_flags = 0;
 
         /* basic sanity checks first.  board-specific init logic should
          * have initialized this the three resources and probably board
@@ -2710,11 +2712,12 @@ static int __init isp1362_probe(struct platform_device *pdev)
 
         data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        irq = platform_get_irq(pdev, 0);
-        if (!addr || !data || irq < 0) {
+        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!addr || !data || !irq_res) {
                 retval = -ENODEV;
                 goto err1;
         }
+        irq = irq_res->start;
 
 #ifdef CONFIG_USB_HCD_DMA
         if (pdev->dev.dma_mask) {
@@ -2781,12 +2784,16 @@ static int __init isp1362_probe(struct platform_device *pdev)
         }
 #endif
 
-#ifdef CONFIG_ARM
-        if (isp1362_hcd->board)
-                set_irq_type(irq, isp1362_hcd->board->int_act_high ? IRQT_RISING : IRQT_FALLING);
-#endif
+        if (irq_res->flags & IORESOURCE_IRQ_HIGHEDGE)
+                irq_flags |= IRQF_TRIGGER_RISING;
+        if (irq_res->flags & IORESOURCE_IRQ_LOWEDGE)
+                irq_flags |= IRQF_TRIGGER_FALLING;
+        if (irq_res->flags & IORESOURCE_IRQ_HIGHLEVEL)
+                irq_flags |= IRQF_TRIGGER_HIGH;
+        if (irq_res->flags & IORESOURCE_IRQ_LOWLEVEL)
+                irq_flags |= IRQF_TRIGGER_LOW;
 
-        retval = usb_add_hcd(hcd, irq, IRQF_TRIGGER_LOW | IRQF_DISABLED | IRQF_SHARED);
+        retval = usb_add_hcd(hcd, irq, irq_flags | IRQF_DISABLED | IRQF_SHARED);
         if (retval != 0)
                 goto err6;
         pr_info("%s, irq %d\n", hcd->product_desc, irq);
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 9600a58299db..27b8f7cb4471 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1039,12 +1039,12 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
                 if (!nakcount && (dw3 & DW3_QTD_ACTIVE)) {
                         u32 buffstatus;
 
-                        /* XXX
+                        /*
                          * NAKs are handled in HW by the chip. Usually if the
                          * device is not able to send data fast enough.
-                         * This did not trigger for a long time now.
+                         * This happens mostly on slower hardware.
                          */
-                        printk(KERN_ERR "Reloading ptd %p/%p... qh %p readed: "
+                        printk(KERN_NOTICE "Reloading ptd %p/%p... qh %p read: "
                                         "%d of %zu done: %08x cur: %08x\n", qtd,
                                         urb, qh, PTD_XFERRED_LENGTH(dw3),
                                         qtd->length, done_map,
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 5cd0e48f67fb..99cd00fd3514 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -749,7 +749,20 @@ static int uhci_rh_suspend(struct usb_hcd *hcd)
         spin_lock_irq(&uhci->lock);
         if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))
                 rc = -ESHUTDOWN;
-        else if (!uhci->dead)
+        else if (uhci->dead)
+                ;               /* Dead controllers tell no tales */
+
+        /* Once the controller is stopped, port resumes that are already
+         * in progress won't complete.  Hence if remote wakeup is enabled
+         * for the root hub and any ports are in the middle of a resume or
+         * remote wakeup, we must fail the suspend.
+         */
+        else if (hcd->self.root_hub->do_remote_wakeup &&
+                        uhci->resuming_ports) {
+                dev_dbg(uhci_dev(uhci), "suspend failed because a port "
+                                "is resuming\n");
+                rc = -EBUSY;
+        } else
                 suspend_rh(uhci, UHCI_RH_SUSPENDED);
         spin_unlock_irq(&uhci->lock);
         return rc;
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 885b585360b9..8270055848ca 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -167,7 +167,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci)
                                 /* Port received a wakeup request */
                                 set_bit(port, &uhci->resuming_ports);
                                 uhci->ports_timeout = jiffies +
-                                                msecs_to_jiffies(20);
+                                                msecs_to_jiffies(25);
 
                                 /* Make sure we see the port again
                                  * after the resuming period is over. */
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index f1ea3a33b6e6..83443d6306d6 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -386,12 +386,12 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)
 
         dbg("%s - port %d", __func__, port->number);
 
-        if (serial->type->max_in_flight_urbs) {
-                spin_lock_irqsave(&port->lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
+        if (serial->type->max_in_flight_urbs)
                 chars = port->tx_bytes_flight;
-                spin_unlock_irqrestore(&port->lock, flags);
-        } else if (serial->num_bulk_out)
+        else if (serial->num_bulk_out)
                 chars = kfifo_len(&port->write_fifo);
+        spin_unlock_irqrestore(&port->lock, flags);
 
         dbg("%s - returns %d", __func__, chars);
         return chars;
@@ -489,6 +489,8 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb)
         dbg("%s - port %d", __func__, port->number);
 
         if (port->serial->type->max_in_flight_urbs) {
+                kfree(urb->transfer_buffer);
+
                 spin_lock_irqsave(&port->lock, flags);
                 --port->urbs_in_flight;
                 port->tx_bytes_flight -= urb->transfer_buffer_length;
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 64a0a2c27e12..c932f9053188 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1807,13 +1807,6 @@ UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_GO_SLOW ),
 
-/* Reported by Rohan Hart <rohan.hart17@gmail.com> */
-UNUSUAL_DEV(  0x2770, 0x915d, 0x0010, 0x0010,
-                "INTOVA",
-                "Pixtreme",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_CAPACITY ),
-
 /* Reported by Frederic Marchal <frederic.marchal@wowcompany.com>
  * Mio Moov 330
  */
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 5a53d4f0dd11..e9f995486ec1 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -434,7 +434,8 @@ static void adjust_quirks(struct us_data *us)
         u16 vid = le16_to_cpu(us->pusb_dev->descriptor.idVendor);
         u16 pid = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
         unsigned f = 0;
-        unsigned int mask = (US_FL_SANE_SENSE | US_FL_FIX_CAPACITY |
+        unsigned int mask = (US_FL_SANE_SENSE | US_FL_BAD_SENSE |
+                        US_FL_FIX_CAPACITY |
                         US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE |
                         US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 |
                         US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE |
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 409ca9643528..a3a7f8938175 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -139,8 +139,6 @@ static int omapbl_probe(struct platform_device *pdev)
         if (!pdata)
                 return -ENXIO;
 
-        omapbl_ops.check_fb = pdata->check_fb;
-
         bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL);
         if (unlikely(!bl))
                 return -ENOMEM;
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index c7c6455f1fa8..e192b058a688 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -189,11 +189,6 @@ static struct {
         struct omapfb_color_key color_key;
 } dispc;
 
-static struct platform_device omapdss_device = {
-        .name           = "omapdss",
-        .id             = -1,
-};
-
 static void enable_lcd_clocks(int enable);
 
 static void inline dispc_write_reg(int idx, u32 val)
@@ -920,20 +915,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
 
 static int get_dss_clocks(void)
 {
-        dispc.dss_ick = clk_get(&omapdss_device.dev, "ick");
+        dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
         if (IS_ERR(dispc.dss_ick)) {
                 dev_err(dispc.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(dispc.dss_ick);
         }
 
-        dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");
+        dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
         if (IS_ERR(dispc.dss1_fck)) {
                 dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(dispc.dss_ick);
                 return PTR_ERR(dispc.dss1_fck);
         }
 
-        dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck");
+        dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
         if (IS_ERR(dispc.dss_54m_fck)) {
                 dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
                 clk_put(dispc.dss_ick);
@@ -1385,12 +1380,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         int skip_init = 0;
         int i;
 
-        r = platform_device_register(&omapdss_device);
-        if (r) {
-                dev_err(fbdev->dev, "can't register omapdss device\n");
-                return r;
-        }
-
         memset(&dispc, 0, sizeof(dispc));
 
         dispc.base = ioremap(DISPC_BASE, SZ_1K);
@@ -1534,7 +1523,6 @@ static void omap_dispc_cleanup(void)
         free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
         put_dss_clocks();
         iounmap(dispc.base);
-        platform_device_unregister(&omapdss_device);
 }
 
 const struct lcd_ctrl omap2_int_ctrl = {
diff --git a/drivers/video/omap/lcd_htcherald.c b/drivers/video/omap/lcd_htcherald.c
index a9007c5d1fad..4802419da83b 100644
--- a/drivers/video/omap/lcd_htcherald.c
+++ b/drivers/video/omap/lcd_htcherald.c
@@ -115,12 +115,12 @@ struct platform_driver htcherald_panel_driver = {
         },
 };
 
-static int htcherald_panel_drv_init(void)
+static int __init htcherald_panel_drv_init(void)
 {
         return platform_driver_register(&htcherald_panel_driver);
 }
 
-static void htcherald_panel_drv_cleanup(void)
+static void __exit htcherald_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&htcherald_panel_driver);
 }
diff --git a/drivers/video/omap/omapfb.h b/drivers/video/omap/omapfb.h
index 46e4714014e8..af3c9e571ec3 100644
--- a/drivers/video/omap/omapfb.h
+++ b/drivers/video/omap/omapfb.h
@@ -203,6 +203,8 @@ struct omapfb_device {
 
         struct omapfb_mem_desc          mem_desc;
         struct fb_info                  *fb_info[OMAPFB_PLANE_NUM];
+
+        struct platform_device  *dssdev;        /* dummy dev for clocks */
 };
 
 #ifdef CONFIG_ARCH_OMAP1
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index c7f59a5ccdbc..2c4f470fa086 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -83,6 +83,19 @@ static struct caps_table_struct color_caps[] = {
         { 1 << OMAPFB_COLOR_YUY422,     "YUY422", },
 };
 
+static void omapdss_release(struct device *dev)
+{
+}
+
+/* dummy device for clocks */
+static struct platform_device omapdss_device = {
+        .name           = "omapdss",
+        .id             = -1,
+        .dev            = {
+                .release = omapdss_release,
+        },
+};
+
 /*
  * ---------------------------------------------------------------------------
  * LCD panel
@@ -1700,6 +1713,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
 
         fbdev->dev = &pdev->dev;
         fbdev->panel = panel;
+        fbdev->dssdev = &omapdss_device;
         platform_set_drvdata(pdev, fbdev);
 
         mutex_init(&fbdev->rqueue_mutex);
@@ -1814,8 +1828,16 @@ cleanup:
 
 static int omapfb_probe(struct platform_device *pdev)
 {
+        int r;
+
         BUG_ON(fbdev_pdev != NULL);
 
+        r = platform_device_register(&omapdss_device);
+        if (r) {
+                dev_err(&pdev->dev, "can't register omapdss device\n");
+                return r;
+        }
+
         /* Delay actual initialization until the LCD is registered */
         fbdev_pdev = pdev;
         if (fbdev_panel != NULL)
@@ -1843,6 +1865,9 @@ static int omapfb_remove(struct platform_device *pdev)
         fbdev->state = OMAPFB_DISABLED;
         omapfb_free_resources(fbdev, saved_state);
 
+        platform_device_unregister(&omapdss_device);
+        fbdev->dssdev = NULL;
+
         return 0;
 }
 
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index fed7b1bda19c..1162603c72e5 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -83,13 +83,13 @@ static inline u32 rfbi_read_reg(int idx)
 
 static int rfbi_get_clocks(void)
 {
-        rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick");
+        rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
         if (IS_ERR(rfbi.dss_ick)) {
                 dev_err(rfbi.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(rfbi.dss_ick);
         }
 
-        rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck");
+        rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
         if (IS_ERR(rfbi.dss1_fck)) {
                 dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(rfbi.dss_ick);
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 71d8dec30635..c63ce767b277 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -25,6 +25,13 @@ config OMAP2_DSS_DEBUG_SUPPORT
           This enables debug messages. You need to enable printing
           with 'debug' module parameter.
 
+config OMAP2_DSS_COLLECT_IRQ_STATS
+        bool "Collect DSS IRQ statistics"
+        depends on OMAP2_DSS_DEBUG_SUPPORT
+        default n
+        help
+          Collect DSS IRQ statistics, printable via debugfs
+
 config OMAP2_DSS_RFBI
         bool "RFBI support"
         default n
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 29497a0c9a91..82918eec6d2e 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -124,6 +124,7 @@ static void restore_all_ctx(void)
         dss_clk_disable_all_no_ctx();
 }
 
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
 /* CLOCKS */
 static void core_dump_clocks(struct seq_file *s)
 {
@@ -149,6 +150,7 @@ static void core_dump_clocks(struct seq_file *s)
                                 clocks[i]->usecount);
         }
 }
+#endif /* defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) */
 
 static int dss_get_clock(struct clk **clock, const char *clk_name)
 {
@@ -395,6 +397,14 @@ static int dss_initialize_debugfs(void)
         debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir,
                         &dss_debug_dump_clocks, &dss_debug_fops);
 
+        debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir,
+                        &dispc_dump_irqs, &dss_debug_fops);
+
+#ifdef CONFIG_OMAP2_DSS_DSI
+        debugfs_create_file("dsi_irq", S_IRUGO, dss_debugfs_dir,
+                        &dsi_dump_irqs, &dss_debug_fops);
+#endif
+
         debugfs_create_file("dss", S_IRUGO, dss_debugfs_dir,
                         &dss_dump_regs, &dss_debug_fops);
         debugfs_create_file("dispc", S_IRUGO, dss_debugfs_dir,
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 6dabf4b2f005..de8bfbac9e26 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -148,6 +148,12 @@ static const struct dispc_reg dispc_reg_att[] = { DISPC_GFX_ATTRIBUTES,
         DISPC_VID_ATTRIBUTES(0),
         DISPC_VID_ATTRIBUTES(1) };
 
+struct dispc_irq_stats {
+        unsigned long last_reset;
+        unsigned irq_count;
+        unsigned irqs[32];
+};
+
 static struct {
         void __iomem    *base;
 
@@ -160,6 +166,11 @@ static struct {
         struct work_struct error_work;
 
         u32             ctx[DISPC_SZ_REGS / sizeof(u32)];
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spinlock_t irq_stats_lock;
+        struct dispc_irq_stats irq_stats;
+#endif
 } dispc;
 
 static void _omap_dispc_set_irqs(void);
@@ -1443,7 +1454,10 @@ static unsigned long calc_fclk_five_taps(u16 width, u16 height,
                 do_div(tmp, 2 * out_height * ppl);
                 fclk = tmp;
 
-                if (height > 2 * out_height && ppl != out_width) {
+                if (height > 2 * out_height) {
+                        if (ppl == out_width)
+                                return 0;
+
                         tmp = pclk * (height - 2 * out_height) * out_width;
                         do_div(tmp, 2 * out_height * (ppl - out_width));
                         fclk = max(fclk, (u32) tmp);
@@ -1623,7 +1637,7 @@ static int _dispc_setup_plane(enum omap_plane plane,
                 DSSDBG("required fclk rate = %lu Hz\n", fclk);
                 DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
 
-                if (fclk > dispc_fclk_rate()) {
+                if (!fclk || fclk > dispc_fclk_rate()) {
                         DSSERR("failed to set up scaling, "
                                         "required fclk rate = %lu Hz, "
                                         "current fclk rate = %lu Hz\n",
@@ -2247,6 +2261,50 @@ void dispc_dump_clocks(struct seq_file *s)
         enable_clocks(0);
 }
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+void dispc_dump_irqs(struct seq_file *s)
+{
+        unsigned long flags;
+        struct dispc_irq_stats stats;
+
+        spin_lock_irqsave(&dispc.irq_stats_lock, flags);
+
+        stats = dispc.irq_stats;
+        memset(&dispc.irq_stats, 0, sizeof(dispc.irq_stats));
+        dispc.irq_stats.last_reset = jiffies;
+
+        spin_unlock_irqrestore(&dispc.irq_stats_lock, flags);
+
+        seq_printf(s, "period %u ms\n",
+                        jiffies_to_msecs(jiffies - stats.last_reset));
+
+        seq_printf(s, "irqs %d\n", stats.irq_count);
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, stats.irqs[ffs(DISPC_IRQ_##x)-1]);
+
+        PIS(FRAMEDONE);
+        PIS(VSYNC);
+        PIS(EVSYNC_EVEN);
+        PIS(EVSYNC_ODD);
+        PIS(ACBIAS_COUNT_STAT);
+        PIS(PROG_LINE_NUM);
+        PIS(GFX_FIFO_UNDERFLOW);
+        PIS(GFX_END_WIN);
+        PIS(PAL_GAMMA_MASK);
+        PIS(OCP_ERR);
+        PIS(VID1_FIFO_UNDERFLOW);
+        PIS(VID1_END_WIN);
+        PIS(VID2_FIFO_UNDERFLOW);
+        PIS(VID2_END_WIN);
+        PIS(SYNC_LOST);
+        PIS(SYNC_LOST_DIGIT);
+        PIS(WAKEUP);
+#undef PIS
+}
+#else
+void dispc_dump_irqs(struct seq_file *s) { }
+#endif
+
 void dispc_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dispc_read_reg(r))
@@ -2665,6 +2723,13 @@ void dispc_irq_handler(void)
 
         irqstatus = dispc_read_reg(DISPC_IRQSTATUS);
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock(&dispc.irq_stats_lock);
+        dispc.irq_stats.irq_count++;
+        dss_collect_irq_stats(irqstatus, dispc.irq_stats.irqs);
+        spin_unlock(&dispc.irq_stats_lock);
+#endif
+
 #ifdef DEBUG
         if (dss_debug)
                 print_irq_status(irqstatus);
@@ -3012,6 +3077,11 @@ int dispc_init(void)
 
         spin_lock_init(&dispc.irq_lock);
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock_init(&dispc.irq_stats_lock);
+        dispc.irq_stats.last_reset = jiffies;
+#endif
+
         INIT_WORK(&dispc.error_work, dispc_error_worker);
 
         dispc.base = ioremap(DISPC_BASE, DISPC_SZ_REGS);
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 5936487b5def..6122178f5f85 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -204,6 +204,14 @@ struct dsi_update_region {
         struct omap_dss_device *device;
 };
 
+struct dsi_irq_stats {
+        unsigned long last_reset;
+        unsigned irq_count;
+        unsigned dsi_irqs[32];
+        unsigned vc_irqs[4][32];
+        unsigned cio_irqs[32];
+};
+
 static struct
 {
         void __iomem    *base;
@@ -258,6 +266,11 @@ static struct
 #endif
         int debug_read;
         int debug_write;
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spinlock_t irq_stats_lock;
+        struct dsi_irq_stats irq_stats;
+#endif
 } dsi;
 
 #ifdef DEBUG
@@ -528,6 +541,12 @@ void dsi_irq_handler(void)
 
         irqstatus = dsi_read_reg(DSI_IRQSTATUS);
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock(&dsi.irq_stats_lock);
+        dsi.irq_stats.irq_count++;
+        dss_collect_irq_stats(irqstatus, dsi.irq_stats.dsi_irqs);
+#endif
+
         if (irqstatus & DSI_IRQ_ERROR_MASK) {
                 DSSERR("DSI error, irqstatus %x\n", irqstatus);
                 print_irq_status(irqstatus);
@@ -549,6 +568,10 @@ void dsi_irq_handler(void)
 
                 vcstatus = dsi_read_reg(DSI_VC_IRQSTATUS(i));
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+                dss_collect_irq_stats(vcstatus, dsi.irq_stats.vc_irqs[i]);
+#endif
+
                 if (vcstatus & DSI_VC_IRQ_BTA)
                         complete(&dsi.bta_completion);
 
@@ -568,6 +591,10 @@ void dsi_irq_handler(void)
         if (irqstatus & DSI_IRQ_COMPLEXIO_ERR) {
                 ciostatus = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+                dss_collect_irq_stats(ciostatus, dsi.irq_stats.cio_irqs);
+#endif
+
                 dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, ciostatus);
                 /* flush posted write */
                 dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
@@ -579,6 +606,10 @@ void dsi_irq_handler(void)
         dsi_write_reg(DSI_IRQSTATUS, irqstatus & ~DSI_IRQ_CHANNEL_MASK);
         /* flush posted write */
         dsi_read_reg(DSI_IRQSTATUS);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_unlock(&dsi.irq_stats_lock);
+#endif
 }
 
 
@@ -797,12 +828,12 @@ static int dsi_pll_power(enum dsi_pll_power_state state)
 
         /* PLL_PWR_STATUS */
         while (FLD_GET(dsi_read_reg(DSI_CLK_CTRL), 29, 28) != state) {
-                udelay(1);
-                if (t++ > 1000) {
+                if (++t > 1000) {
                         DSSERR("Failed to set DSI PLL power mode to %d\n",
                                         state);
                         return -ENODEV;
                 }
+                udelay(1);
         }
 
         return 0;
@@ -1226,6 +1257,95 @@ void dsi_dump_clocks(struct seq_file *s)
         enable_clocks(0);
 }
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+void dsi_dump_irqs(struct seq_file *s)
+{
+        unsigned long flags;
+        struct dsi_irq_stats stats;
+
+        spin_lock_irqsave(&dsi.irq_stats_lock, flags);
+
+        stats = dsi.irq_stats;
+        memset(&dsi.irq_stats, 0, sizeof(dsi.irq_stats));
+        dsi.irq_stats.last_reset = jiffies;
+
+        spin_unlock_irqrestore(&dsi.irq_stats_lock, flags);
+
+        seq_printf(s, "period %u ms\n",
+                        jiffies_to_msecs(jiffies - stats.last_reset));
+
+        seq_printf(s, "irqs %d\n", stats.irq_count);
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]);
+
+        seq_printf(s, "-- DSI interrupts --\n");
+        PIS(VC0);
+        PIS(VC1);
+        PIS(VC2);
+        PIS(VC3);
+        PIS(WAKEUP);
+        PIS(RESYNC);
+        PIS(PLL_LOCK);
+        PIS(PLL_UNLOCK);
+        PIS(PLL_RECALL);
+        PIS(COMPLEXIO_ERR);
+        PIS(HS_TX_TIMEOUT);
+        PIS(LP_RX_TIMEOUT);
+        PIS(TE_TRIGGER);
+        PIS(ACK_TRIGGER);
+        PIS(SYNC_LOST);
+        PIS(LDO_POWER_GOOD);
+        PIS(TA_TIMEOUT);
+#undef PIS
+
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d %10d %10d %10d\n", #x, \
+                        stats.vc_irqs[0][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[1][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[2][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[3][ffs(DSI_VC_IRQ_##x)-1]);
+
+        seq_printf(s, "-- VC interrupts --\n");
+        PIS(CS);
+        PIS(ECC_CORR);
+        PIS(PACKET_SENT);
+        PIS(FIFO_TX_OVF);
+        PIS(FIFO_RX_OVF);
+        PIS(BTA);
+        PIS(ECC_NO_CORR);
+        PIS(FIFO_TX_UDF);
+        PIS(PP_BUSY_CHANGE);
+#undef PIS
+
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, \
+                        stats.cio_irqs[ffs(DSI_CIO_IRQ_##x)-1]);
+
+        seq_printf(s, "-- CIO interrupts --\n");
+        PIS(ERRSYNCESC1);
+        PIS(ERRSYNCESC2);
+        PIS(ERRSYNCESC3);
+        PIS(ERRESC1);
+        PIS(ERRESC2);
+        PIS(ERRESC3);
+        PIS(ERRCONTROL1);
+        PIS(ERRCONTROL2);
+        PIS(ERRCONTROL3);
+        PIS(STATEULPS1);
+        PIS(STATEULPS2);
+        PIS(STATEULPS3);
+        PIS(ERRCONTENTIONLP0_1);
+        PIS(ERRCONTENTIONLP1_1);
+        PIS(ERRCONTENTIONLP0_2);
+        PIS(ERRCONTENTIONLP1_2);
+        PIS(ERRCONTENTIONLP0_3);
+        PIS(ERRCONTENTIONLP1_3);
+        PIS(ULPSACTIVENOT_ALL0);
+        PIS(ULPSACTIVENOT_ALL1);
+#undef PIS
+}
+#endif
+
 void dsi_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(r))
@@ -1321,12 +1441,12 @@ static int dsi_complexio_power(enum dsi_complexio_power_state state)
 
         /* PWR_STATUS */
         while (FLD_GET(dsi_read_reg(DSI_COMPLEXIO_CFG1), 26, 25) != state) {
-                udelay(1);
-                if (t++ > 1000) {
+                if (++t > 1000) {
                         DSSERR("failed to set complexio power state to "
                                         "%d\n", state);
                         return -ENODEV;
                 }
+                udelay(1);
         }
 
         return 0;
@@ -1526,10 +1646,10 @@ static void dsi_complexio_uninit(void)
 
 static int _dsi_wait_reset(void)
 {
-        int i = 0;
+        int t = 0;
 
         while (REG_GET(DSI_SYSSTATUS, 0, 0) == 0) {
-                if (i++ > 5) {
+                if (++t > 5) {
                         DSSERR("soft reset failed\n");
                         return -ENODEV;
                 }
@@ -1999,7 +2119,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
                 return -EINVAL;
         }
 
-        data_id = data_type | channel << 6;
+        data_id = data_type | dsi.vc[channel].dest_per << 6;
 
         r = (data_id << 0) | (data << 8) | (ecc << 24);
 
@@ -2011,7 +2131,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
 int dsi_vc_send_null(int channel)
 {
         u8 nullpkg[] = {0, 0, 0, 0};
-        return dsi_vc_send_long(0, DSI_DT_NULL_PACKET, nullpkg, 4, 0);
+        return dsi_vc_send_long(channel, DSI_DT_NULL_PACKET, nullpkg, 4, 0);
 }
 EXPORT_SYMBOL(dsi_vc_send_null);
 
@@ -2058,7 +2178,7 @@ int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen)
         int r;
 
         if (dsi.debug_read)
-                DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %u)\n", channel, dcs_cmd);
+                DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %x)\n", channel, dcs_cmd);
 
         r = dsi_vc_send_short(channel, DSI_DT_DCS_READ, dcs_cmd, 0);
         if (r)
@@ -2586,7 +2706,6 @@ static int dsi_update_screen_l4(struct omap_dss_device *dssdev,
                 /* using fifo not empty */
                 /* TX_FIFO_NOT_EMPTY */
                 while (FLD_GET(dsi_read_reg(DSI_VC_CTRL(0)), 5, 5)) {
-                        udelay(1);
                         fifo_stalls++;
                         if (fifo_stalls > 0xfffff) {
                                 DSSERR("fifo stalls overflow, pixels left %d\n",
@@ -2594,6 +2713,7 @@ static int dsi_update_screen_l4(struct omap_dss_device *dssdev,
                                 dsi_if_enable(0);
                                 return -EIO;
                         }
+                        udelay(1);
                 }
 #elif 1
                 /* using fifo emptiness */
@@ -2812,11 +2932,15 @@ static int dsi_set_update_mode(struct omap_dss_device *dssdev,
 
 static int dsi_set_te(struct omap_dss_device *dssdev, bool enable)
 {
-        int r;
-        r = dssdev->driver->enable_te(dssdev, enable);
-        /* XXX for some reason, DSI TE breaks if we don't wait here.
-         * Panel bug? Needs more studying */
-        msleep(100);
+        int r = 0;
+
+        if (dssdev->driver->enable_te) {
+                r = dssdev->driver->enable_te(dssdev, enable);
+                /* XXX for some reason, DSI TE breaks if we don't wait here.
+                 * Panel bug? Needs more studying */
+                msleep(100);
+        }
+
         return r;
 }
 
@@ -3637,6 +3761,11 @@ int dsi_init(struct platform_device *pdev)
         spin_lock_init(&dsi.errors_lock);
         dsi.errors = 0;
 
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock_init(&dsi.irq_stats_lock);
+        dsi.irq_stats.last_reset = jiffies;
+#endif
+
         init_completion(&dsi.bta_completion);
         init_completion(&dsi.update_completion);
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 9b05ee65a15d..0a26b7d84d41 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -467,14 +467,14 @@ static irqreturn_t dss_irq_handler_omap3(int irq, void *arg)
 
 static int _omap_dss_wait_reset(void)
 {
-        unsigned timeout = 1000;
+        int t = 0;
 
         while (REG_GET(DSS_SYSSTATUS, 0, 0) == 0) {
-                udelay(1);
-                if (!--timeout) {
+                if (++t > 1000) {
                         DSSERR("soft reset failed\n");
                         return -ENODEV;
                 }
+                udelay(1);
         }
 
         return 0;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 8da5ac42151b..2bcb1245d6c2 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -240,6 +240,7 @@ int dsi_init(struct platform_device *pdev);
 void dsi_exit(void);
 
 void dsi_dump_clocks(struct seq_file *s);
+void dsi_dump_irqs(struct seq_file *s);
 void dsi_dump_regs(struct seq_file *s);
 
 void dsi_save_context(void);
@@ -268,6 +269,7 @@ int dpi_init_display(struct omap_dss_device *dssdev);
 int dispc_init(void);
 void dispc_exit(void);
 void dispc_dump_clocks(struct seq_file *s);
+void dispc_dump_irqs(struct seq_file *s);
 void dispc_dump_regs(struct seq_file *s);
 void dispc_irq_handler(void);
 void dispc_fake_vsync_irq(void);
@@ -367,4 +369,16 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
 unsigned long rfbi_get_max_tx_rate(void);
 int rfbi_init_display(struct omap_dss_device *display);
 
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
+{
+        int b;
+        for (b = 0; b < 32; ++b) {
+                if (irqstatus & (1 << b))
+                        irq_arr[b]++;
+        }
+}
+#endif
+
 #endif
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index d0b3006ad8a5..b936495c065d 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -120,7 +120,7 @@ static struct {
 
         struct omap_dss_device *dssdev[2];
 
-        struct kfifo      *cmd_fifo;
+        struct kfifo      cmd_fifo;
         spinlock_t        cmd_lock;
         struct completion cmd_done;
         atomic_t          cmd_fifo_full;
@@ -1011,20 +1011,20 @@ static void process_cmd_fifo(void)
                 return;
 
         while (true) {
-                spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
+                spin_lock_irqsave(&rfbi.cmd_lock, flags);
 
-                len = __kfifo_get(rfbi.cmd_fifo, (unsigned char *)&p,
+                len = kfifo_out(&rfbi.cmd_fifo, (unsigned char *)&p,
                                   sizeof(struct update_param));
                 if (len == 0) {
                         DSSDBG("nothing more in fifo\n");
                         atomic_set(&rfbi.cmd_pending, 0);
-                        spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
+                        spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
                         break;
                 }
 
                 /* DSSDBG("fifo full %d\n", rfbi.cmd_fifo_full.counter);*/
 
-                spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
+                spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
 
                 BUG_ON(len != sizeof(struct update_param));
                 BUG_ON(p.rfbi_module > 1);
@@ -1052,25 +1052,25 @@ static void rfbi_push_cmd(struct update_param *p)
                 unsigned long flags;
                 int available;
 
-                spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
+                spin_lock_irqsave(&rfbi.cmd_lock, flags);
                 available = RFBI_CMD_FIFO_LEN_BYTES -
-                        __kfifo_len(rfbi.cmd_fifo);
+                        kfifo_len(&rfbi.cmd_fifo);
 
 /*              DSSDBG("%d bytes left in fifo\n", available); */
                 if (available < sizeof(struct update_param)) {
                         DSSDBG("Going to wait because FIFO FULL..\n");
-                        spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
+                        spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
                         atomic_inc(&rfbi.cmd_fifo_full);
                         wait_for_completion(&rfbi.cmd_done);
                         /*DSSDBG("Woke up because fifo not full anymore\n");*/
                         continue;
                 }
 
-                ret = __kfifo_put(rfbi.cmd_fifo, (unsigned char *)p,
+                ret = kfifo_in(&rfbi.cmd_fifo, (unsigned char *)p,
                                   sizeof(struct update_param));
 /*              DSSDBG("pushed %d bytes\n", ret);*/
 
-                spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
+                spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
 
                 BUG_ON(ret != sizeof(struct update_param));
 
@@ -1155,12 +1155,12 @@ int rfbi_init(void)
 {
         u32 rev;
         u32 l;
+        int r;
 
         spin_lock_init(&rfbi.cmd_lock);
-        rfbi.cmd_fifo = kfifo_alloc(RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL,
-                                    &rfbi.cmd_lock);
-        if (IS_ERR(rfbi.cmd_fifo))
-                return -ENOMEM;
+        r = kfifo_alloc(&rfbi.cmd_fifo, RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL);
+        if (r)
+                return r;
 
         init_completion(&rfbi.cmd_done);
         atomic_set(&rfbi.cmd_fifo_full, 0);
@@ -1196,7 +1196,7 @@ void rfbi_exit(void)
 {
         DSSDBG("rfbi_exit\n");
 
-        kfifo_free(rfbi.cmd_fifo);
+        kfifo_free(&rfbi.cmd_fifo);
 
         iounmap(rfbi.base);
 }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index ef299839858a..d17caef6915a 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1311,6 +1311,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi)
                 if (rg->vrfb.vaddr[0]) {
                         iounmap(rg->vrfb.vaddr[0]);
                         omap_vrfb_release_ctx(&rg->vrfb);
+                        rg->vrfb.vaddr[0] = NULL;
                 }
         }
 
@@ -2114,6 +2115,11 @@ static int omapfb_probe(struct platform_device *pdev)
         dssdev = NULL;
         for_each_dss_dev(dssdev) {
                 omap_dss_get_device(dssdev);
+                if (!dssdev->driver) {
+                        dev_err(&pdev->dev, "no driver for display\n");
+                        r = -EINVAL;
+                        goto cleanup;
+                }
                 fbdev->displays[fbdev->num_displays++] = dssdev;
         }
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 415858b421b3..825b665245bb 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1221,9 +1221,9 @@ static void setup_smart_timing(struct pxafb_info *fbi,
 static int pxafb_smart_thread(void *arg)
 {
         struct pxafb_info *fbi = arg;
-        struct pxafb_mach_info *inf;
+        struct pxafb_mach_info *inf = fbi->dev->platform_data;
 
-        if (!fbi || !fbi->dev->platform_data->smart_update) {
+        if (!inf->smart_update) {
                 pr_err("%s: not properly initialized, thread terminated\n",
                                 __func__);
                 return -EINVAL;
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index adf9632c6b1f..53cb722c45a0 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -211,21 +211,23 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
 
 /**
  * s3c_fb_calc_pixclk() - calculate the divider to create the pixel clock.
- * @id: window id.
  * @sfb: The hardware state.
  * @pixclock: The pixel clock wanted, in picoseconds.
  *
  * Given the specified pixel clock, work out the necessary divider to get
  * close to the output frequency.
  */
-static int s3c_fb_calc_pixclk(unsigned char id, struct s3c_fb *sfb, unsigned int pixclk)
+static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
 {
-        struct s3c_fb_pd_win *win = sfb->pdata->win[id];
         unsigned long clk = clk_get_rate(sfb->bus_clk);
+        unsigned long long tmp;
         unsigned int result;
 
-        pixclk *= win->win_mode.refresh;
-        result = clk / pixclk;
+        tmp = (unsigned long long)clk;
+        tmp *= pixclk;
+
+        do_div(tmp, 1000000000UL);
+        result = (unsigned int)tmp / 1000;
 
         dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
                 pixclk, clk, result, clk / result);
@@ -301,7 +303,7 @@ static int s3c_fb_set_par(struct fb_info *info)
         /* use window 0 as the basis for the lcd output timings */
 
         if (win_no == 0) {
-                clkdiv = s3c_fb_calc_pixclk(win_no, sfb, var->pixclock);
+                clkdiv = s3c_fb_calc_pixclk(sfb, var->pixclock);
 
                 data = sfb->pdata->vidcon0;
                 data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index 9d4f3a49ba4a..d5077dfa9e00 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -137,7 +137,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height,
                         tmp, dst_pitch);
                 return -EINVAL;
         }
-        tmp = (tmp >> 3) | (dst_pitch << (16 - 3));
+        tmp = VIA_PITCH_ENABLE | (tmp >> 3) | (dst_pitch << (16 - 3));
         writel(tmp, engine + 0x38);
 
         if (op == VIA_BITBLT_FILL)
@@ -352,6 +352,9 @@ int viafb_init_engine(struct fb_info *info)
         viapar->shared->vq_vram_addr = viapar->fbmem_free;
         viapar->fbmem_used += VQ_SIZE;
 
+        /* Init 2D engine reg to reset 2D engine */
+        writel(0x0, engine + VIA_REG_KEYCONTROL);
+
         /* Init AGP and VQ regs */
         switch (chip_name) {
         case UNICHROME_K8M890:
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index d8df17a7d5fc..3028e7ddc3b5 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -177,16 +177,15 @@ static int viafb_set_par(struct fb_info *info)
         }
 
         if (vmode_index != VIA_RES_INVALID) {
-                viafb_setmode(vmode_index, info->var.xres, info->var.yres,
-                        info->var.bits_per_pixel, vmode_index1,
-                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
-
                 viafb_update_fix(info);
                 viafb_bpp = info->var.bits_per_pixel;
                 if (info->var.accel_flags & FB_ACCELF_TEXT)
                         info->flags &= ~FBINFO_HWACCEL_DISABLED;
                 else
                         info->flags |= FBINFO_HWACCEL_DISABLED;
+                viafb_setmode(vmode_index, info->var.xres, info->var.yres,
+                        info->var.bits_per_pixel, vmode_index1,
+                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
         }
 
         return 0;
@@ -872,7 +871,9 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         if (info->flags & FBINFO_HWACCEL_DISABLED || info != viafbinfo)
                 return -ENODEV;
 
-        if (chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2)
+        /* LCD ouput does not support hw cursors (at least on VN896) */
+        if ((chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2) ||
+                viafb_LCD_ON)
                 return -ENODEV;
 
         viafb_show_hw_cursor(info, HW_Cursor_OFF);
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 9dd588042880..505be88c82ae 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -266,7 +266,7 @@ static void __devexit virtballoon_remove(struct virtio_device *vdev)
 
 static unsigned int features[] = { VIRTIO_BALLOON_F_MUST_TELL_HOST };
 
-static struct virtio_driver virtio_balloon = {
+static struct virtio_driver virtio_balloon_driver = {
         .feature_table = features,
         .feature_table_size = ARRAY_SIZE(features),
         .driver.name =  KBUILD_MODNAME,
@@ -279,12 +279,12 @@ static struct virtio_driver virtio_balloon = {
 
 static int __init init(void)
 {
-        return register_virtio_driver(&virtio_balloon);
+        return register_virtio_driver(&virtio_balloon_driver);
 }
 
 static void __exit fini(void)
 {
-        unregister_virtio_driver(&virtio_balloon);
+        unregister_virtio_driver(&virtio_balloon_driver);
 }
 module_init(init);
 module_exit(fini);
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 088f32f29a6e..050ee147592f 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -396,8 +396,8 @@ config SBC_FITPC2_WATCHDOG
         tristate "Compulab SBC-FITPC2 watchdog"
         depends on X86
         ---help---
-          This is the driver for the built-in watchdog timer on the fit-PC2
-          Single-board computer made by Compulab.
+          This is the driver for the built-in watchdog timer on the fit-PC2,
+          fit-PC2i, CM-iAM single-board computers made by Compulab.
 
           It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
           When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index c8a3bec26830..4bdb7f1a9077 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -29,8 +29,9 @@
  *      document number 313056-003, 313057-017: 82801H (ICH8)
  *      document number 316972-004, 316973-012: 82801I (ICH9)
  *      document number 319973-002, 319974-002: 82801J (ICH10)
- *      document number 322169-001, 322170-001: 5 Series, 3400 Series (PCH)
+ *      document number 322169-001, 322170-003: 5 Series, 3400 Series (PCH)
  *      document number 320066-003, 320257-008: EP80597 (IICH)
+ *      document number TBD                   : Cougar Point (CPT)
  */
 
 /*
@@ -100,8 +101,22 @@ enum iTCO_chipsets {
         TCO_ICH10DO,    /* ICH10DO */
         TCO_PCH,        /* PCH Desktop Full Featured */
         TCO_PCHM,       /* PCH Mobile Full Featured */
+        TCO_P55,        /* P55 */
+        TCO_PM55,       /* PM55 */
+        TCO_H55,        /* H55 */
+        TCO_QM57,       /* QM57 */
+        TCO_H57,        /* H57 */
+        TCO_HM55,       /* HM55 */
+        TCO_Q57,        /* Q57 */
+        TCO_HM57,       /* HM57 */
         TCO_PCHMSFF,    /* PCH Mobile SFF Full Featured */
+        TCO_QS57,       /* QS57 */
+        TCO_3400,       /* 3400 */
+        TCO_3420,       /* 3420 */
+        TCO_3450,       /* 3450 */
         TCO_EP80579,    /* EP80579 */
+        TCO_CPTD,       /* CPT Desktop */
+        TCO_CPTM,       /* CPT Mobile */
 };
 
 static struct {
@@ -144,8 +159,22 @@ static struct {
         {"ICH10DO", 2},
         {"PCH Desktop Full Featured", 2},
         {"PCH Mobile Full Featured", 2},
+        {"P55", 2},
+        {"PM55", 2},
+        {"H55", 2},
+        {"QM57", 2},
+        {"H57", 2},
+        {"HM55", 2},
+        {"Q57", 2},
+        {"HM57", 2},
         {"PCH Mobile SFF Full Featured", 2},
+        {"QS57", 2},
+        {"3400", 2},
+        {"3420", 2},
+        {"3450", 2},
         {"EP80579", 2},
+        {"CPT Desktop", 2},
+        {"CPT Mobile", 2},
         {NULL, 0}
 };
 
@@ -216,8 +245,22 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { ITCO_PCI_DEVICE(0x3a14,                               TCO_ICH10DO)},
         { ITCO_PCI_DEVICE(0x3b00,                               TCO_PCH)},
         { ITCO_PCI_DEVICE(0x3b01,                               TCO_PCHM)},
+        { ITCO_PCI_DEVICE(0x3b02,                               TCO_P55)},
+        { ITCO_PCI_DEVICE(0x3b03,                               TCO_PM55)},
+        { ITCO_PCI_DEVICE(0x3b06,                               TCO_H55)},
+        { ITCO_PCI_DEVICE(0x3b07,                               TCO_QM57)},
+        { ITCO_PCI_DEVICE(0x3b08,                               TCO_H57)},
+        { ITCO_PCI_DEVICE(0x3b09,                               TCO_HM55)},
+        { ITCO_PCI_DEVICE(0x3b0a,                               TCO_Q57)},
+        { ITCO_PCI_DEVICE(0x3b0b,                               TCO_HM57)},
         { ITCO_PCI_DEVICE(0x3b0d,                               TCO_PCHMSFF)},
+        { ITCO_PCI_DEVICE(0x3b0f,                               TCO_QS57)},
+        { ITCO_PCI_DEVICE(0x3b12,                               TCO_3400)},
+        { ITCO_PCI_DEVICE(0x3b14,                               TCO_3420)},
+        { ITCO_PCI_DEVICE(0x3b16,                               TCO_3450)},
         { ITCO_PCI_DEVICE(0x5031,                               TCO_EP80579)},
+        { ITCO_PCI_DEVICE(0x1c42,                               TCO_CPTD)},
+        { ITCO_PCI_DEVICE(0x1c43,                               TCO_CPTM)},
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c
index 4f4b35a20d84..3c79dc587958 100644
--- a/drivers/watchdog/ixp2000_wdt.c
+++ b/drivers/watchdog/ixp2000_wdt.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
+#include <linux/timer.h>
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 91430a89107c..e6763d2a567b 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -46,9 +46,9 @@ static DEFINE_SPINLOCK(wdt_lock);
 static void wdt_send_data(unsigned char command, unsigned char data)
 {
         outb(command, COMMAND_PORT);
-        mdelay(100);
+        msleep(100);
         outb(data, DATA_PORT);
-        mdelay(200);
+        msleep(200);
 }
 
 static void wdt_enable(void)
@@ -202,11 +202,10 @@ static int __init fitpc2_wdt_init(void)
 {
         int err;
 
-        if (strcmp("SBC-FITPC2", dmi_get_system_info(DMI_BOARD_NAME))) {
-                pr_info("board name is: %s. Should be SBC-FITPC2\n",
-                        dmi_get_system_info(DMI_BOARD_NAME));
+        if (!strstr(dmi_get_system_info(DMI_BOARD_NAME), "SBC-FITPC2"))
                 return -ENODEV;
-        }
+
+        pr_info("%s found\n", dmi_get_system_info(DMI_BOARD_NAME));
 
         if (!request_region(COMMAND_PORT, 1, WATCHDOG_NAME)) {
                 pr_err("I/O address 0x%04x already in use\n", COMMAND_PORT);
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index c4997930afc7..5d42d55e299b 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -102,15 +102,15 @@ static void do_suspend(void)
                 goto out_thaw;
         }
 
+        printk(KERN_DEBUG "suspending xenstore...\n");
+        xs_suspend();
+
         err = dpm_suspend_noirq(PMSG_SUSPEND);
         if (err) {
                 printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
                 goto out_resume;
         }
 
-        printk(KERN_DEBUG "suspending xenstore...\n");
-        xs_suspend();
-
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
 
         dpm_resume_noirq(PMSG_RESUME);
@@ -120,13 +120,13 @@ static void do_suspend(void)
                 cancelled = 1;
         }
 
+out_resume:
         if (!cancelled) {
                 xen_arch_resume();
                 xs_resume();
         } else
                 xs_suspend_cancel();
 
-out_resume:
         dpm_resume_end(PMSG_RESUME);
 
         /* Make sure timer events get retriggered on all CPUs */