Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60dee18d authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit 



[ Upstream commit 37a68eab4cd92b507c9e8afd760fdc18e4fecac6 ]

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: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8b9bf467

drivers/gpu/drm/nouveau/nouveau_connector.h

+55 −55
Original line number Diff line number Diff line
@@ -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>
@@ -37,6 +38,60 @@ 


struct nvkm_i2c_port;



#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;
@@ -111,61 +166,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 *