Put back the ``address'' field to struct drm_buf, this allows machdrm to

actually compile again (no one's tested it yet, still and I don't have
one).

2 files changed, 2 insertions, 0 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 5afddd92726..b1126a9c8f3 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -297,6 +297,7 @@ typedef struct drm_buf {
 	int		  total;       /* Buffer size			     */
 	int		  used;	       /* Amount of buffer in use (for DMA)  */
 	unsigned long	  offset;      /* Byte offset (used internally)	     */
+	void 		  *address;      /* Byte offset (used internally)	     */
 	unsigned long	  bus_address; /* Bus address of buffer		     */
 	__volatile__ int  pending;     /* On hardware DMA queue		     */
 	struct drm_file   *file_priv;  /* Unique identifier of holding process */
diff --git a/sys/dev/pci/drm/drm_bufs.c b/sys/dev/pci/drm/drm_bufs.c
index 1ddb0efd5ef..7607a0d83ad 100644
--- a/sys/dev/pci/drm/drm_bufs.c
+++ b/sys/dev/pci/drm/drm_bufs.c
@@ -623,6 +623,7 @@ drm_do_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 			buf->total = alignment;
 			buf->used = 0;
 			buf->offset = (dma->byte_count + byte_count + offset);
+			buf->address = dmah->vaddr + offset;
 			buf->bus_address = dmah->busaddr + offset;
 			buf->pending = 0;
 			buf->file_priv = NULL;