diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 0dc2a62c6dc..7711f85a1db 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1849,6 +1849,22 @@ fixup_chv_device_info(struct intel_device_info *devinfo)
       memcpy(needle, bsw_model, 3);
 }
 
+static void
+fixup_adl_device_info(struct intel_device_info *devinfo)
+{
+   assert(devinfo->platform == INTEL_PLATFORM_ADL);
+   const uint32_t eu_total = intel_device_info_eu_total(devinfo);
+
+   if (eu_total >= 32)
+      return;
+
+   /* Fixes issues with:
+    * dEQP-GLES31.functional.geometry_shading.layered.render_with_default_layer_cubemap
+    * when running on ADL-N platform.
+    */
+   devinfo->urb.max_entries[MESA_SHADER_GEOMETRY] = 1024;
+}
+
 static void
 init_max_scratch_ids(struct intel_device_info *devinfo)
 {
@@ -2017,6 +2033,9 @@ intel_i915_get_device_info_from_fd(int fd, struct intel_device_info *devinfo)
    if (devinfo->platform == INTEL_PLATFORM_CHV)
       fixup_chv_device_info(devinfo);
 
+   if (devinfo->platform == INTEL_PLATFORM_ADL)
+      fixup_adl_device_info(devinfo);
+
    /* Broadwell PRM says:
     *
     *   "Before Gfx8, there was a historical configuration control field to