Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:21:34 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_fbc.c
Log Message:
Tweak intel_fbc.c to make it compile.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c
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_fbc.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.2 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c Mon Aug 27 07:21:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_fbc.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_fbc.c,v 1.3 2018/08/27 07:21:33 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbc.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbc.c,v 1.3 2018/08/27 07:21:33 riastradh Exp $");
#include "intel_drv.h"
#include "i915_drv.h"
@@ -530,7 +530,7 @@ static void set_no_fbc_reason(struct drm
static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
{
struct drm_crtc *crtc = NULL, *tmp_crtc;
- enum pipe pipe;
+ enum i915_pipe pipe;
bool pipe_a_only = false;
if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)
@@ -555,7 +555,7 @@ static struct drm_crtc *intel_fbc_find_c
static bool multiple_pipes_ok(struct drm_i915_private *dev_priv)
{
- enum pipe pipe;
+ enum i915_pipe pipe;
int n_pipes = 0;
struct drm_crtc *crtc;
@@ -663,7 +663,7 @@ static int intel_fbc_alloc_cfb(struct dr
dev_priv->fbc.uncompressed_size = size;
- DRM_DEBUG_KMS("reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n",
+ DRM_DEBUG_KMS("reserved %"PRIu64" bytes of contiguous stolen space for FBC, threshold: %d\n",
dev_priv->fbc.compressed_fb.size,
dev_priv->fbc.threshold);
@@ -1087,9 +1087,13 @@ void intel_fbc_flush(struct drm_i915_pri
*/
void intel_fbc_init(struct drm_i915_private *dev_priv)
{
- enum pipe pipe;
+ enum i915_pipe pipe;
+#ifdef __NetBSD__
+ linux_mutex_init(&dev_priv->fbc.lock);
+#else
mutex_init(&dev_priv->fbc.lock);
+#endif
if (!HAS_FBC(dev_priv)) {
dev_priv->fbc.enabled = false;
