diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-06 23:00:29 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-06 23:00:29 -0500 |
| commit | a81406b4143ff07e586bbe03c50f089da94eefe1 (patch) | |
| tree | 57c5cf45059792b59212f23ec8874f3541f96056 /drivers/gpu/drm/radeon/radeon_atombios.c | |
| parent | 90520b78a4f8ba1faef75961eddd8192077e0ac2 (diff) | |
| parent | 43b19f161c7a9941e3aa7db0e3ee19b93980e3d7 (diff) | |
Merge remote branch 'korg/drm-radeon-next' into drm-linus
* korg/drm-radeon-next:
drm/radeon/kms: rs600: use correct mask for SW interrupt
gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
drm/radeon/radeon_device.c: move a dereference below a NULL test
drm/radeon/radeon_fence.c: move a dereference below the NULL test
drm/radeon/radeon_connectors.c: add a NULL test before dereference
drm/radeon/kms: fix memory leak
drm/radeon/kms: add missing breaks in i2c and ss lookups
drm/radeon/kms: add primary dac adj values table
drm/radeon/kms: fallback to default connector table
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atombios.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 321044bef71c..41dd8ebff219 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
| @@ -114,6 +114,7 @@ static inline struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio(struct radeon_dev | |||
| 114 | i2c.i2c_id = gpio->sucI2cId.ucAccess; | 114 | i2c.i2c_id = gpio->sucI2cId.ucAccess; |
| 115 | 115 | ||
| 116 | i2c.valid = true; | 116 | i2c.valid = true; |
| 117 | break; | ||
| 117 | } | 118 | } |
| 118 | } | 119 | } |
| 119 | 120 | ||
| @@ -1026,6 +1027,7 @@ static struct radeon_atom_ss *radeon_atombios_get_ss_info(struct | |||
| 1026 | ss->delay = ss_info->asSS_Info[i].ucSS_Delay; | 1027 | ss->delay = ss_info->asSS_Info[i].ucSS_Delay; |
| 1027 | ss->range = ss_info->asSS_Info[i].ucSS_Range; | 1028 | ss->range = ss_info->asSS_Info[i].ucSS_Range; |
| 1028 | ss->refdiv = ss_info->asSS_Info[i].ucRecommendedRef_Div; | 1029 | ss->refdiv = ss_info->asSS_Info[i].ucRecommendedRef_Div; |
| 1030 | break; | ||
| 1029 | } | 1031 | } |
| 1030 | } | 1032 | } |
| 1031 | } | 1033 | } |