Merge tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main drm pull request for v4.11.

  Nothing too major, the tinydrm and mmu-less support should make
  writing smaller drivers easier for some of the simpler platforms, and
  there are a bunch of documentation updates.

  Intel grew displayport MST audio support which is hopefully useful to
  people, and FBC is on by default for GEN9+ (so people know where to
  look for regressions). AMDGPU has a lot of fixes that would like new
  firmware files installed for some GPUs.

  Other than that it's pretty scattered all over.

  I may have a follow up pull request as I know BenH has a bunch of AST
  rework and fixes and I'd like to get those in once they've been tested
  by AST, and I've got at least one pull request I'm just trying to get
  the author to fix up.

  Core:
   - drm_mm reworked
   - Connector list locking and iterators
   - Documentation updates
   - Format handling rework
   - MMU-less support for fbdev helpers
   - drm_crtc_from_index helper
   - Core CRC API
   - Remove drm_framebuffer_unregister_private
   - Debugfs cleanup
   - EDID/Infoframe fixes
   - Release callback
   - Tinydrm support (smaller drivers for simple hw)

  panel:
   - Add support for some new simple panels

  i915:
   - FBC by default for gen9+
   - Shared dpll cleanups and docs
   - GEN8 powerdomain cleanup
   - DMC support on GLK
   - DP MST audio support
   - HuC loading support
   - GVT init ordering fixes
   - GVT IOMMU workaround fix

  amdgpu/radeon:
   - Power/clockgating improvements
   - Preliminary SR-IOV support
   - TTM buffer priority and eviction fixes
   - SI DPM quirks removed due to firmware fixes
   - Powerplay improvements
   - VCE/UVD powergating fixes
   - Cleanup SI GFX code to match CI/VI
   - Support for > 2 displays on 3/5 crtc asics
   - SI headless fixes

  nouveau:
   - Rework securre boot code in prep for GP10x secure boot
   - Channel recovery improvements
   - Initial power budget code
   - MMU rework preperation

  vmwgfx:
   - Bunch of fixes and cleanups

  exynos:
   - Runtime PM support for MIC driver
   - Cleanups to use atomic helpers
   - UHD Support for TM2/TM2E boards
   - Trigger mode fix for Rinato board

  etnaviv:
   - Shader performance fix
   - Command stream validator fixes
   - Command buffer suballocator

  rockchip:
   - CDN DisplayPort support
   - IOMMU support for arm64 platform

  imx-drm:
   - Fix i.MX5 TV encoder probing
   - Remove lower fb size limits

  msm:
   - Support for HW cursor on MDP5 devices
   - DSI encoder cleanup
   - GPU DT bindings cleanup

  sti:
   - stih410 cleanups
   - Create fbdev at binding
   - HQVDP fixes
   - Remove stih416 chip functionality
   - DVI/HDMI mode selection fixes
   - FPS statistic reporting

  omapdrm:
   - IRQ code cleanup

  dwi-hdmi bridge:
   - Cleanups and fixes

  adv-bridge:
   - Updates for nexus

  sii8520 bridge:
   - Add interlace mode support
   - Rework HDMI and lots of fixes

  qxl:
   - probing/teardown cleanups

  ZTE drm:
   - HDMI audio via SPDIF interface
   - Video Layer overlay plane support
   - Add TV encoder output device

  atmel-hlcdc:
   - Rework fbdev creation logic

  tegra:
   - OF node fix

  fsl-dcu:
   - Minor fixes

  mali-dp:
   - Assorted fixes

  sunxi:
   - Minor fix"

