geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some debug #if 0 codes and add a reminder to check locking around 

output enumeration stuff.
main
Jesse Barnes 2007-04-10 09:49:02 -07:00
parent c033698988
commit 8785679f89
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linux-core/drm_crtc.c
View File

@ -116,6 +116,7 @@ bool drm_crtc_in_use(struct drm_crtc *crtc)
{ {
struct drm_output *output; struct drm_output *output;
drm_device_t *dev = crtc->dev; drm_device_t *dev = crtc->dev;
/* FIXME: Locking around list access? */
list_for_each_entry(output, &dev->crtc_config.output_list, head) list_for_each_entry(output, &dev->crtc_config.output_list, head)
if (output->crtc == crtc) if (output->crtc == crtc)
return true; return true;
@ -504,7 +505,7 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
{ {
/* do a hardcoded initial configuration here */ /* do a hardcoded initial configuration here */
struct drm_crtc *crtc, *vga_crtc = NULL, *dvi_crtc = NULL, struct drm_crtc *crtc, *vga_crtc = NULL, *dvi_crtc = NULL,
*lvds_crtc = NULL;; *lvds_crtc = NULL;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct drm_output *output, *use_output = NULL; struct drm_output *output, *use_output = NULL;
@ -517,7 +518,7 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
fb->height = 768; fb->height = 768;
fb->depth = 24; fb->depth = 24;
fb->bits_per_pixel = 32; fb->bits_per_pixel = 32;
/* bind both CRTCs to this fb */ /* bind both CRTCs to this fb */
/* only initialise one crtc to enabled state */ /* only initialise one crtc to enabled state */
list_for_each_entry(crtc, &dev->crtc_config.crtc_list, head) { list_for_each_entry(crtc, &dev->crtc_config.crtc_list, head) {
@ -533,14 +534,12 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
crtc->desired_x = 0; crtc->desired_x = 0;
crtc->desired_y = 0; crtc->desired_y = 0;
} }
#if 0
else if (!dvi_crtc) { else if (!dvi_crtc) {
dvi_crtc = crtc; dvi_crtc = crtc;
crtc->enabled = 1; crtc->enabled = 1;
crtc->desired_x = 0; crtc->desired_x = 0;
crtc->desired_y = 0; crtc->desired_y = 0;
} }
#endif
} }
drm_crtc_probe_output_modes(dev, 1024, 768); drm_crtc_probe_output_modes(dev, 1024, 768);
@ -565,10 +564,8 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
use_output = output; use_output = output;
} else if (!strncmp(output->name, "TMDS", 4)) { } else if (!strncmp(output->name, "TMDS", 4)) {
output->crtc = vga_crtc; output->crtc = vga_crtc;
#if 0
drm_mode_debug_printmodeline(dev, des_mode); drm_mode_debug_printmodeline(dev, des_mode);
output->crtc->desired_mode = des_mode; output->crtc->desired_mode = des_mode;
#endif
output->initial_x = 0; output->initial_x = 0;
output->initial_y = 0; output->initial_y = 0;
} else if (!strncmp(output->name, "LVDS", 3)) { } else if (!strncmp(output->name, "LVDS", 3)) {