[PATCH weston] Revert "compositor-drm: disable hardware cursors"

Bryce Harrington bryce at osg.samsung.com
Tue Sep 8 22:52:51 PDT 2015


On Mon, Sep 07, 2015 at 04:42:16PM +0300, Pekka Paalanen wrote:
> On Mon, 7 Sep 2015 15:36:35 +0200
> Giulio Camuffo <giuliocamuffo at gmail.com> wrote:
> 
> > 2015-09-07 16:27 GMT+03:00 Pekka Paalanen <ppaalanen at gmail.com>:
> > > From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> > >
> > > This reverts commit 6858383d51b12632481370fdc7d886a1e6bb4ebd.
> > >
> > > The main reason for the original patch was a regression on the Intel
> > > drivers causing compositor framerate to drop to half during cursor
> > > updates or motion. The Intel problem was fixed in
> > > https://github.com/torvalds/linux/commit/2e7f43c41c042d6fed4d67aceeaae32d8f102e98
> > > The fix is included in Linux 4.1-rc6 and 4.0.5.
> > 
> > Yeah, it seems to be fixed indeed.
> > 
> > Reviewed-by: Giulio Camuffo <giuliocamuffo at gmail.com>
> 
> Bryce, would it be ok to get this in for -rc?

Since this re-enables lower level functionality, this feels like that
type of change that potentially could reveal unexpected side effects
(particularly if no one's run with this change on the newer kernels
yet.)

However, there are still a couple weeks ahead of us, so if there are
side effects there's likely a good chance of discovering them still
pre-release.

So... if we can get at least one Tested-by, I'd be ok with landing this
for -rc, and just be attentive to any problems that crop up.

Bryce

> Thanks,
> pq
> 
> 
> > >
> > > The comment in the original patch is still true, but arguably the
> > > possible minor glitches with cursor updates are less bad than not using
> > > cursor planes at all.
> > >
> > > Cc: nerdopolis <bluescreen_avenger at verizon.net>
> > > Cc: Daniel Stone <daniel at fooishbar.org>
> > > Cc: Giulio Camuffo <giuliocamuffo at gmail.com>
> > > Cc: David FORT <contact at hardening-consulting.com>
> > > Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> > > ---
> > >  src/compositor-drm.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/compositor-drm.c b/src/compositor-drm.c
> > > index f5f125a..6777bf8 100644
> > > --- a/src/compositor-drm.c
> > > +++ b/src/compositor-drm.c
> > > @@ -3075,12 +3075,12 @@ drm_backend_create(struct weston_compositor *compositor,
> > >          * without nuclear page flip. Without nuclear/atomic, hw plane
> > >          * and cursor plane updates would either tear or cause extra
> > >          * waits for vblanks which means dropping the compositor framerate
> > > -        * to a fraction.
> > > +        * to a fraction. For cursors, it's not so bad, so they are
> > > +        * enabled.
> > >          *
> > >          * These can be enabled again when nuclear/atomic support lands.
> > >          */
> > >         b->sprites_are_broken = 1;
> > > -       b->cursors_are_broken = 1;
> > >         b->compositor = compositor;
> > >
> > >         section = weston_config_get_section(config, "core", NULL, NULL);
> > > --
> > > 2.4.6
> > >
> 

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
> 
> iQIVAwUBVe2UQiNf5bQRqqqnAQgUOg/9GkZq7ecouyICgk5dR4dPjWVVMSIilgXz
> AOVSWtRsEbJwaNNb4kiD+f0NFaUS4kyyDsI+v7XYvcYaHTrXFrMiwyOmKk0gDWLm
> npB1OG6U1DeHdFPlni2jsspeJXcKiHBOdzKgzyusnNU81/6noW8WUpSUnC0KHbXl
> 62doW12sDl1ZNtxgh/kF0t0H1DwdML9cEQFJKwHoWcAgwK2vnaC9WuFee+o/Z3QR
> ludR+nRJbhlgtp2BX3bNCHlzN6Utap0q80UP/6kZEQI7t1FNHeJ4H4CDQ7jkM+Xh
> GrdYE/tPr+bWBp703Qwy7czCgX2Q5sB0XfHX7LuEpD7If5pfqHjT4E56JlQxmj0c
> hkM9wyOj9MNAURZynsxrz7yLDDIMK2hYOTWnbI8wf44zlUy/LJQ5o3PB4eGuYn77
> zw84l/W0GnoY3xuSPzjDuNYHdTKhK5dILOjRXDdV8omvwtCTRcGKDtjUGWIWWGf6
> 94nmw5zNiT7Zzts0iPoby1AKAW12D/+niiRsp/9e6TznTvPOSJttehK1AcKSXqkl
> 3vz+js0/YEaAKE/jIFQgby+oASrmedrKCq1oWr4wSVHpLjEUX2XB/y7Oq4LWffw+
> tue31PcRaOJF+e0tT0o3R/3ptulQxuQ8LKSZ46eriOsLXL8YXlCmzUmUfD6tLASP
> HzQI+pCrOhs=
> =BCrm
> -----END PGP SIGNATURE-----



More information about the wayland-devel mailing list