Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b2bb0b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next 



omapdrm changes for 4.19

* Workaround for DRA7 errata i932
* Fix mm_list locking
* Cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

Link: https://patchwork.freedesktop.org/patch/msgid/88b2e77f-9646-d15f-645b-ba45af2a1966@ti.com
parents f29135ee f8466184

drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright (C) 2010 Nokia Corporation

 *

 * Original Driver Author: Imre Deak <imre.deak@nokia.com>

 * Based on panel-generic.c by Tomi Valkeinen <tomi.valkeinen@nokia.com>

 * Based on panel-generic.c by Tomi Valkeinen <tomi.valkeinen@ti.com>

 * Adapted to new DSS2 framework: Roger Quadros <roger.quadros@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify it

drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Toppoly TD028TTEC1 panel support

 *

 * Copyright (C) 2008 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *

 * Neo 1973 code (jbt6k74.c):

 * Copyright (C) 2006-2007 by OpenMoko, Inc.

drivers/gpu/drm/omapdrm/dss/core.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *

 * Some code and ideas taken from drivers/video/omap/ driver

 * by Imre Deak.
@@ -82,7 +82,7 @@ static void __exit omap_dss_exit(void) 
module_init(omap_dss_init);

module_exit(omap_dss_exit);



MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");

MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");

MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");

MODULE_LICENSE("GPL v2");

drivers/gpu/drm/omapdrm/dss/dispc.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *

 * Some code and ideas taken from drivers/video/omap/ driver

 * by Imre Deak.

drivers/gpu/drm/omapdrm/dss/display.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *

 * Some code and ideas taken from drivers/video/omap/ driver

 * by Imre Deak.