summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_gem.c12
-rw-r--r--linux-core/i915_gem.c10
2 files changed, 18 insertions, 4 deletions
diff --git a/linux-core/drm_gem.c b/linux-core/drm_gem.c
index db12f9a6..80d5a350 100644
--- a/linux-core/drm_gem.c
+++ b/linux-core/drm_gem.c
@@ -306,6 +306,7 @@ drm_gem_mmap_ioctl(struct drm_device *dev, void *data,
struct drm_gem_mmap *args = data;
struct drm_gem_object *obj;
loff_t offset;
+ unsigned long addr;
if (!(dev->driver->driver_features & DRIVER_GEM))
return -ENODEV;
@@ -317,12 +318,15 @@ drm_gem_mmap_ioctl(struct drm_device *dev, void *data,
offset = args->offset;
down_write(&current->mm->mmap_sem);
- args->addr_ptr = (uint64_t) do_mmap(obj->filp, 0, args->size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- args->offset);
+ addr = do_mmap(obj->filp, 0, args->size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ args->offset);
up_write(&current->mm->mmap_sem);
-
drm_gem_object_unreference(obj);
+ if (IS_ERR((void *)addr))
+ return (int) addr;
+
+ args->addr_ptr = (uint64_t) addr;
return 0;
}
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index 747cc45c..e0beeb43 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -300,12 +300,14 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv);
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
/* Big hammer: flush and idle the hardware so we can map things in/out.
*/
ret = i915_gem_sync_and_evict(dev);
if (ret != 0)
return ret;
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
/* Copy in the validate list from userland */
validate_list = drm_calloc(sizeof(*validate_list), args->buffer_count,
DRM_MEM_DRIVER);
@@ -315,6 +317,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
ret = -ENOMEM;
goto err;
}
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
ret = copy_from_user(validate_list,
(struct drm_i915_relocation_entry __user*)(uintptr_t)
args->buffers_ptr,
@@ -322,6 +325,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
if (ret != 0)
goto err;
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
/* Look up object handles and perform the relocations */
for (i = 0; i < args->buffer_count; i++) {
object_list[i] = drm_gem_object_lookup(dev, file_priv,
@@ -337,6 +341,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
/* Exec the batchbuffer */
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
/* Copy the new buffer offsets back to the user's validate list. */
for (i = 0; i < args->buffer_count; i++) {
struct drm_i915_gem_object *obj_priv =
@@ -344,24 +349,29 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
validate_list[i].buffer_offset = obj_priv->gtt_offset;
}
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
ret = copy_to_user(validate_list,
(struct drm_i915_relocation_entry __user*)(uintptr_t)
args->buffers_ptr,
sizeof(*validate_list) * args->buffer_count);
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
/* Clean up and return */
ret = i915_gem_sync_and_evict(dev);
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
err:
if (object_list != NULL) {
for (i = 0; i < args->buffer_count; i++)
drm_gem_object_unreference(object_list[i]);
}
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
drm_free(object_list, sizeof(*object_list) * args->buffer_count,
DRM_MEM_DRIVER);
drm_free(validate_list, sizeof(*validate_list) * args->buffer_count,
DRM_MEM_DRIVER);
+ DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
return ret;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-28 02:55:07 +0000
267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
#include <string.h>

#include "xf86drm.h"
#include "xf86drmMode.h"

int dpms_prop_id = 0;
const char* getConnectionText(drmModeConnection conn)
{
	switch (conn) {
	case DRM_MODE_CONNECTED:
		return "connected";
	case DRM_MODE_DISCONNECTED:
		return "disconnected";
	default:
		return "unknown";
	}

}

int printMode(struct drm_mode_modeinfo *mode)
{
#if 1
	printf("Mode: %s\n", mode->name);
	printf("\tclock       : %i\n", mode->clock);
	printf("\thdisplay    : %i\n", mode->hdisplay);
	printf("\thsync_start : %i\n", mode->hsync_start);
	printf("\thsync_end   : %i\n", mode->hsync_end);
	printf("\thtotal      : %i\n", mode->htotal);
	printf("\thskew       : %i\n", mode->hskew);
	printf("\tvdisplay    : %i\n", mode->vdisplay);
	printf("\tvsync_start : %i\n", mode->vsync_start);
	printf("\tvsync_end   : %i\n", mode->vsync_end);
	printf("\tvtotal      : %i\n", mode->vtotal);
	printf("\tvscan       : %i\n", mode->vscan);
	printf("\tvrefresh    : %i\n", mode->vrefresh);
	printf("\tflags       : %i\n", mode->flags);
#else
	printf("Mode: \"%s\" %ix%i %.0f\n", mode->name,
		mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000.0);
#endif
	return 0;
}

int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
{
	int i = 0, j;
	struct drm_mode_modeinfo *mode = NULL;
	drmModePropertyPtr props;
	drmModeEncoderPtr enc;
	unsigned char *name = NULL;

	printf("Connector: %d-%d\n", connector->connector_type, connector->connector_type_id);
	printf("\tid           : %i\n", id);
	printf("\tencoder id      : %i\n", connector->encoder);
	printf("\tconn         : %s\n", getConnectionText(connector->connection));
	printf("\tsize         : %ix%i (mm)\n", connector->mmWidth, connector->mmHeight);
	printf("\tcount_modes  : %i\n", connector->count_modes);
	printf("\tcount_props  : %i\n", connector->count_props);
	printf("\tcount_encs   : %i\n", connector->count_encoders);

	for (i = 0; i < connector->count_encoders; i++) {
		enc = drmModeGetEncoder(fd, connector->encoders[i]);
		if (enc) {
			printf("Encoder: %d %d %d %d %d\n", enc->crtc, enc->encoder_id, enc->encoder_type, enc->crtcs, enc->clones);
		}
	}

	for (i = 0; i < connector->count_props; i++) {
		props = drmModeGetProperty(fd, connector->props[i]);
		name = NULL;
		if (props) {
			printf("Property: %s\n", props->name);
			printf("\tid:        %i\n", props->prop_id);
			printf("\tflags:     %i\n", props->flags);
			printf("\tvalues %d: ", props->count_values);
			for (j = 0; j < props->count_values; j++)
				printf("%lld ", props->values[j]);

			printf("\n\tenums %d: \n", props->count_enums);
			
			if (props->flags & DRM_MODE_PROP_BLOB) {
				drmModePropertyBlobPtr blob;

				blob = drmModeGetPropertyBlob(fd, connector->prop_values[i]);
				if (blob) {
					printf("blob is %d length, %08X\n", blob->length, *(uint32_t *)blob->data);
					drmModeFreePropertyBlob(blob);
				}

			} else {
				if (!strncmp(props->name, "DPMS", 4))
					dpms_prop_id = props->prop_id;

				for (j = 0; j < props->count_enums; j++) {
				  printf("\t\t%lld = %s\n", props->enums[j].value, props->enums[j].name);
					if (connector->prop_values[i] == props->enums[j].value)
						name = props->enums[j].name;

				}

				if (props->count_enums && name) {
					printf("\tconnector property name %s %s\n", props->name, name);
				} else {
					printf("\tconnector property id %s %lli\n", props->name, connector->prop_values[i]);
				}
			}

			drmModeFreeProperty(props);
		}
	}

	for (i = 0; i < connector->count_modes; i++) {
		mode = &connector->modes[i];
		if (mode)
			printMode(mode);
		else