From 88f372a6db82a2130727fa66dd177cf37f495512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 11 Jan 2010 08:58:38 +0100 Subject: [PATCH] --- yaml --- r: 179227 b: refs/heads/master c: 11f3b59e3654c66c4e8ef2c48f8138b78bf440da h: refs/heads/master i: 179225: c55ad6739155584aa44225c6b82c8800a66d57ec 179223: 103c46f4ef853d9e12aa785264d807d5e92bf74b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 26cfb05caced..c80ff24a42c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b24203e51072b6e76aff8c74bdd67eb3b34a724 +refs/heads/master: 11f3b59e3654c66c4e8ef2c48f8138b78bf440da diff --git a/trunk/drivers/gpu/drm/radeon/radeon_combios.c b/trunk/drivers/gpu/drm/radeon/radeon_combios.c index 7914455c96ca..579c8920e081 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_combios.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_combios.c @@ -687,6 +687,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev) uint16_t tv_info; 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); if (tv_info) { if (RBIOS8(tv_info + 6) == 'T') {