1111#include <linux/media-bus-format.h>
1212#include <linux/pm_runtime.h>
1313
14+ #include <drm/drm_atomic.h>
1415#include <drm/drm_atomic_helper.h>
1516#include <drm/drm_atomic_state_helper.h>
1617#include <drm/drm_atomic_uapi.h>
@@ -319,27 +320,6 @@ static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
319320 scrtc -> dpms = mode ;
320321}
321322
322- static void shmob_drm_crtc_mode_prepare (struct drm_crtc * crtc )
323- {
324- shmob_drm_crtc_dpms (crtc , DRM_MODE_DPMS_OFF );
325- }
326-
327- static void shmob_drm_crtc_mode_commit (struct drm_crtc * crtc )
328- {
329- shmob_drm_crtc_dpms (crtc , DRM_MODE_DPMS_ON );
330- }
331-
332- static int shmob_drm_crtc_atomic_check (struct drm_crtc * crtc ,
333- struct drm_atomic_state * state )
334- {
335- return 0 ;
336- }
337-
338- static void shmob_drm_crtc_atomic_begin (struct drm_crtc * crtc ,
339- struct drm_atomic_state * state )
340- {
341- }
342-
343323static void shmob_drm_crtc_atomic_flush (struct drm_crtc * crtc ,
344324 struct drm_atomic_state * state )
345325{
@@ -356,13 +336,22 @@ static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc,
356336 }
357337}
358338
339+ static void shmob_drm_crtc_atomic_enable (struct drm_crtc * crtc ,
340+ struct drm_atomic_state * state )
341+ {
342+ shmob_drm_crtc_dpms (crtc , DRM_MODE_DPMS_ON );
343+ }
344+
345+ static void shmob_drm_crtc_atomic_disable (struct drm_crtc * crtc ,
346+ struct drm_atomic_state * state )
347+ {
348+ shmob_drm_crtc_dpms (crtc , DRM_MODE_DPMS_OFF );
349+ }
350+
359351static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
360- .dpms = shmob_drm_crtc_dpms ,
361- .prepare = shmob_drm_crtc_mode_prepare ,
362- .commit = shmob_drm_crtc_mode_commit ,
363- .atomic_check = shmob_drm_crtc_atomic_check ,
364- .atomic_begin = shmob_drm_crtc_atomic_begin ,
365352 .atomic_flush = shmob_drm_crtc_atomic_flush ,
353+ .atomic_enable = shmob_drm_crtc_atomic_enable ,
354+ .atomic_disable = shmob_drm_crtc_atomic_disable ,
366355};
367356
368357static int shmob_drm_crtc_page_flip (struct drm_crtc * crtc ,
0 commit comments