diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
| commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
| tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/gpu/drm/mgag200/mgag200_mode.c | |
| parent | a3dbeb5b45af5b6113385db89fce2a8279278e8b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_mode.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_mode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index b8583f275e80..968374776db9 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c | |||
| @@ -1519,11 +1519,11 @@ static int mga_vga_mode_valid(struct drm_connector *connector, | |||
| 1519 | (mga_vga_calculate_mode_bandwidth(mode, bpp) | 1519 | (mga_vga_calculate_mode_bandwidth(mode, bpp) |
| 1520 | > (32700 * 1024))) { | 1520 | > (32700 * 1024))) { |
| 1521 | return MODE_BANDWIDTH; | 1521 | return MODE_BANDWIDTH; |
| 1522 | } else if (mode->type == G200_EH && | 1522 | } else if (mdev->type == G200_EH && |
| 1523 | (mga_vga_calculate_mode_bandwidth(mode, bpp) | 1523 | (mga_vga_calculate_mode_bandwidth(mode, bpp) |
| 1524 | > (37500 * 1024))) { | 1524 | > (37500 * 1024))) { |
| 1525 | return MODE_BANDWIDTH; | 1525 | return MODE_BANDWIDTH; |
| 1526 | } else if (mode->type == G200_ER && | 1526 | } else if (mdev->type == G200_ER && |
| 1527 | (mga_vga_calculate_mode_bandwidth(mode, | 1527 | (mga_vga_calculate_mode_bandwidth(mode, |
| 1528 | bpp) > (55000 * 1024))) { | 1528 | bpp) > (55000 * 1024))) { |
| 1529 | return MODE_BANDWIDTH; | 1529 | return MODE_BANDWIDTH; |