xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drm-core-next' into drm-linus

Browse Source 
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c
This commit is contained in:
Dave Airlie
2009-12-08 13:52:41 +10:00
parent 22763c5cf3 b0a007dc27
commit 1bd049fa89
39 changed files with 2509 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_crtc_helper.c
View File

@@ -109,7 +109,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
count = (*connector_funcs->get_modes)(connector);
if (!count) {
count = drm_add_modes_noedid(connector, 800, 600);
count = drm_add_modes_noedid(connector, 1024, 768);
if (!count)
return 0;
}