mirror of
https://github.com/torvalds/linux.git
synced 2026-05-05 06:52:34 -04:00
25feda6fbd
More arrays (and arguments) for dcpd were set to 16, when it looks like
DP_RECEIVER_CAP_SIZE (15) should be used. Fix the remaining cases, seen
with GCC 13:
../drivers/gpu/drm/nouveau/nvif/outp.c: In function 'nvif_outp_acquire_dp':
../include/linux/fortify-string.h:57:33: warning: array subscript 'unsigned char[16][0]' is partly outside array bounds of 'u8[15]' {aka 'unsigned char[15]'} [-Warray-bounds=]
57 | #define __underlying_memcpy __builtin_memcpy
| ^
...
../drivers/gpu/drm/nouveau/nvif/outp.c:140:9: note: in expansion of macro 'memcpy'
140 | memcpy(args.dp.dpcd, dpcd, sizeof(args.dp.dpcd));
| ^~~~~~
../drivers/gpu/drm/nouveau/nvif/outp.c:130:49: note: object 'dpcd' of size [0, 15]
130 | nvif_outp_acquire_dp(struct nvif_outp *outp, u8 dpcd[DP_RECEIVER_CAP_SIZE],
| ~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes: 8134437213 ("drm/nouveau/disp: move DP link config into acquire")
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <git@karolherbst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230204184307.never.825-kees@kernel.org
99 lines
2.3 KiB
C
99 lines
2.3 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NVKM_DISP_OUTP_H__
|
|
#define __NVKM_DISP_OUTP_H__
|
|
#include "priv.h"
|
|
|
|
#include <drm/display/drm_dp.h>
|
|
#include <subdev/bios.h>
|
|
#include <subdev/bios/dcb.h>
|
|
#include <subdev/bios/dp.h>
|
|
|
|
struct nvkm_outp {
|
|
const struct nvkm_outp_func *func;
|
|
struct nvkm_disp *disp;
|
|
int index;
|
|
struct dcb_output info;
|
|
|
|
struct nvkm_i2c_bus *i2c;
|
|
|
|
struct list_head head;
|
|
struct nvkm_conn *conn;
|
|
bool identity;
|
|
|
|
/* Assembly state. */
|
|
#define NVKM_OUTP_PRIV 1
|
|
#define NVKM_OUTP_USER 2
|
|
u8 acquired:2;
|
|
struct nvkm_ior *ior;
|
|
|
|
union {
|
|
struct {
|
|
bool dual;
|
|
bool bpc8;
|
|
} lvds;
|
|
|
|
struct {
|
|
struct nvbios_dpout info;
|
|
u8 version;
|
|
|
|
struct nvkm_i2c_aux *aux;
|
|
|
|
bool enabled;
|
|
bool aux_pwr;
|
|
bool aux_pwr_pu;
|
|
u8 lttpr[6];
|
|
u8 lttprs;
|
|
u8 dpcd[DP_RECEIVER_CAP_SIZE];
|
|
|
|
struct {
|
|
int dpcd; /* -1, or index into SUPPORTED_LINK_RATES table */
|
|
u32 rate;
|
|
} rate[8];
|
|
int rates;
|
|
int links;
|
|
|
|
struct mutex mutex;
|
|
struct {
|
|
atomic_t done;
|
|
u8 nr;
|
|
u8 bw;
|
|
bool mst;
|
|
} lt;
|
|
} dp;
|
|
};
|
|
|
|
struct nvkm_object object;
|
|
struct {
|
|
struct nvkm_head *head;
|
|
} asy;
|
|
};
|
|
|
|
int nvkm_outp_new_(const struct nvkm_outp_func *, struct nvkm_disp *, int index,
|
|
struct dcb_output *, struct nvkm_outp **);
|
|
int nvkm_outp_new(struct nvkm_disp *, int index, struct dcb_output *, struct nvkm_outp **);
|
|
void nvkm_outp_del(struct nvkm_outp **);
|
|
void nvkm_outp_init(struct nvkm_outp *);
|
|
void nvkm_outp_fini(struct nvkm_outp *);
|
|
int nvkm_outp_acquire(struct nvkm_outp *, u8 user, bool hda);
|
|
void nvkm_outp_release(struct nvkm_outp *, u8 user);
|
|
void nvkm_outp_route(struct nvkm_disp *);
|
|
|
|
struct nvkm_outp_func {
|
|
void *(*dtor)(struct nvkm_outp *);
|
|
void (*init)(struct nvkm_outp *);
|
|
void (*fini)(struct nvkm_outp *);
|
|
int (*acquire)(struct nvkm_outp *);
|
|
void (*release)(struct nvkm_outp *);
|
|
void (*disable)(struct nvkm_outp *, struct nvkm_ior *);
|
|
};
|
|
|
|
#define OUTP_MSG(o,l,f,a...) do { \
|
|
struct nvkm_outp *_outp = (o); \
|
|
nvkm_##l(&_outp->disp->engine.subdev, "outp %02x:%04x:%04x: "f"\n", \
|
|
_outp->index, _outp->info.hasht, _outp->info.hashm, ##a); \
|
|
} while(0)
|
|
#define OUTP_ERR(o,f,a...) OUTP_MSG((o), error, f, ##a)
|
|
#define OUTP_DBG(o,f,a...) OUTP_MSG((o), debug, f, ##a)
|
|
#define OUTP_TRACE(o,f,a...) OUTP_MSG((o), trace, f, ##a)
|
|
#endif
|