diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-01-11 02:58:38 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-12 22:25:10 -0500 |
| commit | 11f3b59e3654c66c4e8ef2c48f8138b78bf440da (patch) | |
| tree | 0d279bd7a56537e199cbdc9e9c6d9cd783b8c869 | |
| parent | 1b24203e51072b6e76aff8c74bdd67eb3b34a724 (diff) | |
drm/radeon/kms: Fix crash getting TV info with no BIOS.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 7914455c96ca..579c8920e081 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
| @@ -687,6 +687,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev) | |||
| 687 | uint16_t tv_info; | 687 | uint16_t tv_info; |
| 688 | enum radeon_tv_std tv_std = TV_STD_NTSC; | 688 | enum radeon_tv_std tv_std = TV_STD_NTSC; |
| 689 | 689 | ||
| 690 | if (rdev->bios == NULL) | ||
| 691 | return tv_std; | ||
| 692 | |||
| 690 | tv_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE); | 693 | tv_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE); |
| 691 | if (tv_info) { | 694 | if (tv_info) { |
| 692 | if (RBIOS8(tv_info + 6) == 'T') { | 695 | if (RBIOS8(tv_info + 6) == 'T') { |