* [PATCH v1 0/1] drm/sis: drop use of drmP.h
@ 2019-06-05 13:55 Sam Ravnborg
2019-06-05 13:55 ` [PATCH v1 1/1] drm/sis: drop drmP.h use Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2019-06-05 13:55 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie
Drop use of the deprecated drmP.h file
Sam Ravnborg (1):
drm/sis: drop drmP.h use
drivers/gpu/drm/sis/sis_drv.c | 8 +++++---
drivers/gpu/drm/sis/sis_drv.h | 10 ++++------
drivers/gpu/drm/sis/sis_mm.c | 7 +++++--
3 files changed, 14 insertions(+), 11 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 1/1] drm/sis: drop drmP.h use
2019-06-05 13:55 [PATCH v1 0/1] drm/sis: drop use of drmP.h Sam Ravnborg
@ 2019-06-05 13:55 ` Sam Ravnborg
2019-06-05 16:43 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2019-06-05 13:55 UTC (permalink / raw)
To: dri-devel; +Cc: David Airlie, Sam Ravnborg
Drop use of the deprecated drmP.h header.
Repalced with relevant header files and sorted header files in all files
touched.
Replaced DRM_{READ,WRITE} to avoid the drm_os_linux header.
Build tested with allyesconfig, allmodconfig on various architectures.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/sis/sis_drv.c | 8 +++++---
drivers/gpu/drm/sis/sis_drv.h | 10 ++++------
drivers/gpu/drm/sis/sis_mm.c | 7 +++++--
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index e04a92658cd7..ee3801201ecc 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -27,11 +27,13 @@
#include <linux/module.h>
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_pci.h>
+#include <drm/drm_pciids.h>
#include <drm/sis_drm.h>
-#include "sis_drv.h"
-#include <drm/drm_pciids.h>
+#include "sis_drv.h"
static struct pci_device_id pciidlist[] = {
sisdrv_PCI_IDS
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index 328f8a750976..81339443b3b1 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -28,7 +28,9 @@
#ifndef _SIS_DRV_H_
#define _SIS_DRV_H_
+#include <drm/drm_ioctl.h>
#include <drm/drm_legacy.h>
+#include <drm/drm_mm.h>
/* General customization:
*/
@@ -46,12 +48,8 @@ enum sis_family {
SIS_CHIP_315 = 1,
};
-#include <drm/drm_mm.h>
-
-
-#define SIS_BASE (dev_priv->mmio)
-#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg)
-#define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val)
+#define SIS_READ(reg) readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
+#define SIS_WRITE(reg, val) writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
typedef struct drm_sis_private {
drm_local_map_t *mmio;
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 1622db24cd39..e51d4289a3d0 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -31,11 +31,14 @@
* Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/
-#include <drm/drmP.h>
+#include <video/sisfb.h>
+
+#include <drm/drm_device.h>
+#include <drm/drm_file.h>
#include <drm/sis_drm.h>
+
#include "sis_drv.h"
-#include <video/sisfb.h>
#define VIDEO_TYPE 0
#define AGP_TYPE 1
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/1] drm/sis: drop drmP.h use
2019-06-05 13:55 ` [PATCH v1 1/1] drm/sis: drop drmP.h use Sam Ravnborg
@ 2019-06-05 16:43 ` Daniel Vetter
2019-06-05 18:34 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2019-06-05 16:43 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: David Airlie, dri-devel
On Wed, Jun 05, 2019 at 03:55:39PM +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header.
> Repalced with relevant header files and sorted header files in all files
> touched.
>
> Replaced DRM_{READ,WRITE} to avoid the drm_os_linux header.
>
> Build tested with allyesconfig, allmodconfig on various architectures.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/sis/sis_drv.c | 8 +++++---
> drivers/gpu/drm/sis/sis_drv.h | 10 ++++------
> drivers/gpu/drm/sis/sis_mm.c | 7 +++++--
> 3 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
> index e04a92658cd7..ee3801201ecc 100644
> --- a/drivers/gpu/drm/sis/sis_drv.c
> +++ b/drivers/gpu/drm/sis/sis_drv.c
> @@ -27,11 +27,13 @@
>
> #include <linux/module.h>
>
> -#include <drm/drmP.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_pci.h>
> +#include <drm/drm_pciids.h>
> #include <drm/sis_drm.h>
> -#include "sis_drv.h"
>
> -#include <drm/drm_pciids.h>
> +#include "sis_drv.h"
>
> static struct pci_device_id pciidlist[] = {
> sisdrv_PCI_IDS
> diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
> index 328f8a750976..81339443b3b1 100644
> --- a/drivers/gpu/drm/sis/sis_drv.h
> +++ b/drivers/gpu/drm/sis/sis_drv.h
> @@ -28,7 +28,9 @@
> #ifndef _SIS_DRV_H_
> #define _SIS_DRV_H_
>
> +#include <drm/drm_ioctl.h>
> #include <drm/drm_legacy.h>
> +#include <drm/drm_mm.h>
>
> /* General customization:
> */
> @@ -46,12 +48,8 @@ enum sis_family {
> SIS_CHIP_315 = 1,
> };
>
> -#include <drm/drm_mm.h>
> -
> -
> -#define SIS_BASE (dev_priv->mmio)
> -#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg)
> -#define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val)
> +#define SIS_READ(reg) readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
> +#define SIS_WRITE(reg, val) writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
>
> typedef struct drm_sis_private {
> drm_local_map_t *mmio;
> diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
> index 1622db24cd39..e51d4289a3d0 100644
> --- a/drivers/gpu/drm/sis/sis_mm.c
> +++ b/drivers/gpu/drm/sis/sis_mm.c
> @@ -31,11 +31,14 @@
> * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
> */
>
> -#include <drm/drmP.h>
> +#include <video/sisfb.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
> #include <drm/sis_drm.h>
> +
> #include "sis_drv.h"
>
> -#include <video/sisfb.h>
>
> #define VIDEO_TYPE 0
> #define AGP_TYPE 1
> --
> 2.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/1] drm/sis: drop drmP.h use
2019-06-05 16:43 ` Daniel Vetter
@ 2019-06-05 18:34 ` Sam Ravnborg
0 siblings, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2019-06-05 18:34 UTC (permalink / raw)
To: Daniel Vetter; +Cc: David Airlie, dri-devel
On Wed, Jun 05, 2019 at 06:43:10PM +0200, Daniel Vetter wrote:
> On Wed, Jun 05, 2019 at 03:55:39PM +0200, Sam Ravnborg wrote:
> > Drop use of the deprecated drmP.h header.
> > Repalced with relevant header files and sorted header files in all files
> > touched.
> >
> > Replaced DRM_{READ,WRITE} to avoid the drm_os_linux header.
> >
> > Build tested with allyesconfig, allmodconfig on various architectures.
> >
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Thanks, pushed to drm-misc-next
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-05 18:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 13:55 [PATCH v1 0/1] drm/sis: drop use of drmP.h Sam Ravnborg
2019-06-05 13:55 ` [PATCH v1 1/1] drm/sis: drop drmP.h use Sam Ravnborg
2019-06-05 16:43 ` Daniel Vetter
2019-06-05 18:34 ` Sam Ravnborg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.