diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
| commit | 9627fd587c9aa066d4ce6e852b26950030f9c3cd (patch) | |
| tree | 50375cab018b3b62076bf4a6a674fca7613db68b /src/geode_ddc.c | |
| parent | 8b6ec6bb08fa9c3b19753acb436bbb8ecfae9233 (diff) | |
| parent | 7047b6da264e946e77eeee4080d194c807562d68 (diff) | |
Merge remote-tracking branch 'origin/master' into obsdobsd
Diffstat (limited to 'src/geode_ddc.c')
| -rw-r--r-- | src/geode_ddc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/geode_ddc.c b/src/geode_ddc.c index 7b8277d..0a873c4 100644 --- a/src/geode_ddc.c +++ b/src/geode_ddc.c @@ -117,7 +117,7 @@ geode_ddc_getbits(I2CBusPtr b, int *scl, int *sda) } Bool -GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, char *name) +GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, const char *name) { I2CBusPtr bus; unsigned int ddciobase; @@ -150,7 +150,7 @@ GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, char *name) if (!bus) return FALSE; - bus->BusName = name; + bus->BusName = (char *)name; bus->scrnIndex = pScrni->scrnIndex; bus->I2CGetBits = geode_ddc_getbits; @@ -173,12 +173,10 @@ GeodeGetDDC(ScrnInfoPtr pScrni) if (!GeodeI2CInit(pScrni, &bus, "CS5536 DDC BUS")) return NULL; - mon = xf86DoEDID_DDC2(DDC_CALL(pScrni), bus); + mon = xf86DoEDID_DDC2(pScrni, bus); -#if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,4,99,0,0)) if (mon) xf86DDCApplyQuirks(pScrni->scrnIndex, mon); -#endif xf86DestroyI2CBusRec(bus, FALSE, FALSE); |