Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307105
b: refs/heads/master
c: b60bfb6
h: refs/heads/master
i:
  307103: 8a9e7e1
v: v3
  • Loading branch information
Alan Cox authored and Dave Airlie committed Apr 27, 2012
1 parent 3bd74cb commit 7782e47
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3aad16d2ea75cd604400577e9644c9d982c0bfe6
refs/heads/master: b60bfb6585bcda7bc7abd32ce9a14d4c8a6acc8e
4 changes: 1 addition & 3 deletions trunk/drivers/gpu/drm/gma500/cdv_intel_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode)
{
int max_clock = 0;
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
return MODE_NO_DBLESCAN;

Expand All @@ -76,8 +75,7 @@ static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
return MODE_CLOCK_LOW;

/* The max clock for CDV is 355 instead of 400 */
max_clock = 355000;
if (mode->clock > max_clock)
if (mode->clock > 355000)
return MODE_CLOCK_HIGH;

if (mode->hdisplay > 1680 || mode->vdisplay > 1050)
Expand Down

0 comments on commit 7782e47

Please sign in to comment.