diff --git a/src/intel_display.c b/src/intel_display.c index d32224e..2ff8fd5 100644 --- a/src/intel_display.c +++ b/src/intel_display.c @@ -140,6 +140,9 @@ intel_output_backlight_set(xf86OutputPtr output, int level) char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN]; int fd, len, ret; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] enter intel_output_backlight_set(level(=%d))\n", level); + if (level > intel_output->backlight_max) level = intel_output->backlight_max; if (! intel_output->backlight_iface || level < 0) @@ -161,16 +164,24 @@ intel_output_backlight_set(xf86OutputPtr output, int level) "control failed: %s\n", path, strerror(errno)); } + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_backlight_set(level(=%d))\n", level); + close(fd); } static int intel_output_backlight_get(xf86OutputPtr output) { + struct intel_output *intel_output = output->driver_private; char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN]; int fd, level; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] enter intel_output_backlight_get()\n"); + + sprintf(path, "%s/%s/actual_brightness", BACKLIGHT_CLASS, intel_output->backlight_iface); fd = open(path, O_RDONLY); @@ -193,6 +204,13 @@ intel_output_backlight_get(xf86OutputPtr output) level = intel_output->backlight_max; if (level < 0) level = -1; + + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] actual_brightless is %d\n", level); + + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_backlight_get()\n"); + return level; } @@ -877,9 +895,17 @@ intel_output_dpms_backlight(xf86OutputPtr output, int oldmode, int mode) { struct intel_output *intel_output = output->driver_private; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] enter intel_output_dpms_backlight(oldmode(=%d), mode(=%d))\n", oldmode, mode); if (!intel_output->backlight_iface) - return; + { + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] intel_output->backlight_iface == NULL and doesn't call intel_output_backlight_set()\n"); + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_dpms_backlight(oldmode(=%d), mode(=%d))\n", oldmode, mode); + return; + } if (mode == DPMSModeOn) { /* If we're going from off->on we may need to turn on the backlight. */ if (oldmode != DPMSModeOn) @@ -891,6 +917,8 @@ intel_output_dpms_backlight(xf86OutputPtr output, int oldmode, int mode) intel_output->backlight_active_level = intel_output_backlight_get(output); intel_output_backlight_set(output, 0); } + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_dpms_backlight\n"); } static void @@ -1103,6 +1131,9 @@ intel_output_set_property(xf86OutputPtr output, Atom property, struct intel_mode *mode = intel_output->mode; int i; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] enter intel_output_set_property()\n"); + if (property == backlight_atom || property == backlight_deprecated_atom) { INT32 val; @@ -1116,8 +1147,15 @@ intel_output_set_property(xf86OutputPtr output, Atom property, if (val < 0 || val > intel_output->backlight_max) return FALSE; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] dpms_mode(%d) is %s\n", intel_output->dpms_mode, intel_output->dpms_mode==DPMSModeOn ? "ON":"OFF"); + if (intel_output->dpms_mode == DPMSModeOn) intel_output_backlight_set(output, val); + + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] Leave intel_output_set_property()\n"); + intel_output->backlight_active_level = val; return TRUE; } @@ -1138,6 +1176,10 @@ intel_output_set_property(xf86OutputPtr output, Atom property, drmModeConnectorSetProperty(mode->fd, intel_output->output_id, p->mode_prop->prop_id, (uint64_t)val); + + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] Leave intel_output_set_property()\n"); + return TRUE; } else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) { Atom atom; @@ -1154,9 +1196,15 @@ intel_output_set_property(xf86OutputPtr output, Atom property, if (!strcmp(p->mode_prop->enums[j].name, name)) { drmModeConnectorSetProperty(mode->fd, intel_output->output_id, p->mode_prop->prop_id, p->mode_prop->enums[j].value); + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] Leave intel_output_set_property()\n"); + return TRUE; } } + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] Leave intel_output_set_property()\n"); + return FALSE; } } @@ -1165,14 +1213,20 @@ intel_output_set_property(xf86OutputPtr output, Atom property, * to allow the set to continue, otherwise we break setting of * common properties like EDID. */ + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] Leave intel_output_set_property()\n"); + return TRUE; } static Bool intel_output_get_property(xf86OutputPtr output, Atom property) { + struct intel_output *intel_output = output->driver_private; int err; + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] enter intel_output_get_property()\n"); if (property == backlight_atom || property == backlight_deprecated_atom) { INT32 val; @@ -1193,8 +1247,13 @@ intel_output_get_property(xf86OutputPtr output, Atom property) return FALSE; } + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_get_property()\n"); + return TRUE; } + xf86DrvMsg(output->scrn->scrnIndex, X_INFO, + "[xyl] leave intel_output_get_property()\n"); return FALSE; }