Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:24:12 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_lrc.c intel_ringbuffer.h
Log Message:
Stash the ring status page somewhere more convenient.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.4 Mon Aug 27 07:24:01 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c Mon Aug 27 07:24:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lrc.c,v 1.4 2018/08/27 07:24:01 riastradh Exp $ */
+/* $NetBSD: intel_lrc.c,v 1.5 2018/08/27 07:24:12 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.4 2018/08/27 07:24:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.5 2018/08/27 07:24:12 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/i915_drm.h>
@@ -1923,7 +1923,7 @@ void intel_logical_ring_cleanup(struct i
i915_gem_batch_pool_fini(&ring->batch_pool);
if (ring->status_page.obj) {
- kunmap(sg_page(ring->status_page.obj->pages->sgl));
+ kunmap(ring->status_page.page);
ring->status_page.obj = NULL;
}
@@ -2450,6 +2450,7 @@ static void lrc_setup_hardware_status_pa
ring->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
+ LRC_PPHWSP_PN * PAGE_SIZE;
page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
+ ring->status_page.page = page;
ring->status_page.page_addr = kmap(page);
ring->status_page.obj = default_ctx_obj;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h:1.5 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h Mon Aug 27 07:24:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ringbuffer.h,v 1.5 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_ringbuffer.h,v 1.6 2018/08/27 07:24:12 riastradh Exp $ */
#ifndef _INTEL_RINGBUFFER_H_
#define _INTEL_RINGBUFFER_H_
@@ -29,6 +29,7 @@
#define I915_RING_FREE_SPACE 64
struct intel_hw_status_page {
+ struct page *page;
u32 *page_addr;
unsigned int gfx_addr;
struct drm_i915_gem_object *obj;
