Skip to content

Commit e3c8898

Browse files
committed
drm: renesas: shmobile: Atomic conversion part 2
Implement atomic mode setting for the CRTC, using the existing dpms callback. Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/ca2a00200ef5ac899a6131087d0a30de1c806119.1694767209.git.geert+renesas@glider.be
1 parent 4afa041 commit e3c8898

File tree

1 file changed

+15
-26
lines changed

1 file changed

+15
-26
lines changed

drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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-
343323
static 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+
359351
static 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

368357
static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,

0 commit comments

Comments
 (0)