diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 16:23:03 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-01-24 16:23:03 +0000 |
| commit | 9635adf8541ae9cbead19d769dce2c945fa88de6 (patch) | |
| tree | acab90e8fb7c2e4c04a39d72d51a55bf8b1e8b8f /drivers/gpu/drm/tiny/mi0283qt.c | |
| parent | 1ec23ed7126e6b8fab287598576e84e26e6482ef (diff) | |
| parent | 045e8d102f44ad75dca0b0ec9eede15ea89da673 (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Lets eradicate a silent conflict between drm-intel-next and
drm-intel-gt-next which added a duplicate function (try_firmware_load).
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/tiny/mi0283qt.c')
| -rw-r--r-- | drivers/gpu/drm/tiny/mi0283qt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi0283qt.c index 47df2b5a3048..01ff43c8ac3f 100644 --- a/drivers/gpu/drm/tiny/mi0283qt.c +++ b/drivers/gpu/drm/tiny/mi0283qt.c @@ -141,10 +141,7 @@ out_exit: } static const struct drm_simple_display_pipe_funcs mi0283qt_pipe_funcs = { - .mode_valid = mipi_dbi_pipe_mode_valid, - .enable = mi0283qt_enable, - .disable = mipi_dbi_pipe_disable, - .update = mipi_dbi_pipe_update, + DRM_MIPI_DBI_SIMPLE_DISPLAY_PIPE_FUNCS(mi0283qt_enable), }; static const struct drm_display_mode mi0283qt_mode = { |