diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
| commit | 2863b00941bc3062ea3299ed4057acfd9e52c335 (patch) | |
| tree | bf378837a55e57e4189e9877170fd2b0d288f587 /drivers/gpu/drm/udl/udl_drv.h | |
| parent | fc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57 (diff) | |
| parent | 36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/udl/udl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 072582570a4f..e9e9b1ff678e 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -113,7 +113,7 @@ udl_fb_user_fb_create(struct drm_device *dev, struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd); -int udl_render_hline(struct drm_device *dev, int bpp, struct urb **urb_ptr, +int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr, const char *front, char **urb_buf_ptr, u32 byte_offset, u32 device_byte_offset, u32 byte_width, int *ident_ptr, int *sent_ptr); |