diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-08 10:19:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-08 10:19:59 +1000 |
| commit | eaee8ec4eb031cda0003ec4c893058c54db20ee4 (patch) | |
| tree | bc62c4ae4048788115b8931fe3ba3a74fa75af24 /drivers/gpu/drm/radeon/atombios_dp.c | |
| parent | f6624888a518c4bdd1fd0f9a1d0c5a6969ff283d (diff) | |
| parent | dd5a74f2f982193620cfa1ef609df1ee805781d4 (diff) | |
| download | linux-eaee8ec4eb031cda0003ec4c893058c54db20ee4.tar.gz linux-eaee8ec4eb031cda0003ec4c893058c54db20ee4.tar.bz2 linux-eaee8ec4eb031cda0003ec4c893058c54db20ee4.zip | |
Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
some minor radeon fixes.
* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: integer underflow in radeon_cp_dispatch_texture()
drm/radeon: adjust default bapm settings for KV
drm/radeon: properly filter DP1.2 4k modes on non-DP1.2 hw
drm/radeon: fix sad_count check for dce3
drm/radeon: KV has three PPLLs (v2)
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_dp.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 11ba9d21b89b..db42a670f995 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -492,6 +492,10 @@ int radeon_dp_mode_valid_helper(struct drm_connector *connector, struct radeon_connector_atom_dig *dig_connector; int dp_clock; + if ((mode->clock > 340000) && + (!radeon_connector_is_dp12_capable(connector))) + return MODE_CLOCK_HIGH; + if (!radeon_connector->con_priv) return MODE_CLOCK_HIGH; dig_connector = radeon_connector->con_priv; |