diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
| commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
| tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /drivers/gpu/drm/drm_atomic.c | |
| parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 7ada75919756..2870ae205237 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
| @@ -1106,7 +1106,7 @@ static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p, | |||
| 1106 | struct drm_connector *connector; | 1106 | struct drm_connector *connector; |
| 1107 | struct drm_connector_list_iter conn_iter; | 1107 | struct drm_connector_list_iter conn_iter; |
| 1108 | 1108 | ||
| 1109 | if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) | 1109 | if (!drm_drv_uses_atomic_modeset(dev)) |
| 1110 | return; | 1110 | return; |
| 1111 | 1111 | ||
| 1112 | list_for_each_entry(plane, &config->plane_list, head) { | 1112 | list_for_each_entry(plane, &config->plane_list, head) { |