| Message ID | 1444888618-4506-13-git-send-email-mikko.rapeli@iki.fi (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 15 October 2015 at 06:55, Mikko Rapeli <mikko.rapeli@iki.fi> wrote: > Fixes userspace compile error: > > drm/sis_drm.h:68:19: error: field ‘obj_list’ has incomplete type > struct list_head obj_list; > > Suggested by Emil Velikov <emil.l.velikov@gmail.com> at > https://lkml.org/lkml/2015/6/3/792 > > Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> > --- Analogous to the via patch. Daniel can you please pick this one as well ? Hunk was added with commit fdc0b8a63c1124bb025a2846d41531a123845740 Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Thanks Emil
On Wed, Oct 21, 2015 at 03:39:07PM +0100, Emil Velikov wrote: > On 15 October 2015 at 06:55, Mikko Rapeli <mikko.rapeli@iki.fi> wrote: > > Fixes userspace compile error: > > > > drm/sis_drm.h:68:19: error: field ‘obj_list’ has incomplete type > > struct list_head obj_list; > > > > Suggested by Emil Velikov <emil.l.velikov@gmail.com> at > > https://lkml.org/lkml/2015/6/3/792 > > > > Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> > > --- > Analogous to the via patch. Daniel can you please pick this one as well ? > > Hunk was added with commit fdc0b8a63c1124bb025a2846d41531a123845740 > > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Same deal, already merged. -Daniel
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h index 16f972b..328f8a7 100644 --- a/drivers/gpu/drm/sis/sis_drv.h +++ b/drivers/gpu/drm/sis/sis_drv.h @@ -67,6 +67,10 @@ typedef struct drm_sis_private { struct idr object_idr; } drm_sis_private_t; +struct sis_file_private { + struct list_head obj_list; +}; + extern int sis_idle(struct drm_device *dev); extern void sis_reclaim_buffers_locked(struct drm_device *dev, struct drm_file *file_priv); diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h index df37632..374858c 100644 --- a/include/uapi/drm/sis_drm.h +++ b/include/uapi/drm/sis_drm.h @@ -64,8 +64,4 @@ typedef struct { unsigned long offset, size; } drm_sis_fb_t; -struct sis_file_private { - struct list_head obj_list; -}; - #endif /* __SIS_DRM_H__ */
Fixes userspace compile error: drm/sis_drm.h:68:19: error: field ‘obj_list’ has incomplete type struct list_head obj_list; Suggested by Emil Velikov <emil.l.velikov@gmail.com> at https://lkml.org/lkml/2015/6/3/792 Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> --- drivers/gpu/drm/sis/sis_drv.h | 4 ++++ include/uapi/drm/sis_drm.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)