Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:58:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_uapi.c
Log Message:
modify local diff to avoid shadowing
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.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_uapi.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.5 Sun Dec 19 01:58:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c Sun Dec 19 01:58:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $ */
+/* $NetBSD: drm_atomic_uapi.c,v 1.6 2021/12/19 01:58:41 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.6 2021/12/19 01:58:41 riastradh Exp $");
#include <drm/drm_atomic_uapi.h>
#include <drm/drm_atomic.h>
@@ -682,7 +682,6 @@ static int drm_atomic_connector_set_prop
struct drm_device *dev = connector->dev;
struct drm_mode_config *config = &dev->mode_config;
bool replaced = false;
- int ret;
if (property == config->prop_crtc_id) {
struct drm_crtc *crtc = drm_crtc_find(dev, file_priv, val);
@@ -734,6 +733,7 @@ static int drm_atomic_connector_set_prop
if (state->link_status != DRM_LINK_STATUS_GOOD)
state->link_status = val;
} else if (property == config->hdr_output_metadata_property) {
+ int ret;
ret = drm_atomic_replace_property_blob_from_id(dev,
&state->hdr_output_metadata,
val,
