summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-01-22 02:17:55 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-04-16 12:47:10 (GMT)
commite43461f564874bb51d41fe1aa8289eca45f7bec1 (patch)
treefcb627b60381d24b893552ea6191017b44ff490e
parentda6ebeac4bd717a44eda28cb1bb5e31803719819 (diff)
downloadlinux-3.10-e43461f564874bb51d41fe1aa8289eca45f7bec1.zip
linux-3.10-e43461f564874bb51d41fe1aa8289eca45f7bec1.tar.gz
linux-3.10-e43461f564874bb51d41fe1aa8289eca45f7bec1.tar.bz2
drm/pl111: set default mode to 1024x768x16bpp
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r--drivers/gpu/drm/pl111/pl111_drm_connector.c4
-rw-r--r--drivers/gpu/drm/pl111/pl111_drm_crtc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_drm_connector.c b/drivers/gpu/drm/pl111/pl111_drm_connector.c
index 304a5be..9844dd0 100644
--- a/drivers/gpu/drm/pl111/pl111_drm_connector.c
+++ b/drivers/gpu/drm/pl111/pl111_drm_connector.c
@@ -34,9 +34,9 @@
static struct {
int w, h, type;
} pl111_drm_modes[] = {
- { 640, 480, DRM_MODE_TYPE_PREFERRED},
+ {1024, 768, DRM_MODE_TYPE_PREFERRED},
+ { 640, 480, 0},
{ 800, 600, 0},
- {1024, 768, 0},
{ -1, -1, -1}
};
diff --git a/drivers/gpu/drm/pl111/pl111_drm_crtc.c b/drivers/gpu/drm/pl111/pl111_drm_crtc.c
index 1f8efbe..8491b3d 100644
--- a/drivers/gpu/drm/pl111/pl111_drm_crtc.c
+++ b/drivers/gpu/drm/pl111/pl111_drm_crtc.c
@@ -331,7 +331,7 @@ bool pl111_crtc_helper_mode_fixup(struct drm_crtc *crtc,
{
DRM_DEBUG_KMS("DRM %s on crtc=%p\n", __func__, crtc);
-#ifdef CONFIG_ARCH_VEXPRESS
+#if 0
/*
* 1024x768 with more than 16 bits per pixel does not work correctly
* on Versatile Express