mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
64d17f25dc
We do not support atomic modesetting on pre-nv50 hardware, but until now our connector code was setting drm_connector->state on pre-nv50 hardware. This causes the core to enter atomic modesetting paths in at least: 1. drm_connector_get_encoder(), returning connector->state->best_encoder which is always 0, causing us to always report 0 as encoder_id in the drmModeConnector struct returned by drmModeGetConnector(). 2. drm_encoder_get_crtc(), returning NULL because uses_atomic get set, causing us to always report 0 as crtc_id in the drmModeEncoder struct returned by drmModeGetEncoder() Which in turn confuses userspace, at least plymouth thinks that the pipe has changed because of this and tries to reconfigure it unnecessarily. More in general we should not set drm_connector->state in the non-atomic code as this violates the drm-core's expectations. This commit fixes this by using a nouveau_conn_atom struct embedded in the nouveau_connector struct for property handling in the non-atomic case. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1706557 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
225 lines
6.0 KiB
C
225 lines
6.0 KiB
C
/*
|
|
* Copyright (C) 2008 Maarten Maathuis.
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifndef __NOUVEAU_CONNECTOR_H__
|
|
#define __NOUVEAU_CONNECTOR_H__
|
|
|
|
#include <nvif/notify.h>
|
|
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drm_encoder.h>
|
|
#include <drm/drm_dp_helper.h>
|
|
#include <drm/drm_util.h>
|
|
|
|
#include "nouveau_crtc.h"
|
|
#include "nouveau_encoder.h"
|
|
|
|
struct nvkm_i2c_port;
|
|
struct dcb_output;
|
|
|
|
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
|
|
struct nouveau_backlight;
|
|
#endif
|
|
|
|
#define nouveau_conn_atom(p) \
|
|
container_of((p), struct nouveau_conn_atom, state)
|
|
|
|
struct nouveau_conn_atom {
|
|
struct drm_connector_state state;
|
|
|
|
struct {
|
|
/* The enum values specifically defined here match nv50/gf119
|
|
* hw values, and the code relies on this.
|
|
*/
|
|
enum {
|
|
DITHERING_MODE_OFF = 0x00,
|
|
DITHERING_MODE_ON = 0x01,
|
|
DITHERING_MODE_DYNAMIC2X2 = 0x10 | DITHERING_MODE_ON,
|
|
DITHERING_MODE_STATIC2X2 = 0x18 | DITHERING_MODE_ON,
|
|
DITHERING_MODE_TEMPORAL = 0x20 | DITHERING_MODE_ON,
|
|
DITHERING_MODE_AUTO
|
|
} mode;
|
|
enum {
|
|
DITHERING_DEPTH_6BPC = 0x00,
|
|
DITHERING_DEPTH_8BPC = 0x02,
|
|
DITHERING_DEPTH_AUTO
|
|
} depth;
|
|
} dither;
|
|
|
|
struct {
|
|
int mode; /* DRM_MODE_SCALE_* */
|
|
struct {
|
|
enum {
|
|
UNDERSCAN_OFF,
|
|
UNDERSCAN_ON,
|
|
UNDERSCAN_AUTO,
|
|
} mode;
|
|
u32 hborder;
|
|
u32 vborder;
|
|
} underscan;
|
|
bool full;
|
|
} scaler;
|
|
|
|
struct {
|
|
int color_vibrance;
|
|
int vibrant_hue;
|
|
} procamp;
|
|
|
|
union {
|
|
struct {
|
|
bool dither:1;
|
|
bool scaler:1;
|
|
bool procamp:1;
|
|
};
|
|
u8 mask;
|
|
} set;
|
|
};
|
|
|
|
struct nouveau_connector {
|
|
struct drm_connector base;
|
|
enum dcb_connector_type type;
|
|
u8 index;
|
|
u8 *dcb;
|
|
|
|
struct nvif_notify hpd;
|
|
|
|
struct drm_dp_aux aux;
|
|
|
|
int dithering_mode;
|
|
int scaling_mode;
|
|
|
|
struct nouveau_encoder *detected_encoder;
|
|
struct edid *edid;
|
|
struct drm_display_mode *native_mode;
|
|
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
|
|
struct nouveau_backlight *backlight;
|
|
#endif
|
|
/*
|
|
* Our connector property code expects a nouveau_conn_atom struct
|
|
* even on pre-nv50 where we do not support atomic. This embedded
|
|
* version gets used in the non atomic modeset case.
|
|
*/
|
|
struct nouveau_conn_atom properties_state;
|
|
};
|
|
|
|
static inline struct nouveau_connector *nouveau_connector(
|
|
struct drm_connector *con)
|
|
{
|
|
return container_of(con, struct nouveau_connector, base);
|
|
}
|
|
|
|
static inline bool
|
|
nouveau_connector_is_mst(struct drm_connector *connector)
|
|
{
|
|
const struct nouveau_encoder *nv_encoder;
|
|
const struct drm_encoder *encoder;
|
|
|
|
if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
|
|
return false;
|
|
|
|
nv_encoder = find_encoder(connector, DCB_OUTPUT_ANY);
|
|
if (!nv_encoder)
|
|
return false;
|
|
|
|
encoder = &nv_encoder->base.base;
|
|
return encoder->encoder_type == DRM_MODE_ENCODER_DPMST;
|
|
}
|
|
|
|
#define nouveau_for_each_non_mst_connector_iter(connector, iter) \
|
|
drm_for_each_connector_iter(connector, iter) \
|
|
for_each_if(!nouveau_connector_is_mst(connector))
|
|
|
|
static inline struct nouveau_connector *
|
|
nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)
|
|
{
|
|
struct drm_device *dev = nv_crtc->base.dev;
|
|
struct drm_connector *connector;
|
|
struct drm_connector_list_iter conn_iter;
|
|
struct nouveau_connector *nv_connector = NULL;
|
|
struct drm_crtc *crtc = to_drm_crtc(nv_crtc);
|
|
|
|
drm_connector_list_iter_begin(dev, &conn_iter);
|
|
nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
|
|
if (connector->encoder && connector->encoder->crtc == crtc) {
|
|
nv_connector = nouveau_connector(connector);
|
|
break;
|
|
}
|
|
}
|
|
drm_connector_list_iter_end(&conn_iter);
|
|
|
|
return nv_connector;
|
|
}
|
|
|
|
struct drm_connector *
|
|
nouveau_connector_create(struct drm_device *, const struct dcb_output *);
|
|
|
|
extern int nouveau_tv_disable;
|
|
extern int nouveau_ignorelid;
|
|
extern int nouveau_duallink;
|
|
extern int nouveau_hdmimhz;
|
|
|
|
void nouveau_conn_attach_properties(struct drm_connector *);
|
|
void nouveau_conn_reset(struct drm_connector *);
|
|
struct drm_connector_state *
|
|
nouveau_conn_atomic_duplicate_state(struct drm_connector *);
|
|
void nouveau_conn_atomic_destroy_state(struct drm_connector *,
|
|
struct drm_connector_state *);
|
|
int nouveau_conn_atomic_set_property(struct drm_connector *,
|
|
struct drm_connector_state *,
|
|
struct drm_property *, u64);
|
|
int nouveau_conn_atomic_get_property(struct drm_connector *,
|
|
const struct drm_connector_state *,
|
|
struct drm_property *, u64 *);
|
|
struct drm_display_mode *nouveau_conn_native_mode(struct drm_connector *);
|
|
|
|
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
|
|
extern int nouveau_backlight_init(struct drm_connector *);
|
|
extern void nouveau_backlight_fini(struct drm_connector *);
|
|
extern void nouveau_backlight_ctor(void);
|
|
extern void nouveau_backlight_dtor(void);
|
|
#else
|
|
static inline int
|
|
nouveau_backlight_init(struct drm_connector *connector)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_fini(struct drm_connector *connector) {
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_ctor(void) {
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_dtor(void) {
|
|
}
|
|
#endif
|
|
|
|
#endif /* __NOUVEAU_CONNECTOR_H__ */
|