diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-10-04 07:53:40 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 01:55:33 -0400 |
commit | ffbab09bf939975b62ec233c426bf7df0dd4cea8 (patch) | |
tree | f1ae5917f5061a3cfd2586d515fb36cd793f920a /drivers/gpu/drm/radeon/radeon_bios.c | |
parent | fc6ff1935b550bdf525e0caa5ef0894010375414 (diff) |
drm: Remove pci_vendor and pci_device from struct drm_device
We can get the PCI vendor and device IDs via dev->pdev. So we can drop
the duplicated information.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_bios.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_bios.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
499 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); | 499 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); |
500 | fp2_gen_cntl = 0; | 500 | fp2_gen_cntl = 0; |
501 | 501 | ||
502 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { | 502 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
503 | fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); | 503 | fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); |
504 | } | 504 | } |
505 | 505 | ||
@@ -536,7 +536,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev) | |||
536 | (RADEON_CRTC_SYNC_TRISTAT | | 536 | (RADEON_CRTC_SYNC_TRISTAT | |
537 | RADEON_CRTC_DISPLAY_DIS))); | 537 | RADEON_CRTC_DISPLAY_DIS))); |
538 | 538 | ||
539 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { | 539 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
540 | WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON)); | 540 | WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON)); |
541 | } | 541 | } |
542 | 542 | ||
@@ -554,7 +554,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev) | |||
554 | WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); | 554 | WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); |
555 | } | 555 | } |
556 | WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); | 556 | WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); |
557 | if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) { | 557 | if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) { |
558 | WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); | 558 | WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); |
559 | } | 559 | } |
560 | return r; | 560 | return r; |