Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:27:00 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_overlay.c intel_panel.c
intel_pm.c
Log Message:
enum pipe -> enum i915_pipe
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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_overlay.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.7 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c Mon Aug 27 07:26:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_overlay.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_overlay.c,v 1.8 2018/08/27 07:26:59 riastradh Exp $ */
/*
* Copyright © 2009
@@ -28,7 +28,7 @@
* Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.8 2018/08/27 07:26:59 riastradh Exp $");
#include <linux/kernel.h>
#include <asm/io.h>
@@ -767,7 +767,7 @@ static int intel_overlay_do_put_image(st
bool scale_changed = false;
struct drm_device *dev __diagused = overlay->dev;
u32 swidth, swidthsw, sheight, ostride;
- enum pipe pipe = overlay->crtc->pipe;
+ enum i915_pipe pipe = overlay->crtc->pipe;
WARN_ON(!mutex_is_locked(&dev->struct_mutex));
WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.8 Mon Aug 27 06:16:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Mon Aug 27 07:26:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_panel.c,v 1.8 2018/08/27 06:16:50 riastradh Exp $ */
+/* $NetBSD: intel_panel.c,v 1.9 2018/08/27 07:26:59 riastradh Exp $ */
/*
* Copyright © 2006-2010 Intel Corporation
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.8 2018/08/27 06:16:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.9 2018/08/27 07:26:59 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -1061,7 +1061,7 @@ static void bxt_enable_backlight(struct
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_panel *panel = &connector->panel;
- enum pipe pipe = intel_get_pipe_from_connector(connector);
+ enum i915_pipe pipe = intel_get_pipe_from_connector(connector);
u32 pwm_ctl, val;
/* To use 2nd set of backlight registers, utility pin has to be
@@ -1453,7 +1453,7 @@ static u32 get_backlight_min_vbt(struct
return scale(min, 0, 255, 0, panel->backlight.max);
}
-static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused)
+static int lpt_setup_backlight(struct intel_connector *connector, enum i915_pipe unused)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1483,7 +1483,7 @@ static int lpt_setup_backlight(struct in
return 0;
}
-static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
+static int pch_setup_backlight(struct intel_connector *connector, enum i915_pipe unused)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1514,7 +1514,7 @@ static int pch_setup_backlight(struct in
return 0;
}
-static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
+static int i9xx_setup_backlight(struct intel_connector *connector, enum i915_pipe unused)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1552,7 +1552,7 @@ static int i9xx_setup_backlight(struct i
return 0;
}
-static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
+static int i965_setup_backlight(struct intel_connector *connector, enum i915_pipe unused)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1586,7 +1586,7 @@ static int i965_setup_backlight(struct i
return 0;
}
-static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
+static int vlv_setup_backlight(struct intel_connector *connector, enum i915_pipe pipe)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1620,7 +1620,7 @@ static int vlv_setup_backlight(struct in
}
static int
-bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
+bxt_setup_backlight(struct intel_connector *connector, enum i915_pipe unused)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1666,7 +1666,7 @@ bxt_setup_backlight(struct intel_connect
}
static int pwm_setup_backlight(struct intel_connector *connector,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
struct drm_device *dev = connector->base.dev;
struct intel_panel *panel = &connector->panel;
@@ -1698,8 +1698,9 @@ static int pwm_setup_backlight(struct in
return 0;
}
+#endif
-int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
+int intel_panel_setup_backlight(struct drm_connector *connector, enum i915_pipe pipe)
{
struct drm_device *dev = connector->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.11 Mon Aug 27 06:25:18 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Mon Aug 27 07:26:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_pm.c,v 1.11 2018/08/27 06:25:18 riastradh Exp $ */
+/* $NetBSD: intel_pm.c,v 1.12 2018/08/27 07:26:59 riastradh Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.11 2018/08/27 06:25:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.12 2018/08/27 07:26:59 riastradh Exp $");
#include <linux/bitops.h>
#include <linux/cpufreq.h>
@@ -346,7 +346,7 @@ static const int pessimal_latency_ns = 5
((((dsparb) >> (lo_shift)) & 0xff) | ((((dsparb2) >> (hi_shift)) & 0x1) << 8))
static int vlv_get_fifo_size(struct drm_device *dev,
- enum pipe pipe, int plane)
+ enum i915_pipe pipe, int plane)
{
struct drm_i915_private *dev_priv = dev->dev_private;
int sprite0_start, sprite1_start, size;
@@ -832,7 +832,7 @@ static void vlv_write_wm_values(struct i
const struct vlv_wm_values *wm)
{
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
- enum pipe pipe = crtc->pipe;
+ enum i915_pipe pipe = crtc->pipe;
I915_WRITE(VLV_DDL(pipe),
(wm->ddl[pipe].cursor << DDL_CURSOR_SHIFT) |
@@ -1294,7 +1294,7 @@ static void vlv_merge_wm(struct drm_devi
for_each_intel_crtc(dev, crtc) {
struct vlv_wm_state *wm_state = &crtc->wm_state;
- enum pipe pipe = crtc->pipe;
+ enum i915_pipe pipe = crtc->pipe;
if (!crtc->active)
continue;
@@ -1315,7 +1315,7 @@ static void vlv_update_wm(struct drm_crt
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
struct vlv_wm_values wm = {};
vlv_compute_wm(intel_crtc);
@@ -2907,7 +2907,7 @@ skl_allocate_pipe_ddb(struct drm_crtc *c
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
struct skl_ddb_entry *alloc = &ddb->pipe[pipe];
uint16_t alloc_size, start, cursor_blocks;
uint16_t minimum[I915_MAX_PLANES];
@@ -3059,7 +3059,7 @@ static bool skl_ddb_allocation_changed(c
struct drm_device *dev = intel_crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb;
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
if (memcmp(new_ddb->plane[pipe], cur_ddb->plane[pipe],
sizeof(new_ddb->plane[pipe])))
@@ -3095,7 +3095,7 @@ static void skl_compute_wm_pipe_paramete
{
struct drm_device *dev = crtc->dev;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
struct drm_plane *plane;
struct drm_framebuffer *fb;
int i = 1; /* Index for sprite planes start */
@@ -3231,7 +3231,7 @@ static bool skl_compute_plane_wm(const s
static void skl_compute_wm_level(const struct drm_i915_private *dev_priv,
struct skl_ddb_allocation *ddb,
struct skl_pipe_wm_parameters *p,
- enum pipe pipe,
+ enum i915_pipe pipe,
int level,
int num_planes,
struct skl_wm_level *result)
@@ -3313,7 +3313,7 @@ static void skl_compute_wm_results(struc
struct intel_crtc *intel_crtc)
{
int level, max_level = ilk_wm_max_level(dev);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
uint32_t temp;
int i;
@@ -3381,7 +3381,7 @@ static void skl_write_wm_values(struct d
list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) {
int i, level, max_level = ilk_wm_max_level(dev);
- enum pipe pipe = crtc->pipe;
+ enum i915_pipe pipe = crtc->pipe;
if (!new->dirty[pipe])
continue;
@@ -3440,7 +3440,7 @@ static void skl_write_wm_values(struct d
*/
static void
-skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, int pass)
+skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int pass)
{
int plane;
@@ -3456,7 +3456,7 @@ skl_wm_flush_pipe(struct drm_i915_privat
static bool
skl_ddb_allocation_included(const struct skl_ddb_allocation *old,
const struct skl_ddb_allocation *new,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
uint16_t old_size, new_size;
@@ -3475,7 +3475,7 @@ static void skl_flush_wm_values(struct d
struct skl_ddb_allocation *cur_ddb, *new_ddb;
bool reallocated[I915_MAX_PIPES] = {};
struct intel_crtc *crtc;
- enum pipe pipe;
+ enum i915_pipe pipe;
new_ddb = &new_values->ddb;
cur_ddb = &dev_priv->wm.skl_hw.ddb;
@@ -3619,7 +3619,7 @@ static void skl_update_other_pipe_wm(str
}
}
-static void skl_clear_wm(struct skl_wm_values *watermarks, enum pipe pipe)
+static void skl_clear_wm(struct skl_wm_values *watermarks, enum i915_pipe pipe)
{
watermarks->wm_linetime[pipe] = 0;
memset(watermarks->plane[pipe], 0,
@@ -3891,7 +3891,7 @@ static void ilk_pipe_wm_get_hw_state(str
struct ilk_wm_values *hw = &dev_priv->wm.hw;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_pipe_wm *active = &intel_crtc->wm.active;
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
static const unsigned int wm0_pipe_reg[] = {
[PIPE_A] = WM0_PIPEA_ILK,
[PIPE_B] = WM0_PIPEB_ILK,
@@ -3941,7 +3941,7 @@ static void ilk_pipe_wm_get_hw_state(str
static void vlv_read_wm_values(struct drm_i915_private *dev_priv,
struct vlv_wm_values *wm)
{
- enum pipe pipe;
+ enum i915_pipe pipe;
uint32_t tmp;
for_each_pipe(dev_priv, pipe) {
@@ -6328,7 +6328,7 @@ static void ibx_init_clock_gating(struct
static void g4x_disable_trickle_feed(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- enum pipe pipe;
+ enum i915_pipe pipe;
for_each_pipe(dev_priv, pipe) {
I915_WRITE(DSPCNTR(pipe),
@@ -6625,7 +6625,7 @@ static void lpt_suspend_hw(struct drm_de
static void broadwell_init_clock_gating(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- enum pipe pipe;
+ enum i915_pipe pipe;
uint32_t misccpctl;
ilk_init_lp_watermarks(dev);
