Re: xf86-input-synaptics: Secondary mouse button isn't recognized
On Tue, Dec 25, 2012 at 03:31:01PM +0100, Karol Babioch wrote: Hi, it's been a while, however I've got other things to do the last couple of weeks. Nevertheless this is still something bugging me. Am 26.11.2012 00:03, schrieb Peter Hutterer: please provide your Xorg.log. this should be a clickpad, the matching property should be set and the right button should be enabled in software. Here you go: http://pastebin.com/ZhrGMbc0 please don't use pastebin-like services for logs on mailing lists. it doesn't archive and links are prone to randomly disappearing. from the log: [23.370] (II) synaptics: SynPS/2 Synaptics TouchPad: found clickpad property [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: x-axis range 1472 - 5682 [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: y-axis range 1408 - 4770 [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: pressure range 0 - 255 [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: finger width range 0 - 15 [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: buttons: left double triple [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: Vendor 0x2 Product 0x7 [23.370] (**) Option TapButton1 1 [23.370] (**) Option TapButton2 2 [23.370] (**) Option TapButton3 3 [23.370] (--) synaptics: SynPS/2 Synaptics TouchPad: touchpad found [23.370] (**) SynPS/2 Synaptics TouchPad: always reports core events so the device is a clickpad and you apparently have a snippet to configure tapping. what's missing is the snippet that configures right-click for clickpads: # This option enables the bottom right corner to be a right button on # non-synaptics clickpads. # This option is only interpreted by clickpads. Section InputClass Identifier Default clickpad buttons MatchDriver synaptics Option SoftButtonAreas 50% 0 82% 0 0 0 0 0 EndSection without this, no right/middle click is emulated on the touchpad. this is something we actually ship with the upstream default config, not sure why it's missing in your case. Cheers, Peter I don't think that there are the physical buttons, the capabilities property only describes a left button so my guess is that the right button is software-emulated based on the finger position. You are probably right, however I'm not too sure what I should do about it. Is this something that (in theory) should be recognized automatically, or am I supposed to configure it myself? Thanks in advance for any replies! Best regards, Karol Babioch ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: peter.hutte...@who-t.net ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: Optimizing behaviour of Synaptics Clickpad on Sony Vaio Z13
On Tue, Jan 01, 2013 at 04:33:31PM +0100, Markus Ellinger wrote: Hi everyone, I am using Linux Mint Nadia which ships with X.Org 1.13.0 on a Sony Vaio Z13. I experience two problems with the Synaptics driver which do not occur on the Windows 7 Professional installation on the same machine: 1. Moving the mouse pointer using the touchpad works fine, however, everytime when I release the finger from the touchpad, the mouse pointer jumps a little bit from its reached position. I guess this is because I do not release the finger steady enough and thus releasing the finger triggers some additional mouse pointer movement. This really is annoying because e.g. when I hover on a button, then release the finger to tap the button, often the mouse pointer jumps away from the button and the tap clicks the wrong button. Is there any way to tell the Synaptics driver in X.org to ignore movements when the finger is released? The Synaptics Windows driver does not have this problem, here when I release the finger, the mouse pointer never jumps. I already tried to play with some synclient options but to no avail. I suspect the cause for this is more the natural shape of your finger. as you press down, the contact surface increases, and the hotspot you get is somewhere in the middle. as you release, the contact surface changes and you get the jump. I can see this here and it's related to how hard you press before releasing. the harder, the bigger the jump. there isn't really anything you can tune in the settings for this particular behaviour. the hysteresis options will help a bit, but hinder some smaller movement. really what we need here is some pressure-based smoothening, to prevent cursor jumps if the pressure changes. 2. The Sony Vaio Z13 has ClickPad buttons. They do react to clicks, however, the buttons itself are sensitive to cursor movements. I tried to set AreaBottomEdge to exclude the button area but when I do this, detection of the right button (as facilitated by RightButtonArea... settings in synclient) fails. Is there a way to exclude the button area from creating pointer movements and still allow the right button to work? you need http://patchwork.freedesktop.org/patch/12707/ Cheers, Peter Below I'm giving you my synclient settings. Please let me know if you need any more info. Any help or pointers is greatly appreciated. Best regards Markus Parameters given by Synclient version 1.6.2 Parameter settings: LeftEdge= 1772 RightEdge = 5468 TopEdge = 1642 BottomEdge = 4524 FingerLow = 25 FingerHigh = 30 FingerPress = 256 MaxTapTime = 180 MaxTapMove = 239 MaxDoubleTapTime= 180 SingleTapTimeout= 180 ClickTime = 100 FastTaps= 0 EmulateMidButtonTime= 0 EmulateTwoFingerMinZ= 282 EmulateTwoFingerMinW= 7 VertScrollDelta = 108 HorizScrollDelta= 108 VertEdgeScroll = 1 HorizEdgeScroll = 0 CornerCoasting = 0 VertTwoFingerScroll = 0 HorizTwoFingerScroll= 0 MinSpeed= 1 MaxSpeed= 1.75 AccelFactor = 0.0367175 TrackstickSpeed = 40 EdgeMotionMinZ = 30 EdgeMotionMaxZ = 160 EdgeMotionMinSpeed = 1 EdgeMotionMaxSpeed = 435 EdgeMotionUseAlways = 0 TouchpadOff = 2 LockedDrags = 0 LockedDragTimeout = 5000 RTCornerButton = 2 RBCornerButton = 3 LTCornerButton = 0 LBCornerButton = 0 TapButton1 = 1 TapButton2 = 3 TapButton3 = 0 ClickFinger1= 1 ClickFinger2= 3 ClickFinger3= 0 CircularScrolling = 0 CircScrollDelta = 0.1 CircScrollTrigger = 0 CircularPad = 0 PalmDetect = 0 PalmMinWidth= 10 PalmMinZ= 200 CoastingSpeed = 20 CoastingFriction= 50 PressureMotionMinZ = 30 PressureMotionMaxZ = 160 PressureMotionMinFactor = 1 PressureMotionMaxFactor = 1 ResolutionDetect= 1 GrabEventDevice = 1 TapAndDragGesture = 1 AreaLeftEdge= 0 AreaRightEdge = 0 AreaTopEdge = 0 AreaBottomEdge = 0 HorizHysteresis = 8 VertHysteresis = 8 ClickPad= 1 RightButtonAreaLeft = 3620 RightButtonAreaRight= 0 RightButtonAreaTop = 4155 RightButtonAreaBottom = 0 MiddleButtonAreaLeft= 0
[ANNOUNCE] libXdamage 1.1.4
libXdamage is the Xlib based library for the X Damage extension. This minor maintenance release cleans up the build configuration scripts, including making them compatible with automake-1.13, which errors out on the old AM_CONFIG_HEADER macro. Alan Coopersmith (2): Strip trailing whitespace libXdamage 1.1.4 Fernando Carrijo (1): Purge macros NEED_EVENTS and NEED_REPLIES Gaetan Nadon (3): config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS config: comment, minor upgrade, quote and layout configure.ac git tag: libXdamage-1.1.4 http://xorg.freedesktop.org/archive/individual/lib/libXdamage-1.1.4.tar.bz2 MD5: 0cf292de2a9fa2e9a939aefde68fd34f SHA1: c3fc0f4b02dce2239bf46c82a5f06b06585720ae SHA256: 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad http://xorg.freedesktop.org/archive/individual/lib/libXdamage-1.1.4.tar.gz MD5: 95867778da012623815214769007c0d7 SHA1: f357e25af6fe05ae76af2acf2250969652f3a1b0 SHA256: 4bb3e9d917f5f593df2277d452926ee6ad96de7b7cd1017cbcf4579fe5d3442b -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc pgpjm14zMs9Rr.pgp Description: PGP signature ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
[ANNOUNCE] libXcomposite 0.4.4
libXdamage is the Xlib based client library for the X Composite extension. This minor maintenance release cleans up the build configuration scripts, including making them compatible with automake-1.13, which errors out on the old AM_CONFIG_HEADER macro. Alan Coopersmith (2): Strip trailing whitespace libXcomposite 0.4.4 Gaetan Nadon (3): config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS config: comment, minor upgrade, quote and layout configure.ac git tag: libXcomposite-0.4.4 http://xorg.freedesktop.org/archive/individual/lib/libXcomposite-0.4.4.tar.bz2 MD5: f7a218dcbf6f0848599c6c36fc65c51a SHA1: 75fd0b996e56e12db1d84e9b63549c5c3f2631ca SHA256: ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 http://xorg.freedesktop.org/archive/individual/lib/libXcomposite-0.4.4.tar.gz MD5: af860b1554a423735d831e6f29ac1ef5 SHA1: 3d94092a0165e8d01996961d2ba5fc41589e9c6f SHA256: 83c04649819c6f52cda1b0ce8bcdcc48ad8618428ad803fb07f20b802f1bdad1 -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc pgphHQBaYOe9M.pgp Description: PGP signature ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: xserver-1.13.2 nomination window is open
Matt Dew marcoz@... writes: It's actually been open since last Thursday but this is notice for anyone wondering. The nomination window is 3 weeks; until Jan 3. I've updated the X.Org calendar. I would like to request that glx/dri2: initialise api to avoid indirect rendering failing randomly http://cgit.freedesktop.org/xorg/xserver/commit/?id=da3eaf6bdbd7ce3bebf2c490cbe2448b4c402dba is included, as we have seen users run into this problem. https://bugs.gentoo.org/show_bug.cgi?id=449252 Best regards, Chí-Thanh Christopher Nguyễn ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: xserver-1.13.2 nomination window is open
On 12/18/12 09:44 PM, Alan Coopersmith wrote: Once Keith pulls it into master, this is a 1.13.2 candidate: EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel http://patchwork.freedesktop.org/patch/12682/ Fixes a crash if you run Xorg -extension crash (or any other invalid extension name), lets it print the error message with the list of valid extension names instead. This is in master now, ready for cherry-picking to 1.13.2: http://cgit.freedesktop.org/xorg/xserver/commit/?id=9ff2e831517875f96477862f979abff394e8d551 -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xrandr] xrandr: print primary output
On 12/26/2012 11:49 PM, Pierre-Loup A. Griffais wrote: Ping; anyone feel like merging this? To ssh://git.freedesktop.org/git/xorg/app/xrandr b26fd53..094b40e master - master -- Aaron Thanks, - Pierre-Loup On 12/19/2012 12:35 PM, Pierre-Loup A. Griffais wrote: I could have sworn there was a change to do that in the wild already, but I couldn't find it. Thanks, - Pierre-Loup ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xrandr] xrandr: print primary output
Thanks! On 01/02/2013 01:25 PM, Aaron Plattner wrote: On 12/26/2012 11:49 PM, Pierre-Loup A. Griffais wrote: Ping; anyone feel like merging this? To ssh://git.freedesktop.org/git/xorg/app/xrandr b26fd53..094b40e master - master -- Aaron Thanks, - Pierre-Loup On 12/19/2012 12:35 PM, Pierre-Loup A. Griffais wrote: I could have sworn there was a change to do that in the wild already, but I couldn't find it. Thanks, - Pierre-Loup ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts] Set XT_DISPLAYHOST for remote connections
Some tests segfault if XT_DISPLAY is set and XT_DISPLAYHOST is not.
Signed-off-by: Peter Harris phar...@opentext.com
---
xts5/bin/xts-config.in |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xts5/bin/xts-config.in b/xts5/bin/xts-config.in
index 9e30b5f..ce55618 100755
--- a/xts5/bin/xts-config.in
+++ b/xts5/bin/xts-config.in
@@ -99,6 +99,10 @@ BEGIN
}
else
{
+ $::vars{XT_TCP} = Yes;
+ my @displayhost = split(/:/, $::vars{DISPLAY}, 2);
+ $::vars{XT_DISPLAYHOST} = $displayhost[0];
+
# Not a local display; admin is responsible for placing
# xtest fonts on the font path before running xts-config.
$::vars{XT_FONTPATH} = $::vars{XT_FONTPATH_GOOD};
--
1.7.2.5
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #4 from Alex Deucher ag...@yahoo.com --- What are the pci ids for your chip? -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58928] 6.14.3 works with FreeBSD 8.2-RELEASE but not 9.1-RELEASE
https://bugs.freedesktop.org/show_bug.cgi?id=58928 --- Comment #3 from Alex Deucher ag...@yahoo.com --- Are their any changes to the xf86-video-ati package between 8.2-RELEASE and 9.1-RELEASE? If so, I'd try to narrow down what change caused the problem. If the xf86-video-ati driver versions are identical, then it's probably a bug in some other component. -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #5 from Benny Ammitzbøll be...@ammitzboell-consult.dk --- bla-hpenvy17 ~ # lspci -nn | grep VGA 00:02.0 VGA compatible controller [0300]: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller [8086:0116] (rev 09) 01:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee ATI Whistler XT [AMD Radeon HD 6700M Series] [1002:6740] -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #6 from Alex Deucher ag...@yahoo.com --- You've got a hybrid laptop with two GPUs. You need to use vgaswitcheroo to select which one is active. I suspect you have the Intel GPU selected and you are ending up with the vesa driver loading on the Intel GPU. -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #7 from Benny Ammitzbøll be...@ammitzboell-consult.dk --- Ok, I have also discovered that I've got a muxless Intel/ATI hybrid graphics card by reading e.g. http://forums.gentoo.org/viewtopic-t-909802-start-0.html. I've tried experimenting again with fglrx which refuses to run with the latest xf86-video-intel and I have not been able to get an older version of xf86-video-intel to compile. I then tried using xf86-video-intel alone which actually gives me 1920x1080, but only on the HDMI output - the LCD (eDP) screen is blank. Also, glxgears performance is not good and there are some flickering problems... I'll give the xf86-driver-ati another go trying out the vgaswitcheroo... -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #8 from Michel Dänzer mic...@daenzer.net --- (In reply to comment #4) What are the pci ids for your chip? BTW, this can be seen in the log file: [50.286] (--) PCI:*(0:0:2:0) 8086:0116:103c:168a rev 9, Mem @ 0xc000/4194304, 0xb000/268435456, I/O @ 0x5000/64 [50.286] (--) PCI: (0:1:0:0) 1002:6740:103c:168a rev 0, Mem @ 0xa000/268435456, 0xc280/131072, I/O @ 0x4000/256, BIOS @ 0x/13107 The asterisk also confirms that the Intel GPU is the primary VGA adapter. (In reply to comment #7) I'll give the xf86-driver-ati another go trying out the vgaswitcheroo... I don't think VGA switcheroo applies to muxless laptops. Have you tried just starting X with the intel and radeon drivers? -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #9 from Benny Ammitzbøll be...@ammitzboell-consult.dk --- (In reply to comment #8) (In reply to comment #4) What are the pci ids for your chip? BTW, this can be seen in the log file: [50.286] (--) PCI:*(0:0:2:0) 8086:0116:103c:168a rev 9, Mem @ 0xc000/4194304, 0xb000/268435456, I/O @ 0x5000/64 [50.286] (--) PCI: (0:1:0:0) 1002:6740:103c:168a rev 0, Mem @ 0xa000/268435456, 0xc280/131072, I/O @ 0x4000/256, BIOS @ 0x/13107 The asterisk also confirms that the Intel GPU is the primary VGA adapter. Ok, thanks for the info. (In reply to comment #7) I'll give the xf86-driver-ati another go trying out the vgaswitcheroo... I don't think VGA switcheroo applies to muxless laptops. Have you tried just starting X with the intel and radeon drivers? I will try it out. -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #10 from Alex Deucher ag...@yahoo.com --- Your system appears to be MUXed rather than MUX-less: [drm] Radeon Display Connectors [drm] Connector 0: [drm] eDP-1 [drm] HPD2 [drm] DDC: 0x6440 0x6440 0x6444 0x6444 0x6448 0x6448 0x644c 0x644c [drm] Encoders: [drm] LCD1: INTERNAL_UNIPHY1 [drm] Connector 1: [drm] DP-1 [drm] HPD3 [drm] DDC: 0x6450 0x6450 0x6454 0x6454 0x6458 0x6458 0x645c 0x645c [drm] Encoders: [drm] DFP1: INTERNAL_UNIPHY2 [drm] Connector 2: [drm] DP-2 [drm] HPD4 [drm] DDC: 0x6460 0x6460 0x6464 0x6464 0x6468 0x6468 0x646c 0x646c [drm] Encoders: [drm] DFP2: INTERNAL_UNIPHY2 [drm] Connector 3: [drm] HDMI-A-1 [drm] HPD1 [drm] DDC: 0x6430 0x6430 0x6434 0x6434 0x6438 0x6438 0x643c 0x643c [drm] Encoders: [drm] DFP3: INTERNAL_UNIPHY1 You just need to use vga-switcheroo to select which GPU the displays are connected to. -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[Bug 58894] Radeon HD 7690M XT only shows 1280x1024, not able to get 1920x1080
https://bugs.freedesktop.org/show_bug.cgi?id=58894 --- Comment #11 from Alex Deucher ag...@yahoo.com --- If it were MUX-less, there would be fewer or no display connectors listed in the dmesg output. -- You are receiving this mail because: You are the assignee for the bug. ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: Q: 'MacModel' replacement for radeon driver?
On Fri, Dec 21, 2012 at 3:22 PM, Albrecht Dreß albrecht.dr...@arcor.de wrote:
Hi Alex!
Am 21.12.12 19:44 schrieb(en) Alex Deucher:
Sounds like internal tmds may be broken in kms. Probably easiest to dump
the registers from a working setup (console fb, or old version of the
driver) and a non-working setup (driver with the attached patch applied).
Then send me the output.
See attached: working Xorg w/ kernel 3.6.5 and fbdev, broken w/ kernel 3.7.1
and radeon driver.
Does the attached patch help?
Alex
From 4e8bd671c5e17a7cf8b64c151651866780da573f Mon Sep 17 00:00:00 2001
From: Alex Deucher alexander.deuc...@amd.com
Date: Wed, 2 Jan 2013 20:29:00 -0500
Subject: [PATCH] drm/radeon: fix DFP setup on pre-avivo asics
Signed-off-by: Alex Deucher alexander.deuc...@amd.com
---
drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 60 +++---
1 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 6857cb4..4c83d3d 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -53,7 +53,6 @@ static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
bool hscale = true, vscale = true;
int hsync_wid;
int vsync_wid;
- int hsync_start;
int blank_width;
u32 scale, inc, crtc_more_cntl;
u32 fp_horz_stretch, fp_vert_stretch, fp_horz_vert_active;
@@ -68,7 +67,8 @@ static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
(RADEON_HORZ_FP_LOOP_STRETCH |
RADEON_HORZ_AUTO_RATIO_INC);
- crtc_more_cntl = 0;
+ crtc_more_cntl = (RADEON_CRTC_H_CUTOFF_ACTIVE_EN |
+ RADEON_CRTC_V_CUTOFF_ACTIVE_EN);
if ((rdev-family == CHIP_RS100) ||
(rdev-family == CHIP_RS200)) {
/* This is to workaround the asic bug for RMX, some versions
@@ -76,35 +76,37 @@ static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
crtc_more_cntl |= RADEON_CRTC_H_CUTOFF_ACTIVE_EN;
}
+ blank_width = (mode-crtc_hblank_end - mode-crtc_hblank_start) / 8;
+ if (blank_width 110)
+ blank_width = 110;
- fp_crtc_h_total_disp = mode-crtc_htotal / 8) - 1) 0x3ff)
+ fp_crtc_h_total_disp = (((blank_width) 0x3ff)
| mode-crtc_hdisplay / 8) - 1) 0x1ff) 16));
hsync_wid = (mode-crtc_hsync_end - mode-crtc_hsync_start) / 8;
if (!hsync_wid)
hsync_wid = 1;
- hsync_start = mode-crtc_hsync_start - 8;
- fp_h_sync_strt_wid = ((hsync_start 0x1fff)
+ fp_h_sync_strt_wid = mode-crtc_hsync_start - mode-crtc_hblank_start) / 8) 0x1fff)
| ((hsync_wid 0x3f) 16)
| ((mode-flags DRM_MODE_FLAG_NHSYNC)
? RADEON_CRTC_H_SYNC_POL
: 0));
- fp_crtc_v_total_disp = (((mode-crtc_vtotal - 1) 0x)
+ fp_crtc_v_total_disp = (((mode-crtc_vblank_end - mode-crtc_vblank_start) 0x)
| ((mode-crtc_vdisplay - 1) 16));
vsync_wid = mode-crtc_vsync_end - mode-crtc_vsync_start;
if (!vsync_wid)
vsync_wid = 1;
- fp_v_sync_strt_wid = (((mode-crtc_vsync_start - 1) 0xfff)
- | ((vsync_wid 0x1f) 16)
- | ((mode-flags DRM_MODE_FLAG_NVSYNC)
- ? RADEON_CRTC_V_SYNC_POL
- : 0));
+ fp_v_sync_strt_wid = mode-crtc_vsync_start - mode-crtc_vblank_start) 0xfff)
+ | ((vsync_wid 0x1f) 16)
+ | ((mode-flags DRM_MODE_FLAG_NVSYNC)
+ ? RADEON_CRTC_V_SYNC_POL : 0)));
- fp_horz_vert_active = 0;
+ fp_horz_vert_active = mode-crtc_vdisplay - 1) 16) 0xfff) |
+ mode-crtc_hdisplay / 8) - 1) 0x1ff) 16));
if (native_mode-hdisplay == 0 ||
native_mode-vdisplay == 0) {
@@ -156,38 +158,8 @@ static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
crtc_more_cntl |= (RADEON_CRTC_AUTO_HORZ_CENTER_EN |
RADEON_CRTC_AUTO_VERT_CENTER_EN);
- blank_width = (mode-crtc_hblank_end - mode-crtc_hblank_start) / 8;
- if (blank_width 110)
- blank_width = 110;
-
- fp_crtc_h_total_disp = (((blank_width) 0x3ff)
-| mode-crtc_hdisplay / 8) - 1) 0x1ff) 16));
-
- hsync_wid = (mode-crtc_hsync_end - mode-crtc_hsync_start) / 8;
- if (!hsync_wid)
- hsync_wid = 1;
-
- fp_h_sync_strt_wid = mode-crtc_hsync_start - mode-crtc_hblank_start) / 8) 0x1fff)
-| ((hsync_wid 0x3f) 16)
-| ((mode-flags DRM_MODE_FLAG_NHSYNC)
- ? RADEON_CRTC_H_SYNC_POL
- : 0));
-
- fp_crtc_v_total_disp = (((mode-crtc_vblank_end - mode-crtc_vblank_start) 0x)
-| ((mode-crtc_vdisplay - 1) 16));
-
- vsync_wid = mode-crtc_vsync_end - mode-crtc_vsync_start;
- if (!vsync_wid)
- vsync_wid = 1;
-
- fp_v_sync_strt_wid = mode-crtc_vsync_start - mode-crtc_vblank_start) 0xfff)
- | ((vsync_wid 0x1f) 16)
- | ((mode-flags DRM_MODE_FLAG_NVSYNC)
- ? RADEON_CRTC_V_SYNC_POL
- : 0)));
-
- fp_horz_vert_active = (((native_mode-vdisplay) 0xfff) |
-(((native_mode-hdisplay / 8) 0x1ff) 16));
+ fp_horz_vert_active = (((native_mode-vdisplay - 1) 0xfff) |
+ native_mode-hdisplay / 8) - 1) 0x1ff) 16));
break;
