An electronic device is provided, with a display and a display-integrated light sensor. The display includes a transparent cover layer, light-generating layers, and a touch-sensitive layer. The display-integrated light sensor is interposed between the transparent cover layer and a display layer such as the touch-sensitive layer or a thin-film transistor layer of the light-generating layers. The light-generating layers include a layer of organic light-emitting material. The display-integrated light sensor can be implemented as an ambient light sensor or a proximity sensor. The display-integrated light sensor may be a packaged light sensor that is integrated into the display layers of the display or may be formed from light-sensor components formed directly on a display circuitry layer such as the touch-sensitive layer or the thin-film transistor layer.