Fill in a few missing CRTC/output functions for 2064.

2 files changed, 39 insertions, 0 deletions

diff --git a/src/mga_2064_crtc.c b/src/mga_2064_crtc.c
index 62adfc0..686ddf1 100644
--- a/src/mga_2064_crtc.c
+++ b/src/mga_2064_crtc.c
@@ -73,6 +73,10 @@ typedef struct {
 static void crtc_dpms(xf86CrtcPtr crtc, int mode);
 static void crtc_save(xf86CrtcPtr crtc);
 static void crtc_restore(xf86CrtcPtr crtc);
+static Bool crtc_lock(xf86CrtcPtr crtc);
+static void crtc_unlock(xf86CrtcPtr crtc);
+static Bool crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
+                            DisplayModePtr adjusted_mode);
 static void crtc_prepare(xf86CrtcPtr crtc);
 static void crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
                           DisplayModePtr adjusted_mode, int x, int y);
@@ -83,6 +87,9 @@ static const xf86CrtcFuncsRec crtc_funcs = {
     .dpms = crtc_dpms,
     .save = crtc_save,
     .restore = crtc_restore,
+    .lock = crtc_lock,
+    .unlock = crtc_unlock,
+    .mode_fixup = crtc_mode_fixup,
     .prepare = crtc_prepare,
     .mode_set = crtc_mode_set,
     .commit = crtc_commit,
@@ -896,6 +903,24 @@ crtc_restore(xf86CrtcPtr crtc)
     state_restore(crtc, &data->saved_state, &vga->SavedReg, vga_flags);
 }
 
+static Bool
+crtc_lock(xf86CrtcPtr crtc)
+{
+    return FALSE;
+}
+
+static void
+crtc_unlock(xf86CrtcPtr crtc)
+{
+}
+
+static Bool
+crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
+                DisplayModePtr adjusted_mode)
+{
+    return TRUE;
+}
+
 static void
 crtc_prepare(xf86CrtcPtr crtc)
 {
diff --git a/src/mga_2064_output.c b/src/mga_2064_output.c
index e344b6a..4160121 100644
--- a/src/mga_2064_output.c
+++ b/src/mga_2064_output.c
@@ -44,6 +44,8 @@ typedef struct {
 } MgaOutputDataRec, *MgaOutputDataPtr;
 
 static void output_dpms(xf86OutputPtr output, int mode);
+static void output_save(xf86OutputPtr output);
+static void output_restore(xf86OutputPtr output);
 static int output_mode_valid(xf86OutputPtr output, DisplayModePtr mode);
 static int output_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
                              DisplayModePtr adjusted_mode);
@@ -57,6 +59,8 @@ static void output_destroy(xf86OutputPtr output);
 
 static const xf86OutputFuncsRec output_funcs = {
     .dpms = output_dpms,
+    .save = output_save,
+    .restore = output_restore,
     .mode_valid = output_mode_valid,
     .mode_fixup = output_mode_fixup,
     .prepare = output_prepare,
@@ -111,6 +115,16 @@ output_dpms(xf86OutputPtr output, int mode)
     OUTREG8(MGAREG_CRTCEXT_DATA, crtcext1);
 }
 
+static void
+output_save(xf86OutputPtr output)
+{
+}
+
+static void
+output_restore(xf86OutputPtr output)
+{
+}
+
 static int
 output_mode_valid(xf86OutputPtr output, DisplayModePtr mode)
 {