On Thu, Jul 18, 2019 at 06:15:07PM +0200, Sam Ravnborg wrote: > drm_file used drm_magic_t from uapi/drm/drm.h. > This is a simple unsigned int. > Just opencode it as such to break the dependency from this header file > to uapi. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Passes my build tests, thanks for the clean-ups! Reviewed-by: Sean Paul <sean@xxxxxxxxxx> > Suggested-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Sean Paul <seanpaul@xxxxxxxxxxxx> > Cc: Liviu Dudau <Liviu.Dudau@xxxxxxx> > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > Cc: Eric Anholt <eric@xxxxxxxxxx> > --- > include/drm/drm_file.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h > index 67af60bb527a..046cd1bf91eb 100644 > --- a/include/drm/drm_file.h > +++ b/include/drm/drm_file.h > @@ -34,8 +34,6 @@ > #include <linux/completion.h> > #include <linux/idr.h> > > -#include <uapi/drm/drm.h> > - > #include <drm/drm_prime.h> > > struct dma_fence; > @@ -227,7 +225,7 @@ struct drm_file { > struct pid *pid; > > /** @magic: Authentication magic, see @authenticated. */ > - drm_magic_t magic; > + unsigned int magic; > > /** > * @lhead: > -- > 2.20.1 > -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx