diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c
index 92665e0552..4f5f802a4e 100644
--- a/src/drivers/intel/gma/opregion.c
+++ b/src/drivers/intel/gma/opregion.c
@@ -367,8 +367,8 @@ enum cb_err intel_gma_init_igd_opregion(void)
 	/* 8kb */
 	opregion->header.size = sizeof(igd_opregion_t) / 1024;
 
-	// FIXME We just assume we're mobile for now
-	opregion->header.mailboxes = MAILBOXES_MOBILE;
+	// Supported mailboxes
+	opregion->header.mailboxes = IGD_MAILBOXES;
 
 	// TODO Initialize Mailbox 1
 	opregion->mailbox1.clid = 1;
diff --git a/src/drivers/intel/gma/opregion.h b/src/drivers/intel/gma/opregion.h
index 2de9213743..77fccf8e54 100644
--- a/src/drivers/intel/gma/opregion.h
+++ b/src/drivers/intel/gma/opregion.h
@@ -41,8 +41,7 @@ typedef struct {
 #define IGD_MBOX4	(1 << 3)
 #define IGD_MBOX5	(1 << 4)
 
-#define MAILBOXES_MOBILE  (IGD_MBOX1 | IGD_MBOX3 | IGD_MBOX4 | IGD_MBOX5)
-#define MAILBOXES_DESKTOP (IGD_MBOX2 | IGD_MBOX4)
+#define IGD_MAILBOXES	(IGD_MBOX1 | IGD_MBOX3 | IGD_MBOX4 | IGD_MBOX5)
 
 #define SBIOS_VERSION_SIZE 32