Commit 7af78f40 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Simona Vetter
Browse files

drm: move DRM_SWITCH_POWER defines to drm_device.h 



Move DRM_SWITCH_POWER out of drmP.h to allow users
to get rid of the drmP include.
Moved to drm_device.h because drm_device.switch_power_state
is the only user.

Converted to enum and added sparse kerneldoc comments.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108192939.15255-3-sam@ravnborg.org
parent ac4f24c2

include/drm/drmP.h

+0 −5
Original line number Diff line number Diff line
@@ -94,11 +94,6 @@ struct dma_buf_attachment; 
struct pci_dev;

struct pci_controller;



#define DRM_SWITCH_POWER_ON 0

#define DRM_SWITCH_POWER_OFF 1

#define DRM_SWITCH_POWER_CHANGING 2

#define DRM_SWITCH_POWER_DYNAMIC_OFF 3



/* returns true if currently okay to sleep */

static inline bool drm_can_sleep(void)

{

include/drm/drm_device.h

+28 −1
Original line number Diff line number Diff line
@@ -24,6 +24,25 @@ struct inode; 
struct pci_dev;

struct pci_controller;





/**

 * enum drm_switch_power - power state of drm device

 */



enum switch_power_state {

	/** @DRM_SWITCH_POWER_ON: Power state is ON */

	DRM_SWITCH_POWER_ON = 0,



	/** @DRM_SWITCH_POWER_OFF: Power state is OFF */

	DRM_SWITCH_POWER_OFF = 1,



	/** @DRM_SWITCH_POWER_CHANGING: Power state is changing */

	DRM_SWITCH_POWER_CHANGING = 2,



	/** @DRM_SWITCH_POWER_DYNAMIC_OFF: Suspended */

	DRM_SWITCH_POWER_DYNAMIC_OFF = 3,

};



/**

 * struct drm_device - DRM device structure

 *
@@ -291,7 +310,15 @@ struct drm_device { 
	/** @vma_offset_manager: GEM information */

	struct drm_vma_offset_manager *vma_offset_manager;



	int switch_power_state;

	/**

	 * @switch_power_state:

	 *

	 * Power state of the client.

	 * Used by drivers supporting the switcheroo driver.

	 * The state is maintained in the

	 * &vga_switcheroo_client_ops.set_gpu_state callback

	 */

	enum switch_power_state switch_power_state;



	/**

	 * @fb_helper: