Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Michel Dänzer 15 years ago
parent
1b24203e51
commit
11f3b59e36
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      drivers/gpu/drm/radeon/radeon_combios.c

+ 3 - 0
drivers/gpu/drm/radeon/radeon_combios.c
View File 

@@ -687,6 +687,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev)
 
 	uint16_t tv_info;
 
 	uint16_t tv_info;
 
 	enum radeon_tv_std tv_std = TV_STD_NTSC;
 
 	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);
 
 	tv_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE);
 
 	if (tv_info) {
 
 	if (tv_info) {
 
 		if (RBIOS8(tv_info + 6) == 'T') {
 
 		if (RBIOS8(tv_info + 6) == 'T') {