Message ID | 20190716064220.18157-8-sam@ravnborg.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm: drop use of drmp.h in drm-misc | expand |
On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@ravnborg.org> wrote: > > Replace use of the deprecated drmP.h header file > with relevant includes. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Acked-by: Emil Velikov <emil.velikov@collabora.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/r128/r128_ioc32.c | 3 ++- > drivers/gpu/drm/r128/r128_irq.c | 5 ++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c > index 6589f9e0310e..6ac71755c22d 100644 > --- a/drivers/gpu/drm/r128/r128_ioc32.c > +++ b/drivers/gpu/drm/r128/r128_ioc32.c > @@ -29,10 +29,11 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > * IN THE SOFTWARE. > */ > + > #include <linux/compat.h> > > -#include <drm/drmP.h> > #include <drm/r128_drm.h> > + > #include "r128_drv.h" > > typedef struct drm_r128_init32 { > diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c > index 9730f4918944..d84e9c96e20a 100644 > --- a/drivers/gpu/drm/r128/r128_irq.c > +++ b/drivers/gpu/drm/r128/r128_irq.c > @@ -30,8 +30,11 @@ > * Eric Anholt <anholt@FreeBSD.org> > */ > > -#include <drm/drmP.h> > +#include <drm/drm_device.h> > +#include <drm/drm_print.h> > +#include <drm/drm_vblank.h> > #include <drm/r128_drm.h> > + > #include "r128_drv.h" > > u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int pipe) > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c index 6589f9e0310e..6ac71755c22d 100644 --- a/drivers/gpu/drm/r128/r128_ioc32.c +++ b/drivers/gpu/drm/r128/r128_ioc32.c @@ -29,10 +29,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ + #include <linux/compat.h> -#include <drm/drmP.h> #include <drm/r128_drm.h> + #include "r128_drv.h" typedef struct drm_r128_init32 { diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index 9730f4918944..d84e9c96e20a 100644 --- a/drivers/gpu/drm/r128/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c @@ -30,8 +30,11 @@ * Eric Anholt <anholt@FreeBSD.org> */ -#include <drm/drmP.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/r128_drm.h> + #include "r128_drv.h" u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int pipe)