diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/drm_edid_modes.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/drm_edid_modes.h')
| -rw-r--r-- | drivers/gpu/drm/drm_edid_modes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_edid_modes.h b/drivers/gpu/drm/drm_edid_modes.h index 6eb7592e152f..5f2064489fd5 100644 --- a/drivers/gpu/drm/drm_edid_modes.h +++ b/drivers/gpu/drm/drm_edid_modes.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | * This table is copied from xfree86/modes/xf86EdidModes.c. | 32 | * This table is copied from xfree86/modes/xf86EdidModes.c. |
| 33 | * But the mode with Reduced blank feature is deleted. | 33 | * But the mode with Reduced blank feature is deleted. |
| 34 | */ | 34 | */ |
| 35 | static struct drm_display_mode drm_dmt_modes[] = { | 35 | static const struct drm_display_mode drm_dmt_modes[] = { |
| 36 | /* 640x350@85Hz */ | 36 | /* 640x350@85Hz */ |
| 37 | { DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 31500, 640, 672, | 37 | { DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 31500, 640, 672, |
| 38 | 736, 832, 0, 350, 382, 385, 445, 0, | 38 | 736, 832, 0, 350, 382, 385, 445, 0, |
| @@ -266,7 +266,7 @@ static struct drm_display_mode drm_dmt_modes[] = { | |||
| 266 | static const int drm_num_dmt_modes = | 266 | static const int drm_num_dmt_modes = |
| 267 | sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode); | 267 | sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode); |
| 268 | 268 | ||
| 269 | static struct drm_display_mode edid_est_modes[] = { | 269 | static const struct drm_display_mode edid_est_modes[] = { |
| 270 | { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840, | 270 | { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840, |
| 271 | 968, 1056, 0, 600, 601, 605, 628, 0, | 271 | 968, 1056, 0, 600, 601, 605, 628, 0, |
| 272 | DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@60Hz */ | 272 | DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@60Hz */ |