Commit 284b2884 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.2-atomic' of... 

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

omapdrm atomic modesetting support

Atomic modesetting support for omapdrm.

" we've had issues with omapdrm for years,
which we've not been able to fix properly (like warnings/crashes when unloading
modules, page-flips tearing, race issues with fbs). All those problems seem to
be gone after this rewrite of omapdrm for atomic modesetting, and the resulting
code is much cleaner and more maintainable."

* tag 'omapdrm-4.2-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (43 commits)
  drm: omapdrm: new vblank and event handling
  drm: omapdrm: merge omap_crtc_flush and omap_crtc_atomic_flush
  drm: omapdrm: add lock for fb pinning
  drm: omapdrm: if omap_plane_atomic_update fails, disable plane
  drm: omapdrm: inline omap_plane_setup into update/disable
  drm: omapdrm: omap_plane_setup() cannot fail, use WARN
  drm: omapdrm: Don't setup planes manually from CRTC .enable()/.disable()
  drm: omapdrm: Don't flush CRTC when enabling or disabling it
  drm: omapdrm: Move encoder setup to encoder operations
  drm: omapdrm: Simplify DSS power management
  drm: omapdrm: Remove nested PM get/sync when configuring encoders
  drm: omapdrm: Support unlinking page flip events prematurely
  drm: omapdrm: omap_crtc_flush() isn't called with modeset locked
  drm: omapdrm: Don't get/put dispc in omap_crtc_flush()
  drm: omapdrm: Make the omap_crtc_flush function static
  drm: omapdrm: Remove omap_plane enabled field
  drm: omapdrm: Remove omap_crtc enabled field
  drm: omapdrm: Move crtc info out of the crtc structure
  drm: omapdrm: Move plane info and win out of the plane structure
  drm: omapdrm: Switch crtc and plane set_property to atomic helpers
  ...
parents b9a1077a 5f741b39

drivers/gpu/drm/omapdrm/omap_connector.c

+8 −4
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include "omap_drv.h"

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>



#include "drm_crtc.h"

#include "drm_crtc_helper.h"

#include "omap_drv.h"



/*

 * connector funcs
@@ -259,10 +260,13 @@ struct drm_encoder *omap_connector_attached_encoder( 
}



static const struct drm_connector_funcs omap_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.dpms = drm_atomic_helper_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = omap_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = omap_connector_destroy,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {

drivers/gpu/drm/omapdrm/omap_crtc.c

+162 −379

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/omapdrm/omap_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>



#include "omap_drv.h"

#include "omap_dmm_tiler.h"



#include "drm_fb_helper.h"





#ifdef CONFIG_DEBUG_FS



static int gem_show(struct seq_file *m, void *arg)

drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

+10 −9
Original line number Diff line number Diff line
@@ -15,21 +15,22 @@ 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/list.h>

#include <linux/mm.h>

#include <linux/module.h>

#include <linux/platform_device.h> /* platform_device() */

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/wait.h>

#include <linux/interrupt.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/delay.h>

#include <linux/mm.h>

#include <linux/time.h>

#include <linux/list.h>

#include <linux/completion.h>

#include <linux/vmalloc.h>

#include <linux/wait.h>



#include "omap_dmm_tiler.h"

#include "omap_dmm_priv.h"

drivers/gpu/drm/omapdrm/omap_drv.c

+207 −17

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE