diff options
Diffstat (limited to '0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch')
| -rw-r--r-- | 0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch | 158 |
1 files changed, 0 insertions, 158 deletions
diff --git a/0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch b/0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch deleted file mode 100644 index 548304eab..000000000 --- a/0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 37a68eab4cd92b507c9e8afd760fdc18e4fecac6 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Thu, 24 Oct 2019 10:52:52 +0200 -Subject: [PATCH v2 1/2] drm/nouveau: Move the declaration of struct - nouveau_conn_atom up a bit - -Place the declaration of struct nouveau_conn_atom above that of -struct nouveau_connector. This commit makes no changes to the moved -block what so ever, it just moves it up a bit. - -This is a preparation patch to fix some issues with connector handling -on pre nv50 displays (which do not use atomic modesetting). - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> -Reviewed-by: Lyude Paul <lyude@redhat.com> -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- - drivers/gpu/drm/nouveau/nouveau_connector.h | 110 ++++++++++---------- - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h -index f43a8d63aef8..de9588420884 100644 ---- a/drivers/gpu/drm/nouveau/nouveau_connector.h -+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h -@@ -29,6 +29,7 @@ - - #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> -@@ -44,6 +45,60 @@ struct dcb_output; - 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; -@@ -121,61 +176,6 @@ extern int nouveau_ignorelid; - extern int nouveau_duallink; - extern int nouveau_hdmimhz; - --#include <drm/drm_crtc.h> --#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; --}; -- - void nouveau_conn_attach_properties(struct drm_connector *); - void nouveau_conn_reset(struct drm_connector *); - struct drm_connector_state * --- -2.23.0 - |