Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:50:01 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic.c drm_atomic_helper.c
drm_blend.c drm_dp_mst_topology.c
Log Message:
Mark unused variable as such.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/drm_atomic.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_blend.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/drm_atomic.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.9 src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic.c:1.9 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic.c Sun Dec 19 00:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic.c,v 1.9 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_atomic.c,v 1.10 2021/12/19 00:50:01 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic.c,v 1.9 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic.c,v 1.10 2021/12/19 00:50:01 riastradh Exp $");
#include <linux/sync_file.h>
@@ -1433,11 +1433,11 @@ EXPORT_SYMBOL(__drm_atomic_helper_set_co
void drm_atomic_print_state(const struct drm_atomic_state *state)
{
struct drm_printer p = drm_info_printer(state->dev->dev);
- struct drm_plane *plane;
+ struct drm_plane *plane __unused;
struct drm_plane_state *plane_state;
- struct drm_crtc *crtc;
+ struct drm_crtc *crtc __unused;
struct drm_crtc_state *crtc_state;
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *connector_state;
int i;
Index: src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c:1.6 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c Sun Dec 19 00:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_helper.c,v 1.6 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_atomic_helper.c,v 1.7 2021/12/19 00:50:01 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.6 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.7 2021/12/19 00:50:01 riastradh Exp $");
#include <linux/dma-fence.h>
#include <linux/ktime.h>
@@ -258,7 +258,7 @@ steal_encoder(struct drm_atomic_state *s
struct drm_encoder *encoder)
{
struct drm_crtc_state *crtc_state;
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *old_connector_state, *new_connector_state;
int i;
@@ -408,7 +408,7 @@ mode_fixup(struct drm_atomic_state *stat
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *new_conn_state;
int i;
int ret;
@@ -985,7 +985,7 @@ crtc_needs_disable(struct drm_crtc_state
static void
disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
{
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *old_conn_state, *new_conn_state;
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
@@ -1176,7 +1176,7 @@ crtc_set_mode(struct drm_device *dev, st
{
struct drm_crtc *crtc;
struct drm_crtc_state *new_crtc_state;
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *new_conn_state;
int i;
@@ -1299,7 +1299,7 @@ void drm_atomic_helper_commit_modeset_en
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state;
struct drm_crtc_state *new_crtc_state;
- struct drm_connector *connector;
+ struct drm_connector *connector __unused;
struct drm_connector_state *new_conn_state;
int i;
@@ -1391,7 +1391,7 @@ int drm_atomic_helper_wait_for_fences(st
struct drm_atomic_state *state,
bool pre_swap)
{
- struct drm_plane *plane;
+ struct drm_plane *plane __unused;
struct drm_plane_state *new_plane_state;
int i, ret;
@@ -1438,7 +1438,7 @@ drm_atomic_helper_wait_for_vblanks(struc
struct drm_atomic_state *old_state)
{
struct drm_crtc *crtc;
- struct drm_crtc_state *old_crtc_state, *new_crtc_state;
+ struct drm_crtc_state *old_crtc_state __unused, *new_crtc_state;
int i, ret;
unsigned crtc_mask = 0;
@@ -1669,7 +1669,7 @@ static void commit_work(struct work_stru
int drm_atomic_helper_async_check(struct drm_device *dev,
struct drm_atomic_state *state)
{
- struct drm_crtc *crtc;
+ struct drm_crtc *crtc __unused;
struct drm_crtc_state *crtc_state;
struct drm_plane *plane = NULL;
struct drm_plane_state *old_plane_state = NULL;
@@ -2042,9 +2042,9 @@ int drm_atomic_helper_setup_commit(struc
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
- struct drm_connector *conn;
+ struct drm_connector *conn __unused;
struct drm_connector_state *old_conn_state, *new_conn_state;
- struct drm_plane *plane;
+ struct drm_plane *plane __unused;
struct drm_plane_state *old_plane_state, *new_plane_state;
struct drm_crtc_commit *commit;
int i, ret;
@@ -2274,7 +2274,7 @@ EXPORT_SYMBOL(drm_atomic_helper_fake_vbl
*/
void drm_atomic_helper_commit_hw_done(struct drm_atomic_state *old_state)
{
- struct drm_crtc *crtc;
+ struct drm_crtc *crtc __unused;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
struct drm_crtc_commit *commit;
int i;
@@ -3013,9 +3013,9 @@ int drm_atomic_helper_disable_all(struct
{
struct drm_atomic_state *state;
struct drm_connector_state *conn_state;
- struct drm_connector *conn;
+ struct drm_connector *conn __unused;
struct drm_plane_state *plane_state;
- struct drm_plane *plane;
+ struct drm_plane *plane __unused;
struct drm_crtc_state *crtc_state;
struct drm_crtc *crtc;
int ret, i;
@@ -3259,11 +3259,11 @@ int drm_atomic_helper_commit_duplicated_
{
int i, ret;
struct drm_plane *plane;
- struct drm_plane_state *new_plane_state;
+ struct drm_plane_state *new_plane_state __unused;
struct drm_connector *connector;
- struct drm_connector_state *new_conn_state;
+ struct drm_connector_state *new_conn_state __unused;
struct drm_crtc *crtc;
- struct drm_crtc_state *new_crtc_state;
+ struct drm_crtc_state *new_crtc_state __unused;
state->acquire_ctx = ctx;
Index: src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c:1.6 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c Sun Dec 19 00:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_dp_mst_topology.c,v 1.6 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_dp_mst_topology.c,v 1.7 2021/12/19 00:50:01 riastradh Exp $ */
/*
* Copyright © 2014 Red Hat
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.6 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_mst_topology.c,v 1.7 2021/12/19 00:50:01 riastradh Exp $");
#include <linux/delay.h>
#include <linux/errno.h>
@@ -3143,7 +3143,7 @@ int drm_dp_send_power_updown_phy(struct
struct drm_dp_mst_port *port, bool power_up)
{
struct drm_dp_sideband_msg_tx *txmsg;
- int len, ret;
+ int len __unused, ret;
port = drm_dp_mst_topology_get_port_validated(mgr, port);
if (!port)
Index: src/sys/external/bsd/drm2/dist/drm/drm_blend.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_blend.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_blend.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_blend.c:1.3 Sun Dec 19 00:49:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_blend.c Sun Dec 19 00:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_blend.c,v 1.3 2021/12/19 00:49:51 riastradh Exp $ */
+/* $NetBSD: drm_blend.c,v 1.4 2021/12/19 00:50:01 riastradh Exp $ */
/*
* Copyright (C) 2016 Samsung Electronics Co.Ltd
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_blend.c,v 1.3 2021/12/19 00:49:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_blend.c,v 1.4 2021/12/19 00:50:01 riastradh Exp $");
#include <linux/export.h>
#include <linux/slab.h>
@@ -503,7 +503,7 @@ int drm_atomic_normalize_zpos(struct drm
{
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
- struct drm_plane *plane;
+ struct drm_plane *plane __unused;
struct drm_plane_state *old_plane_state, *new_plane_state;
int i, ret = 0;
