5 files changed, 5 insertions, 15 deletions

diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 00885417ffff..fb3ae07a1469 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -690,8 +690,7 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
 
         /* set the lane count on the sink */
         tmp = dp_info->dp_lane_count;
-        if (dp_info->dpcd[DP_DPCD_REV] >= 0x11 &&
-            dp_info->dpcd[DP_MAX_LANE_COUNT] & DP_ENHANCED_FRAME_CAP)
+        if (drm_dp_enhanced_frame_cap(dp_info->dpcd))
                 tmp |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
         radeon_write_dpcd_reg(dp_info->radeon_connector, DP_LANE_COUNT_SET, tmp);
 
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 061b227dae0c..c155d6f3fa68 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -499,7 +499,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
         crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);
         fp2_gen_cntl = 0;
 
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
         }
 
@@ -536,7 +536,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
                 (RADEON_CRTC_SYNC_TRISTAT |
                  RADEON_CRTC_DISPLAY_DIS)));
 
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON));
         }
 
@@ -554,7 +554,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
                 WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);
         }
         WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl);
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
         }
         return r;
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 9c14a1ba1de4..b01f231c2f19 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -100,7 +100,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
 int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
 void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
 irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);
-int radeon_gem_object_init(struct drm_gem_object *obj);
 void radeon_gem_object_free(struct drm_gem_object *obj);
 int radeon_gem_object_open(struct drm_gem_object *obj,
                                 struct drm_file *file_priv);
@@ -408,7 +407,6 @@ static struct drm_driver kms_driver = {
         .irq_uninstall = radeon_driver_irq_uninstall_kms,
         .irq_handler = radeon_driver_irq_handler_kms,
         .ioctls = radeon_ioctls_kms,
-        .gem_init_object = radeon_gem_object_init,
         .gem_free_object = radeon_gem_object_free,
         .gem_open_object = radeon_gem_object_open,
         .gem_close_object = radeon_gem_object_close,
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index dce99c8a5835..805c5e566b9a 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -29,13 +29,6 @@
 #include <drm/radeon_drm.h>
 #include "radeon.h"
 
-int radeon_gem_object_init(struct drm_gem_object *obj)
-{
-        BUG();
-
-        return 0;
-}
-
 void radeon_gem_object_free(struct drm_gem_object *gobj)
 {
         struct radeon_bo *robj = gem_to_radeon_bo(gobj);
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 61580ddc4eb2..d6b36766e8c9 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -191,7 +191,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
 
         switch (info->request) {
         case RADEON_INFO_DEVICE_ID:
-                *value = dev->pci_device;
+                *value = dev->pdev->device;
                 break;
         case RADEON_INFO_NUM_GB_PIPES:
                 *value = rdev->num_gb_pipes;