diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-08-08 14:46:15 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-08-08 15:04:45 +0200 |
| commit | 077e74e3f7a04f68566563743f57154ae1b80251 (patch) | |
| tree | 11e959a6631605cd8e3c3dbe6ebadc5752dc4138 /patches/xf86-video-fbdev-0.4.4 | |
| parent | 3d7704224b5a123d237d1baccd78119d0f48ced1 (diff) | |
| download | ptxdist-077e74e3f7a04f68566563743f57154ae1b80251.tar.gz ptxdist-077e74e3f7a04f68566563743f57154ae1b80251.tar.xz | |
xorg-driver-video-fbdev: version bump 0.4.2 -> 0.4.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/xf86-video-fbdev-0.4.4')
| -rw-r--r-- | patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch | 47 | ||||
| -rw-r--r-- | patches/xf86-video-fbdev-0.4.4/series | 4 |
2 files changed, 51 insertions, 0 deletions
diff --git a/patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch b/patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch new file mode 100644 index 000000000..64ace0375 --- /dev/null +++ b/patches/xf86-video-fbdev-0.4.4/0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch @@ -0,0 +1,47 @@ +From: Sascha Hauer <s.hauer@pengutronix.de> +Date: Fri, 8 Aug 2014 14:47:18 +0200 +Subject: [PATCH] xf86-video-fbdev: add option to leave timings alone + +Xorg tries to set the timing values in the framebuffer device. Add an +option to tell X to leave the timing values untouched. + +Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> +--- + src/fbdev.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/fbdev.c b/src/fbdev.c +index f5a7378..20078bc 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -124,6 +124,7 @@ typedef enum { + OPTION_SHADOW_FB, + OPTION_ROTATE, + OPTION_FBDEV, ++ OPTION_DONT_SET_TIMING, + OPTION_DEBUG + } FBDevOpts; + +@@ -131,6 +132,7 @@ static const OptionInfoRec FBDevOptions[] = { + { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_ROTATE, "Rotate", OPTV_STRING, {0}, FALSE }, + { OPTION_FBDEV, "fbdev", OPTV_STRING, {0}, FALSE }, ++ { OPTION_DONT_SET_TIMING, "DontSetTiming", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_DEBUG, "debug", OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, OPTV_NONE, {0}, FALSE } + }; +@@ -518,9 +520,11 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) + } + + /* select video modes */ +- +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against framebuffer device...\n"); +- fbdevHWSetVideoModes(pScrn); ++ if( xf86ReturnOptValBool(fPtr->Options, OPTION_DONT_SET_TIMING, FALSE) == FALSE ) { ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against framebuffer device...\n"); ++ fbdevHWSetVideoModes(pScrn); ++ } else ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ignoring fb timing settings."); + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against monitor...\n"); + { diff --git a/patches/xf86-video-fbdev-0.4.4/series b/patches/xf86-video-fbdev-0.4.4/series new file mode 100644 index 000000000..216d5fa42 --- /dev/null +++ b/patches/xf86-video-fbdev-0.4.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-xf86-video-fbdev-add-option-to-leave-timings-alone.patch +# 7dc0c948e807d15c5f876011200006cb - git-ptx-patches magic |