[ This was the "fixed" pull, that still had build warnings due to people
  not even having build tested the result. I'm not a happy camper

  I've fixed the things I noticed up in this merge.      - Linus ]

* tag 'drm-for-v4.11-less-shouty' of git://people.freedesktop.org/~airlied/linux: (1177 commits)
  lib/Kconfig: make PRIME_NUMBERS not user selectable
  drm/tinydrm: helpers: Properly fix backlight dependency
  drm/tinydrm: mipi-dbi: Fix field width specifier warning
  drm/tinydrm: mipi-dbi: Silence: ‘cmd’ may be used uninitialized
  drm/sti: fix build warnings in sti_drv.c and sti_vtg.c files
  drm/amd/powerplay: fix PSI feature on Polars12
  drm/amdgpu: refuse to reserve io mem for split VRAM buffers
  drm/ttm: fix use-after-free races in vm fault handling
  drm/tinydrm: Add support for Multi-Inno MI0283QT display
  dt-bindings: Add Multi-Inno MI0283QT binding
  dt-bindings: display/panel: Add common rotation property
  of: Add vendor prefix for Multi-Inno
  drm/tinydrm: Add MIPI DBI support
  drm/tinydrm: Add helper functions
  drm: Add DRM support for tiny LCD displays
  drm/amd/amdgpu: post card if there is real hw resetting performed
  drm/nouveau/tmr: provide backtrace when a timeout is hit
  drm/nouveau/pci/g92: Fix rearm
  drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios
  drm/nouveau/hwmon: expose power_max and power_crit
  ..

18 files changed, 87 insertions, 139 deletions

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 05f4ebe31ce2..3c492a0aa6bd 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1195,7 +1195,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
         radeon_bo_unreserve(rbo);
 
-        switch (target_fb->pixel_format) {
+        switch (target_fb->format->format) {
         case DRM_FORMAT_C8:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_INDEXED));
@@ -1261,7 +1261,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
                 break;
         default:
                 DRM_ERROR("Unsupported screen format %s\n",
-                          drm_get_format_name(target_fb->pixel_format, &format_name));
+                          drm_get_format_name(target_fb->format->format, &format_name));
                 return -EINVAL;
         }
 
@@ -1277,7 +1277,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
 
                                 /* Calculate the macrotile mode index. */
                                 tile_split_bytes = 64 << tile_split;
-                                tileb = 8 * 8 * target_fb->bits_per_pixel / 8;
+                                tileb = 8 * 8 * target_fb->format->cpp[0];
                                 tileb = min(tile_split_bytes, tileb);
 
                                 for (index = 0; tileb > 64; index++)
@@ -1285,13 +1285,14 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
 
                                 if (index >= 16) {
                                         DRM_ERROR("Wrong screen bpp (%u) or tile split (%u)\n",
-                                                  target_fb->bits_per_pixel, tile_split);
+                                                  target_fb->format->cpp[0] * 8,
+                                                  tile_split);
                                         return -EINVAL;
                                 }
 
                                 num_banks = (rdev->config.cik.macrotile_mode_array[index] >> 6) & 0x3;
                         } else {
-                                switch (target_fb->bits_per_pixel) {
+                                switch (target_fb->format->cpp[0] * 8) {
                                 case 8:
                                         index = 10;
                                         break;
@@ -1414,7 +1415,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(EVERGREEN_GRPH_X_END + radeon_crtc->crtc_offset, target_fb->width);
         WREG32(EVERGREEN_GRPH_Y_END + radeon_crtc->crtc_offset, target_fb->height);
 
-        fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
+        fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
         WREG32(EVERGREEN_GRPH_PITCH + radeon_crtc->crtc_offset, fb_pitch_pixels);
         WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
@@ -1510,7 +1511,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
         radeon_bo_unreserve(rbo);
 
-        switch (target_fb->pixel_format) {
+        switch (target_fb->format->format) {
         case DRM_FORMAT_C8:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_8BPP |
@@ -1563,7 +1564,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
                 break;
         default:
                 DRM_ERROR("Unsupported screen format %s\n",
-                          drm_get_format_name(target_fb->pixel_format, &format_name));
+                          drm_get_format_name(target_fb->format->format, &format_name));
                 return -EINVAL;
         }
 
@@ -1621,7 +1622,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, target_fb->width);
         WREG32(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, target_fb->height);
 
-        fb_pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
+        fb_pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
         WREG32(AVIVO_D1GRPH_PITCH + radeon_crtc->crtc_offset, fb_pitch_pixels);
         WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f5e84f4b58e6..e3399310d41d 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3225,13 +3225,19 @@ void r100_bandwidth_update(struct radeon_device *rdev)
         radeon_update_display_priority(rdev);
 
         if (rdev->mode_info.crtcs[0]->base.enabled) {
+                const struct drm_framebuffer *fb =
+                        rdev->mode_info.crtcs[0]->base.primary->fb;
+
                 mode1 = &rdev->mode_info.crtcs[0]->base.mode;
-                pixel_bytes1 = rdev->mode_info.crtcs[0]->base.primary->fb->bits_per_pixel / 8;
+                pixel_bytes1 = fb->format->cpp[0];
         }
         if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
                 if (rdev->mode_info.crtcs[1]->base.enabled) {
+                        const struct drm_framebuffer *fb =
+                                rdev->mode_info.crtcs[1]->base.primary->fb;
+
                         mode2 = &rdev->mode_info.crtcs[1]->base.mode;
-                        pixel_bytes2 = rdev->mode_info.crtcs[1]->base.primary->fb->bits_per_pixel / 8;
+                        pixel_bytes2 = fb->format->cpp[0];
                 }
         }
 
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index c829cfb02fc4..04c0ed41374f 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -596,52 +596,56 @@ static bool radeon_read_disabled_bios(struct radeon_device *rdev)
 #ifdef CONFIG_ACPI
 static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
 {
-        bool ret = false;
         struct acpi_table_header *hdr;
         acpi_size tbl_size;
         UEFI_ACPI_VFCT *vfct;
-        GOP_VBIOS_CONTENT *vbios;
-        VFCT_IMAGE_HEADER *vhdr;
+        unsigned offset;
 
         if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
                 return false;
         tbl_size = hdr->length;
         if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
                 DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
-                goto out_unmap;
+                return false;
         }
 
         vfct = (UEFI_ACPI_VFCT *)hdr;
-        if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) > tbl_size) {
-                DRM_ERROR("ACPI VFCT table present but broken (too short #2)\n");
-                goto out_unmap;
-        }
+        offset = vfct->VBIOSImageOffset;
 
