From: Zhao Junwang zhjwpku@gmail.com
- use ->disable() and ->enable() for crct and plane - use drm_atomic_helper_connector_dpms for connector
Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: Daniel Vetter daniel.vetter@ffwll.ch Signed-off-by: Zhao Junwang zhjwpku@gmail.com --- drivers/gpu/drm/bochs/bochs_kms.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 599f367..eccd0a7 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -23,16 +23,20 @@ MODULE_PARM_DESC(defy, "default y resolution");
/* ---------------------------------------------------------------------- */
-static void bochs_crtc_dpms(struct drm_crtc *crtc, int mode) +static void bochs_crtc_enable(struct drm_crtc *crtc) { - switch (mode) { - case DRM_MODE_DPMS_ON: - case DRM_MODE_DPMS_STANDBY: - case DRM_MODE_DPMS_SUSPEND: - case DRM_MODE_DPMS_OFF: - default: + if (crtc->enabled) return; - } + + crtc->enabled = true; +} + +static void bochs_crtc_disable(struct drm_crtc *crtc) +{ + if (!crtc->enabled) + return; + + crtc->enabled = false; }
static bool bochs_crtc_mode_fixup(struct drm_crtc *crtc, @@ -71,7 +75,8 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = { };
static const struct drm_crtc_helper_funcs bochs_helper_funcs = { - .dpms = bochs_crtc_dpms, + .enable = bochs_crtc_enable, + .disable = bochs_crtc_disable, .mode_fixup = bochs_crtc_mode_fixup, .mode_set_nofb = bochs_crtc_mode_set_nofb, .commit = bochs_crtc_commit, @@ -204,7 +209,11 @@ static void bochs_encoder_mode_set(struct drm_encoder *encoder, { }
-static void bochs_encoder_dpms(struct drm_encoder *encoder, int state) +static void bochs_encoder_enable(struct drm_encoder *encoder) +{ +} + +static void bochs_encoder_disable(struct drm_encoder *encoder) { }
@@ -213,7 +222,8 @@ static void bochs_encoder_commit(struct drm_encoder *encoder) }
static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = { - .dpms = bochs_encoder_dpms, + .enable = bochs_encoder_enable, + .disable = bochs_encoder_disable, .mode_fixup = bochs_encoder_mode_fixup, .mode_set = bochs_encoder_mode_set, .commit = bochs_encoder_commit, @@ -286,7 +296,7 @@ struct drm_connector_helper_funcs bochs_connector_connector_helper_funcs = { };
struct drm_connector_funcs bochs_connector_connector_funcs = { - .dpms = drm_helper_connector_dpms, + .dpms = drm_atomic_helper_connector_dpms, .detect = bochs_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup,