File tree Expand file tree Collapse file tree 3 files changed +3
-25
lines changed
drivers/gpu/drm/renesas/shmobile Expand file tree Collapse file tree 3 files changed +3
-25
lines changed Original file line number Diff line number Diff line change @@ -287,19 +287,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
287
287
scrtc -> started = false;
288
288
}
289
289
290
- void shmob_drm_crtc_suspend (struct shmob_drm_crtc * scrtc )
291
- {
292
- shmob_drm_crtc_stop (scrtc );
293
- }
294
-
295
- void shmob_drm_crtc_resume (struct shmob_drm_crtc * scrtc )
296
- {
297
- if (scrtc -> dpms != DRM_MODE_DPMS_ON )
298
- return ;
299
-
300
- shmob_drm_crtc_start (scrtc );
301
- }
302
-
303
290
static inline struct shmob_drm_crtc * to_shmob_crtc (struct drm_crtc * crtc )
304
291
{
305
292
return container_of (crtc , struct shmob_drm_crtc , base );
Original file line number Diff line number Diff line change @@ -40,8 +40,6 @@ struct shmob_drm_connector {
40
40
41
41
int shmob_drm_crtc_create (struct shmob_drm_device * sdev );
42
42
void shmob_drm_crtc_finish_page_flip (struct shmob_drm_crtc * scrtc );
43
- void shmob_drm_crtc_suspend (struct shmob_drm_crtc * scrtc );
44
- void shmob_drm_crtc_resume (struct shmob_drm_crtc * scrtc );
45
43
46
44
int shmob_drm_encoder_create (struct shmob_drm_device * sdev );
47
45
int shmob_drm_connector_create (struct shmob_drm_device * sdev ,
Original file line number Diff line number Diff line change 20
20
#include <drm/drm_drv.h>
21
21
#include <drm/drm_fbdev_generic.h>
22
22
#include <drm/drm_gem_dma_helper.h>
23
+ #include <drm/drm_modeset_helper.h>
23
24
#include <drm/drm_module.h>
24
25
#include <drm/drm_probe_helper.h>
25
26
#include <drm/drm_vblank.h>
@@ -115,22 +116,14 @@ static int shmob_drm_pm_suspend(struct device *dev)
115
116
{
116
117
struct shmob_drm_device * sdev = dev_get_drvdata (dev );
117
118
118
- drm_kms_helper_poll_disable (& sdev -> ddev );
119
- shmob_drm_crtc_suspend (& sdev -> crtc );
120
-
121
- return 0 ;
119
+ return drm_mode_config_helper_suspend (& sdev -> ddev );
122
120
}
123
121
124
122
static int shmob_drm_pm_resume (struct device * dev )
125
123
{
126
124
struct shmob_drm_device * sdev = dev_get_drvdata (dev );
127
125
128
- drm_modeset_lock_all (& sdev -> ddev );
129
- shmob_drm_crtc_resume (& sdev -> crtc );
130
- drm_modeset_unlock_all (& sdev -> ddev );
131
-
132
- drm_kms_helper_poll_enable (& sdev -> ddev );
133
- return 0 ;
126
+ return drm_mode_config_helper_resume (& sdev -> ddev );
134
127
}
135
128
136
129
static int shmob_drm_pm_runtime_suspend (struct device * dev )
You can’t perform that action at this time.
0 commit comments