Browse Source

drm: Remove deprecated tiled buffer creation helper

The sun4i-specific ioctl for creating tiled buffers is deprecated and
will be replaced by a generic one in the future. Drop it now.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Paul Kocialkowski 6 years ago
parent
commit
304d666cde
1 changed files with 0 additions and 40 deletions
  1. 0 40
      drm.c

+ 0 - 40
drm.c

@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <unistd.h>
 
 
 #include <drm_fourcc.h>
 #include <drm_fourcc.h>
-#include <sun4i_drm.h>
 #include <xf86drm.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <xf86drmMode.h>
 
 
@@ -62,42 +61,6 @@ static int create_dumb_buffer(int drm_fd, unsigned int width,
 	return 0;
 	return 0;
 }
 }
 
 
-static int create_tiled_buffer(int drm_fd, unsigned int width,
-			       unsigned int height, unsigned int format,
-			       struct gem_buffer *buffer)
-{
-	struct drm_sun4i_gem_create_tiled create_tiled;
-	unsigned int i;
-	int rc;
-
-	if (buffer == NULL)
-		return -1;
-
-	memset(&create_tiled, 0, sizeof(create_tiled));
-	create_tiled.width = width;
-	create_tiled.height = height;
-	create_tiled.format = format;
-
-	rc = drmIoctl(drm_fd, DRM_IOCTL_SUN4I_GEM_CREATE_TILED, &create_tiled);
-	if (rc < 0) {
-		fprintf(stderr, "Unable to create tiled buffer: %s\n",
-			strerror(errno));
-		return -1;
-	}
-
-	buffer->size = create_tiled.size;
-
-	for (i = 0; i < 4; i++) {
-		buffer->pitches[i] = create_tiled.pitches[i];
-		buffer->offsets[i] = create_tiled.offsets[i];
-
-		if (create_tiled.pitches[i] != 0)
-			buffer->handles[i] = create_tiled.handle;
-	}
-
-	return 0;
-}
-
 static int create_imported_buffer(int drm_fd, int *import_fds,
 static int create_imported_buffer(int drm_fd, int *import_fds,
 				  unsigned int import_fds_count,
 				  unsigned int import_fds_count,
 				  unsigned int *offsets, unsigned int *pitches,
 				  unsigned int *offsets, unsigned int *pitches,
@@ -789,9 +752,6 @@ int display_engine_start(int drm_fd, unsigned int width, unsigned int height,
 						    video_buffer->destination_offsets,
 						    video_buffer->destination_offsets,
 						    video_buffer->destination_bytesperlines,
 						    video_buffer->destination_bytesperlines,
 						    buffer);
 						    buffer);
-		else if (format->drm_modifier == DRM_FORMAT_MOD_ALLWINNER_TILED)
-			rc = create_tiled_buffer(drm_fd, width, height,
-						 format->drm_format, buffer);
 		else
 		else
 			rc = create_dumb_buffer(drm_fd, width, height,
 			rc = create_dumb_buffer(drm_fd, width, height,
 						format->bpp, buffer);
 						format->bpp, buffer);