Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-07-10 03:11:17 +0200
committerAlexander Graf <agraf@suse.de>2012-07-10 03:11:17 +0200
commit6df2baf81a91247320e19235d74708932b5eb4c9 (patch)
tree1951c32f1302215fc6f34f429af676c31f9f0359
parentafc95c80b1e3a837b80d72586ab013e7bba77ff3 (diff)
Refresh patches.arch/arm-omap-drm-fix-global-buffer.patch: Fix OMAP3
-rw-r--r--patches.arch/arm-omap-drm-fix-global-buffer.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/patches.arch/arm-omap-drm-fix-global-buffer.patch b/patches.arch/arm-omap-drm-fix-global-buffer.patch
index 80b5e5d178..70ef8aed9e 100644
--- a/patches.arch/arm-omap-drm-fix-global-buffer.patch
+++ b/patches.arch/arm-omap-drm-fix-global-buffer.patch
@@ -9,24 +9,25 @@ it's buffers to gfx.
Signed-off-by: Alexander Graf <agraf@suse.de>
-diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
-index 4749ac3..7f5f602 100644
---- a/drivers/video/omap2/dss/dispc.c
-+++ b/drivers/video/omap2/dss/dispc.c
-@@ -2241,6 +2241,9 @@ int dispc_ovl_enable(enum omap_plane plane, bool enable)
+Index: linux-3.4-openSUSE-12.2/drivers/video/omap2/dss/dispc.c
+===================================================================
+--- linux-3.4-openSUSE-12.2.orig/drivers/video/omap2/dss/dispc.c
++++ linux-3.4-openSUSE-12.2/drivers/video/omap2/dss/dispc.c
+@@ -1938,6 +1938,10 @@ int dispc_ovl_enable(enum omap_plane pla
{
DSSDBG("dispc_enable_plane %d, %d\n", plane, enable);
+ // XXX quick hack.. give WB buffers to gfx:
-+ dispc_write_reg(DISPC_GLOBAL_BUFFER, 0x006D2240);
++ if (cpu_is_omap44xx)
++ dispc_write_reg(DISPC_GLOBAL_BUFFER, 0x006D2240);
+
REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), enable ? 1 : 0, 0, 0);
return 0;
-diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h
-index f278080..318b763 100644
---- a/drivers/video/omap2/dss/dispc.h
-+++ b/drivers/video/omap2/dss/dispc.h
+Index: linux-3.4-openSUSE-12.2/drivers/video/omap2/dss/dispc.h
+===================================================================
+--- linux-3.4-openSUSE-12.2.orig/drivers/video/omap2/dss/dispc.h
++++ linux-3.4-openSUSE-12.2/drivers/video/omap2/dss/dispc.h
@@ -35,6 +35,7 @@
#define DISPC_GLOBAL_ALPHA 0x0074
#define DISPC_CONTROL2 0x0238