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

Commit a743d758 authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Daniel Vetter
Browse files

drm: Wrap the check for atomic_commit implementation 



This check is useful for drivers that do not have DRIVER_ATOMIC set but
have atomic modesetting internally implemented. Wrap the check into a
function since this is used in many places and as a bonus, the function
name helps to document what the check is for.

v2:
Change return type to bool (Ville)
Move the function drm_atomic.h (Daniel)
Fixed comment marker for documentation

Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
[danvet: Move back to drmP.h because include hell.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1482396643-32456-1-git-send-email-dhinakaran.pandiyan@intel.com
parent f79f2692

drivers/gpu/drm/drm_fb_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper) 


	drm_warn_on_modeset_not_all_locked(dev);



	if (dev->mode_config.funcs->atomic_commit)

	if (drm_drv_uses_atomic_modeset(dev))

		return restore_fbdev_mode_atomic(fb_helper);



	drm_for_each_plane(plane, dev) {
@@ -1444,7 +1444,7 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, 
		return -EBUSY;

	}



	if (dev->mode_config.funcs->atomic_commit) {

	if (drm_drv_uses_atomic_modeset(dev)) {

		ret = pan_display_atomic(var, info);

		goto unlock;

	}
@@ -2060,7 +2060,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, 
	 * NULL we fallback to the default drm_atomic_helper_best_encoder()

	 * helper.

	 */

	if (fb_helper->dev->mode_config.funcs->atomic_commit &&

	if (drm_drv_uses_atomic_modeset(fb_helper->dev) &&

	    !connector_funcs->best_encoder)

		encoder = drm_atomic_helper_best_encoder(connector);

	else

drivers/gpu/drm/nouveau/nouveau_connector.c

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_atomic.h>



#include "nouveau_reg.h"

#include "nouveau_drv.h"
@@ -769,7 +770,7 @@ nouveau_connector_set_property(struct drm_connector *connector, 
	struct drm_encoder *encoder = to_drm_encoder(nv_encoder);

	int ret;



	if (connector->dev->mode_config.funcs->atomic_commit)

	if (drm_drv_uses_atomic_modeset(connector->dev))

		return drm_atomic_helper_connector_set_property(connector, property, value);



	ret = connector->funcs->atomic_set_property(&nv_connector->base,
@@ -1074,7 +1075,7 @@ nouveau_connector_helper_funcs = { 
static int

nouveau_connector_dpms(struct drm_connector *connector, int mode)

{

	if (connector->dev->mode_config.funcs->atomic_commit)

	if (drm_drv_uses_atomic_modeset(connector->dev))

		return drm_atomic_helper_connector_dpms(connector, mode);

	return drm_helper_connector_dpms(connector, mode);

}

drivers/gpu/drm/nouveau/nouveau_display.c

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, 
	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		if (nouveau_crtc(crtc)->index == pipe) {

			struct drm_display_mode *mode;

			if (dev->mode_config.funcs->atomic_commit)

			if (drm_drv_uses_atomic_modeset(dev))

				mode = &crtc->state->adjusted_mode;

			else

				mode = &crtc->hwmode;
@@ -738,7 +738,7 @@ nouveau_display_suspend(struct drm_device *dev, bool runtime) 
	struct nouveau_display *disp = nouveau_display(dev);

	struct drm_crtc *crtc;



	if (dev->mode_config.funcs->atomic_commit) {

	if (drm_drv_uses_atomic_modeset(dev)) {

		if (!runtime) {

			disp->suspend = nouveau_atomic_suspend(dev);

			if (IS_ERR(disp->suspend)) {
@@ -784,7 +784,7 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) 
	struct drm_crtc *crtc;

	int ret;



	if (dev->mode_config.funcs->atomic_commit) {

	if (drm_drv_uses_atomic_modeset(dev)) {

		nouveau_display_init(dev);

		if (disp->suspend) {

			drm_atomic_helper_resume(dev, disp->suspend);

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_atomic.h>



#include "nouveau_drv.h"

#include "nouveau_gem.h"
@@ -524,7 +525,7 @@ nouveau_fbcon_init(struct drm_device *dev) 
		preferred_bpp = 32;



	/* disable all the possible outputs/crtcs before entering KMS mode */

	if (!dev->mode_config.funcs->atomic_commit)

	if (!drm_drv_uses_atomic_modeset(dev))

		drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(&fbcon->helper, preferred_bpp);

include/drm/drmP.h

+13 −0
Original line number Diff line number Diff line
@@ -634,6 +634,19 @@ struct drm_device { 
	int switch_power_state;

};



/**

 * drm_drv_uses_atomic_modeset - check if the driver implements

 * atomic_commit()

 * @dev: DRM device

 *

 * This check is useful if drivers do not have DRIVER_ATOMIC set but

 * have atomic modesetting internally implemented.

 */

static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)

{

	return dev->mode_config.funcs->atomic_commit != NULL;

}



#include <drm/drm_irq.h>



#define DRM_SWITCH_POWER_ON 0