← Back to branch summary

~ubuntu-branches/ubuntu/raring/xserver-xorg-video-nouveau/raring

~ubuntu-branches/ubuntu/raring/xserver-xorg-video-nouveau/raring

« back to all changes in this revision

Viewing changes to src/nouveau_connector.h

Committer: Bazaar Package Importer
Author(s): Christopher James Halse Rogers
Date: 2009-12-04 12:31:58 UTC
mfrom: (1.1.8 upstream)
Revision ID: james.westby@ubuntu.com-20091204123158-oc7ytykkz8anvr6i

Tags: 1:0.0.15+git20100128+2630a15-0ubuntu1

* New upstream snapshot
  + Too many commits to usefully list in the changelog.
  + User modesetting code is now removed.  Nouveau will now only work with
    KMS.
* debian/control:
  + Bump versioned Build-Dep on libdrm-dev to >= 2.4.17-1ubuntu1~ to pick
    up nouveau #define updates.
  + Bump build-dep on xserver-xorg-dev to >= 2:1.7.  Nouveau now requires
    xorg-server >= 1.7.
  + Drop duplicate build-dep on xserver-xorg-dev
  + List the Build-Depends one-to-a-line for clarity
  + Drop the Depends: on linux-nouveau-modules.  Replace with temporary
    Depends against apw's linux-backports-modules-nouveau* packages.
  + Bump Standards version to 3.8.3.
* debian/README.source
  + Quilt patchsys README for standards version 3.8.3 compliance
* Change versioning to match Sarvatt's snapshot versioning.

files added:
.gitignore

debian/gbp.conf

man/.gitignore

files removed:
.pc

.pc/.version

README.NV1

src/nouveau_bios.h

src/nouveau_calc.c

src/nouveau_connector.h

src/nouveau_crtc.h

src/nouveau_hw.c

src/nouveau_hw.h

src/nouveau_modeset.h

src/nouveau_ms.h

src/nouveau_output.h

src/nv50_connector.c

src/nv50_crtc.c

src/nv50_cursor.c

src/nv50_dac.c

src/nv50_display.c

src/nv50_output.c

src/nv50_randr.c

src/nv50_randr.h

src/nv50_sor.c

src/nv50reg.h

src/nv_bios.c

src/nv_crtc.c

src/nv_cursor.c

src/nv_dri.c

src/nv_dri.h

src/nv_dripriv.h

src/nv_i2c.c

src/nv_local.h

src/nv_output.c

src/nv_setup.c

src/nvreg.h

files modified:
aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

debian/README.source

debian/changelog

debian/control

install-sh

ltmain.sh

snapshot-date

src/Makefile.am

src/Makefile.in

src/drmmode_display.c

src/nouveau_dri2.c

src/nouveau_exa.c

src/nouveau_local.h

src/nouveau_wfb.c

src/nouveau_xv.c

src/nv04_exa.c

src/nv04_xv_blit.c

src/nv04_xv_ovl.c

src/nv10_exa.c

src/nv10_xv_ovl.c

src/nv30_exa.c

src/nv30_shaders.c

src/nv30_shaders.h

src/nv30_xv_tex.c

src/nv40_exa.c

src/nv40_xv_tex.c

src/nv50_accel.c

src/nv50_exa.c

src/nv50_texture.h

src/nv50_xv.c

src/nv_accel_common.c

src/nv_const.h

src/nv_dma.c

src/nv_driver.c

src/nv_include.h

src/nv_proto.h

src/nv_shadow.c

src/nv_type.h

Show diffs side-by-side

added added

removed removed

src/nouveau_connector.h

1

/*

2

* Copyright 2008 Maarten Maathuis

3

*

4

* Permission is hereby granted, free of charge, to any person obtaining a

5

* copy of this software and associated documentation files (the "Software"),

6

* to deal in the Software without restriction, including without limitation

7

* the rights to use, copy, modify, merge, publish, distribute, sublicense,

8

* and/or sell copies of the Software, and to permit persons to whom the

9

* Software is furnished to do so, subject to the following conditions:

10

*

11

* The above copyright notice and this permission notice shall be included in

12

* all copies or substantial portions of the Software.

13

*

14

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

15

* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

16

* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

17

* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

18

* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

19

* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

20

* SOFTWARE.

21

*/

22

23

#ifndef __NOUVEAU_CONNECTOR_H_

24

#define __NOUVEAU_CONNECTOR_H_

25

26

#include "nv_include.h"

27

#include "nouveau_modeset.h"

28

#include "nouveau_crtc.h"

29

#include "nouveau_output.h"

30

31

/* I have yet to find specific information on connectors, so it's all derived from outputs. */

32

typedef enum {

33

CONNECTOR_NONE = 4,

34

CONNECTOR_VGA = 0,

35

CONNECTOR_DVI = 1,

36

CONNECTOR_TV = 2,

37

CONNECTOR_PANEL = 3

38

} NVConnectorType;

39

40

#define MAX_OUTPUTS_PER_CONNECTOR 2

41

42

typedef struct nouveauConnector {

43

ScrnInfoPtr scrn;

44

int index;

45

46

char *name;

47

Bool active;

48

49

NVConnectorType type;

50

51

I2CBusPtr pDDCBus;

52

int i2c_index;

53

54

/* For load detect amongst other things. */

55

nouveauOutputPtr outputs[MAX_OUTPUTS_PER_CONNECTOR];

56

int connected_output;

57

58

Bool hotplug_detected; /* better name? */

59

/* Function pointers. */

60

Bool (*HotplugDetect) (nouveauConnectorPtr connector);

61

xf86MonPtr (*DDCDetect) (nouveauConnectorPtr connector);

62

DisplayModePtr (*GetDDCModes) (nouveauConnectorPtr connector);

63

} nouveauConnectorRec;

64

65

#endif /* __NOUVEAU_CONNECTOR_H_ */

Older »