-        vbios = (GOP_VBIOS_CONTENT *)((char *)hdr + vfct->VBIOSImageOffset);
-        vhdr = &vbios->VbiosHeader;
-        DRM_INFO("ACPI VFCT contains a BIOS for %02x:%02x.%d %04x:%04x, size %d\n",
-                        vhdr->PCIBus, vhdr->PCIDevice, vhdr->PCIFunction,
-                        vhdr->VendorID, vhdr->DeviceID, vhdr->ImageLength);
-
-        if (vhdr->PCIBus != rdev->pdev->bus->number ||
-            vhdr->PCIDevice != PCI_SLOT(rdev->pdev->devfn) ||
-            vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn) ||
-            vhdr->VendorID != rdev->pdev->vendor ||
-            vhdr->DeviceID != rdev->pdev->device) {
-                DRM_INFO("ACPI VFCT table is not for this card\n");
-                goto out_unmap;
-        }
+        while (offset < tbl_size) {
+                GOP_VBIOS_CONTENT *vbios = (GOP_VBIOS_CONTENT *)((char *)hdr + offset);
+                VFCT_IMAGE_HEADER *vhdr = &vbios->VbiosHeader;
 
-        if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) {
-                DRM_ERROR("ACPI VFCT image truncated\n");
-                goto out_unmap;
-        }
+                offset += sizeof(VFCT_IMAGE_HEADER);
+                if (offset > tbl_size) {
+                        DRM_ERROR("ACPI VFCT image header truncated\n");
+                        return false;
+                }
 
-        rdev->bios = kmemdup(&vbios->VbiosContent, vhdr->ImageLength, GFP_KERNEL);
-        ret = !!rdev->bios;
+                offset += vhdr->ImageLength;
+                if (offset > tbl_size) {
+                        DRM_ERROR("ACPI VFCT image truncated\n");
+                        return false;
+                }
+
+                if (vhdr->ImageLength &&
+                    vhdr->PCIBus == rdev->pdev->bus->number &&
+                    vhdr->PCIDevice == PCI_SLOT(rdev->pdev->devfn) &&
+                    vhdr->PCIFunction == PCI_FUNC(rdev->pdev->devfn) &&
+                    vhdr->VendorID == rdev->pdev->vendor &&
+                    vhdr->DeviceID == rdev->pdev->device) {
+                        rdev->bios = kmemdup(&vbios->VbiosContent,
+                                             vhdr->ImageLength,
+                                             GFP_KERNEL);
+
+                        if (!rdev->bios)
+                                return false;
+                        return true;
+                }
+        }
 
-out_unmap:
-        return ret;
+        DRM_ERROR("ACPI VFCT table present but broken (too short #2)\n");
+        return false;
 }
 #else
 static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 510ea371dacc..a8442f7196d6 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -121,7 +121,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                    VRAM, also but everything into VRAM on AGP cards and older
                    IGP chips to avoid image corruptions */
                 if (p->ring == R600_RING_TYPE_UVD_INDEX &&
-                    (i == 0 || drm_pci_device_is_agp(p->rdev->ddev) ||
+                    (i == 0 || pci_find_capability(p->rdev->ddev->pdev,
+                                                   PCI_CAP_ID_AGP) ||
                      p->rdev->family == CHIP_RS780 ||
                      p->rdev->family == CHIP_RS880)) {
 
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 8a1df2a1afbd..4b0c388be3f5 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1549,8 +1549,6 @@ failed:
         return r;
 }
 
-static void radeon_debugfs_remove_files(struct radeon_device *rdev);
-
 /**
  * radeon_device_fini - tear down the driver
  *
@@ -1577,7 +1575,6 @@ void radeon_device_fini(struct radeon_device *rdev)
         rdev->rmmio = NULL;
         if (rdev->family >= CHIP_BONAIRE)
                 radeon_doorbell_fini(rdev);
-        radeon_debugfs_remove_files(rdev);
 }
 
 
@@ -1954,16 +1951,3 @@ int radeon_debugfs_add_files(struct radeon_device *rdev,
 #endif
         return 0;
 }
-
-static void radeon_debugfs_remove_files(struct radeon_device *rdev)
-{
-#if defined(CONFIG_DEBUG_FS)
-        unsigned i;
-
-        for (i = 0; i < rdev->debugfs_count; i++) {
-                drm_debugfs_remove_files(rdev->debugfs[i].files,
-                                         rdev->debugfs[i].num_files,
-                                         rdev->ddev->primary);
-        }
-#endif
-}
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index e7409e8a9f87..aea8b62835a4 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -549,19 +549,19 @@ static int radeon_crtc_page_flip_target(struct drm_crtc *crtc,
         if (!ASIC_IS_AVIVO(rdev)) {
                 /* crtc offset is from display base addr not FB location */
                 base -= radeon_crtc->legacy_display_base_addr;
-                pitch_pixels = fb->pitches[0] / (fb->bits_per_pixel / 8);
+                pitch_pixels = fb->pitches[0] / fb->format->cpp[0];
 
                 if (tiling_flags & RADEON_TILING_MACRO) {
                         if (ASIC_IS_R300(rdev)) {
                                 base &= ~0x7ff;
                         } else {
-                                int byteshift = fb->bits_per_pixel >> 4;
+                                int byteshift = fb->format->cpp[0] * 8 >> 4;
                                 int tile_addr = (((crtc->y >> 3) * pitch_pixels +  crtc->x) >> (8 - byteshift)) << 11;
                                 base += tile_addr + ((crtc->x << byteshift) % 256) + ((crtc->y % 8) << 8);
                         }
                 } else {
                         int offset = crtc->y * pitch_pixels + crtc->x;
-                        switch (fb->bits_per_pixel) {
+                        switch (fb->format->cpp[0] * 8) {
                         case 8:
                         default:
                                 offset *= 1;
@@ -1327,7 +1327,7 @@ radeon_framebuffer_init(struct drm_device *dev,
 {
         int ret;
         rfb->obj = obj;
-        drm_helper_mode_fill_fb_struct(&rfb->base, mode_cmd);
+        drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);
         ret = drm_framebuffer_init(dev, &rfb->base, &radeon_fb_funcs);
         if (ret) {
                 rfb->obj = NULL;
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 6d1237d6e1b8..7d5ada3980dc 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -667,7 +667,7 @@ radeon_dp_mst_init(struct radeon_connector *radeon_connector)
                 return 0;
 
         radeon_connector->mst_mgr.cbs = &mst_cbs;
-        return drm_dp_mst_topology_mgr_init(&radeon_connector->mst_mgr, dev->dev,
+        return drm_dp_mst_topology_mgr_init(&radeon_connector->mst_mgr, dev,
                                             &radeon_connector->ddc_bus->aux, 16, 6,
                                             radeon_connector->base.base.id);
 }
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 30bd4a6a9d46..956c425e639e 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -103,7 +103,7 @@
 #define KMS_DRIVER_MINOR        49
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
-int radeon_driver_unload_kms(struct drm_device *dev);
+void radeon_driver_unload_kms(struct drm_device *dev);
 void radeon_driver_lastclose_kms(struct drm_device *dev);
 int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
 void radeon_driver_postclose_kms(struct drm_device *dev,
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 899b6a1644bd..2be4fe9c7217 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -263,7 +263,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
 
         strcpy(info->fix.id, "radeondrmfb");
 
-        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
+        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
 
         info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &radeonfb_ops;
@@ -290,7 +290,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
         DRM_INFO("fb mappable at 0x%lX\n",  info->fix.smem_start);
         DRM_INFO("vram apper at 0x%lX\n",  (unsigned long)rdev->mc.aper_base);
         DRM_INFO("size %lu\n", (unsigned long)radeon_bo_size(rbo));
-        DRM_INFO("fb depth is %d\n", fb->depth);
+        DRM_INFO("fb depth is %d\n", fb->format->depth);
         DRM_INFO("   pitch is %d\n", fb->pitches[0]);
 
         vga_switcheroo_client_fb_set(rdev->ddev->pdev, info);
@@ -366,7 +366,6 @@ int radeon_fbdev_init(struct radeon_device *rdev)
                               &radeon_fb_helper_funcs);
 
         ret = drm_fb_helper_init(rdev->ddev, &rfbdev->helper,
-                                 rdev->num_crtc,
                                  RADEONFB_CONN_LIMIT);
         if (ret)
                 goto free;
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index c084cadcbf21..1b7528df7f7f 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -85,10 +85,8 @@ static void radeon_hotplug_work_func(struct work_struct *work)
                 return;
 
         mutex_lock(&mode_config->mutex);
-        if (mode_config->num_connector) {
-                list_for_each_entry(connector, &mode_config->connector_list, head)
-                        radeon_connector_hotplug(connector);
-        }
+        list_for_each_entry(connector, &mode_config->connector_list, head)
+                radeon_connector_hotplug(connector);
         mutex_unlock(&mode_config->mutex);
         /* Just fire off a uevent and let userspace tell us what to do */
         drm_helper_hpd_irq_event(dev);
@@ -103,10 +101,8 @@ static void radeon_dp_work_func(struct work_struct *work)
         struct drm_connector *connector;
 
         /* this should take a mutex */
-        if (mode_config->num_connector) {
-                list_for_each_entry(connector, &mode_config->connector_list, head)
-                        radeon_connector_hotplug(connector);
-        }
+        list_for_each_entry(connector, &mode_config->connector_list, head)
+                radeon_connector_hotplug(connector);
 }
 /**
  * radeon_driver_irq_preinstall_kms - drm irq preinstall callback
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 4388ddeec8d2..56f35c06742c 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -53,12 +53,12 @@ static inline bool radeon_has_atpx(void) { return false; }
  * the rest of the device (CP, writeback, etc.).
  * Returns 0 on success.
  */
-int radeon_driver_unload_kms(struct drm_device *dev)
+void radeon_driver_unload_kms(struct drm_device *dev)
 {
         struct radeon_device *rdev = dev->dev_private;
 
         if (rdev == NULL)
-                return 0;
+                return;
 
         if (rdev->rmmio == NULL)
                 goto done_free;
@@ -78,7 +78,6 @@ int radeon_driver_unload_kms(struct drm_device *dev)
 done_free:
         kfree(rdev);
         dev->dev_private = NULL;
-        return 0;
 }
 
 /**
@@ -106,7 +105,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
         dev->dev_private = (void *)rdev;
 
         /* update BUS flag */
-        if (drm_pci_device_is_agp(dev)) {
+        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {
                 flags |= RADEON_IS_AGP;
         } else if (pci_is_pcie(dev->pdev)) {
                 flags |= RADEON_IS_PCIE;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index d0de4022fff9..ce6cb6666212 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -402,7 +402,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc,
                 target_fb = crtc->primary->fb;
         }
 
-        switch (target_fb->bits_per_pixel) {
+        switch (target_fb->format->cpp[0] * 8) {
         case 8:
                 format = 2;
                 break;
@@ -476,10 +476,9 @@ retry:
 
         crtc_offset_cntl = 0;
 
-        pitch_pixels = target_fb->pitches[0] / (target_fb->bits_per_pixel / 8);
-        crtc_pitch  = (((pitch_pixels * target_fb->bits_per_pixel) +
-                        ((target_fb->bits_per_pixel * 8) - 1)) /
-                       (target_fb->bits_per_pixel * 8));
+        pitch_pixels = target_fb->pitches[0] / target_fb->format->cpp[0];
+        crtc_pitch = DIV_ROUND_UP(pitch_pixels * target_fb->format->cpp[0] * 8,
+                                  target_fb->format->cpp[0] * 8 * 8);
         crtc_pitch |= crtc_pitch << 16;
 
         crtc_offset_cntl |= RADEON_CRTC_GUI_TRIG_OFFSET_LEFT_EN;
@@ -504,14 +503,14 @@ retry:
                         crtc_tile_x0_y0 = x | (y << 16);
                         base &= ~0x7ff;
                 } else {
-                        int byteshift = target_fb->bits_per_pixel >> 4;
+                        int byteshift = target_fb->format->cpp[0] * 8 >> 4;
                         int tile_addr = (((y >> 3) * pitch_pixels +  x) >> (8 - byteshift)) << 11;
                         base += tile_addr + ((x << byteshift) % 256) + ((y % 8) << 8);
                         crtc_offset_cntl |= (y % 16);
                 }
         } else {
                 int offset = y * pitch_pixels + x;
-                switch (target_fb->bits_per_pixel) {
+                switch (target_fb->format->cpp[0] * 8) {
                 case 8:
                         offset *= 1;
                         break;
@@ -579,6 +578,7 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
         struct drm_device *dev = crtc->dev;
         struct radeon_device *rdev = dev->dev_private;
         struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        const struct drm_framebuffer *fb = crtc->primary->fb;
         struct drm_encoder *encoder;
         int format;
         int hsync_start;
@@ -602,7 +602,7 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
                 }
         }
 
-        switch (crtc->primary->fb->bits_per_pixel) {
+        switch (fb->format->cpp[0] * 8) {
         case 8:
                 format = 2;
                 break;
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index f1da484864a9..ad282648fc8b 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -32,6 +32,7 @@
 
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_encoder.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/drm_dp_mst_helper.h>
 #include <drm/drm_fixed.h>
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 41b72ce6613f..74b276060c20 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -765,6 +765,7 @@ int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
 }
 
 void radeon_bo_move_notify(struct ttm_buffer_object *bo,
+                           bool evict,
                            struct ttm_mem_reg *new_mem)
 {
         struct radeon_bo *rbo;
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index a10bb3deee54..9ffd8215d38a 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -150,6 +150,7 @@ extern void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
 extern int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
                                 bool force_drop);
 extern void radeon_bo_move_notify(struct ttm_buffer_object *bo,
+                                  bool evict,
                                   struct ttm_mem_reg *new_mem);
 extern int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo);
 extern int radeon_bo_get_surface_reg(struct radeon_bo *bo);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 0cf03ccbf0a7..7a10b3852970 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -502,6 +502,8 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
                         mem->bus.addr =
                                 ioremap_nocache(mem->bus.base + mem->bus.offset,
                                                 mem->bus.size);
+                if (!mem->bus.addr)
+                        return -ENOMEM;
 
                 /*
                  * Alpha: Use just the bus offset plus
@@ -871,8 +873,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
         .fault_reserve_notify = &radeon_bo_fault_reserve_notify,
         .io_mem_reserve = &radeon_ttm_io_mem_reserve,
         .io_mem_free = &radeon_ttm_io_mem_free,
-        .lru_tail = &ttm_bo_default_lru_tail,
-        .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
 };
 
 int radeon_ttm_init(struct radeon_device *rdev)
@@ -1033,13 +1033,13 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
         struct radeon_device *rdev = dev->dev_private;
         struct drm_mm *mm = (struct drm_mm *)rdev->mman.bdev.man[ttm_pl].priv;
-        int ret;
         struct ttm_bo_global *glob = rdev->mman.bdev.glob;
+        struct drm_printer p = drm_seq_file_printer(m);
 
         spin_lock(&glob->lru_lock);
-        ret = drm_mm_dump_table(m, mm);
+        drm_mm_print(mm, &p);
         spin_unlock(&glob->lru_lock);
-        return ret;
+        return 0;
 }
 
 static int ttm_pl_vram = TTM_PL_VRAM;
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index 2944916f7102..d12b8978142f 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -2912,29 +2912,6 @@ static int si_init_smc_spll_table(struct radeon_device *rdev)
         return ret;
 }
 
-struct si_dpm_quirk {
-        u32 chip_vendor;
-        u32 chip_device;
-        u32 subsys_vendor;
-        u32 subsys_device;
-        u32 max_sclk;
-        u32 max_mclk;
-};
-
-/* cards with dpm stability problems */
-static struct si_dpm_quirk si_dpm_quirk_list[] = {
-        /* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */
-        { PCI_VENDOR_ID_ATI, 0x6810, 0x1462, 0x3036, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0xe271, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0x2015, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6810, 0x174b, 0xe271, 85000, 90000 },
-        { PCI_VENDOR_ID_ATI, 0x6811, 0x1462, 0x2015, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6811, 0x1043, 0x2015, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6811, 0x148c, 0x2015, 0, 120000 },
-        { PCI_VENDOR_ID_ATI, 0x6810, 0x1682, 0x9275, 0, 120000 },
-        { 0, 0, 0, 0 },
-};
-
 static u16 si_get_lower_of_leakage_and_vce_voltage(struct radeon_device *rdev,
                                                    u16 vce_voltage)
 {
@@ -2997,18 +2974,8 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
         u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;
         u32 max_sclk = 0, max_mclk = 0;
         int i;
-        struct si_dpm_quirk *p = si_dpm_quirk_list;
 
-        /* limit all SI kickers */
-        if (rdev->family == CHIP_PITCAIRN) {
-                if ((rdev->pdev->revision == 0x81) ||
-                    (rdev->pdev->device == 0x6810) ||
-                    (rdev->pdev->device == 0x6811) ||
-                    (rdev->pdev->device == 0x6816) ||
-                    (rdev->pdev->device == 0x6817) ||
-                    (rdev->pdev->device == 0x6806))
-                        max_mclk = 120000;
-        } else if (rdev->family == CHIP_HAINAN) {
+        if (rdev->family == CHIP_HAINAN) {
                 if ((rdev->pdev->revision == 0x81) ||
                     (rdev->pdev->revision == 0x83) ||
                     (rdev->pdev->revision == 0xC3) ||
@@ -3018,18 +2985,6 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
                         max_sclk = 75000;
                 }
         }
-        /* Apply dpm quirks */
-        while (p && p->chip_device != 0) {
-                if (rdev->pdev->vendor == p->chip_vendor &&
-                    rdev->pdev->device == p->chip_device &&
-                    rdev->pdev->subsystem_vendor == p->subsys_vendor &&
-                    rdev->pdev->subsystem_device == p->subsys_device) {
-                        max_sclk = p->max_sclk;
-                        max_mclk = p->max_mclk;
-                        break;
-                }
-                ++p;
-        }
 
         if (rps->vce_active) {
                 rps->evclk = rdev->pm.dpm.vce_states[rdev->pm.dpm.vce_level].evclk;
diff --git a/drivers/gpu/drm/radeon/vce_v1_0.c b/drivers/gpu/drm/radeon/vce_v1_0.c
index a01efe39a820..f541a4b5ac51 100644
--- a/drivers/gpu/drm/radeon/vce_v1_0.c
+++ b/drivers/gpu/drm/radeon/vce_v1_0.c
@@ -196,7 +196,7 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data)
         memset(&data[5], 0, 44);
         memcpy(&data[16], &sign[1], rdev->vce_fw->size - sizeof(*sign));
 
-        data += le32_to_cpu(data[4]) / 4;
+        data += (le32_to_cpu(sign->len) + 64) / 4;
         data[0] = sign->val[i].sigval[0];
         data[1] = sign->val[i].sigval[1];
         data[2] = sign->val[i].sigval[2];