Rev 6084 | Rev 6283 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6084 | Rev 6088 | ||
|---|---|---|---|
| Line 24... | Line 24... | ||
| 24 | * Eric Anholt |
24 | * Eric Anholt |
| 25 | */ |
25 | */ |
| Line 26... | Line 26... | ||
| 26 | 26 | ||
| 27 | #include |
27 | #include |
| 28 | #include |
28 | #include |
| 29 | //#include |
29 | #include |
| 30 | #include |
30 | #include |
| 31 | #include |
31 | #include |
| 32 | #include |
32 | #include |
| 33 | #include |
33 | #include |
| Line 8063... | Line 8063... | ||
| 8063 | aligned_height = intel_fb_align_height(dev, fb->height, |
8063 | aligned_height = intel_fb_align_height(dev, fb->height, |
| 8064 | fb->pixel_format, |
8064 | fb->pixel_format, |
| 8065 | fb->modifier[0]); |
8065 | fb->modifier[0]); |
| Line 8066... | Line 8066... | ||
| 8066 | 8066 | ||
| 8067 | // plane_config->size = fb->pitches[0] * aligned_height; |
8067 | // plane_config->size = fb->pitches[0] * aligned_height; |
| Line 8068... | Line 8068... | ||
| 8068 | plane_config->size = i915_fbsize*1024*1024; |
8068 | plane_config->size = i915.fbsize*1024*1024; |
| 8069 | 8069 | ||
| 8070 | DRM_DEBUG_KMS("pipe/plane %c/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
8070 | DRM_DEBUG_KMS("pipe/plane %c/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
| 8071 | pipe_name(pipe), plane, fb->width, fb->height, |
8071 | pipe_name(pipe), plane, fb->width, fb->height, |
| Line 9129... | Line 9129... | ||
| 9129 | aligned_height = intel_fb_align_height(dev, fb->height, |
9129 | aligned_height = intel_fb_align_height(dev, fb->height, |
| 9130 | fb->pixel_format, |
9130 | fb->pixel_format, |
| 9131 | fb->modifier[0]); |
9131 | fb->modifier[0]); |
| Line 9132... | Line 9132... | ||
| 9132 | 9132 | ||
| 9133 | // plane_config->size = fb->pitches[0] * aligned_height; |
9133 | // plane_config->size = fb->pitches[0] * aligned_height; |
| Line 9134... | Line 9134... | ||
| 9134 | plane_config->size = i915_fbsize*1024*1024; |
9134 | plane_config->size = i915.fbsize*1024*1024; |
| 9135 | 9135 | ||
| 9136 | DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
9136 | DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
| 9137 | pipe_name(pipe), fb->width, fb->height, |
9137 | pipe_name(pipe), fb->width, fb->height, |
| Line 9228... | Line 9228... | ||
| 9228 | aligned_height = intel_fb_align_height(dev, fb->height, |
9228 | aligned_height = intel_fb_align_height(dev, fb->height, |
| 9229 | fb->pixel_format, |
9229 | fb->pixel_format, |
| 9230 | fb->modifier[0]); |
9230 | fb->modifier[0]); |
| Line 9231... | Line 9231... | ||
| 9231 | 9231 | ||
| 9232 | // plane_config->size = fb->pitches[0] * aligned_height; |
9232 | // plane_config->size = fb->pitches[0] * aligned_height; |
| Line 9233... | Line 9233... | ||
| 9233 | plane_config->size = i915_fbsize*1024*1024; |
9233 | plane_config->size = i915.fbsize*1024*1024; |
| 9234 | 9234 | ||
| 9235 | DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
9235 | DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", |
| 9236 | pipe_name(pipe), fb->width, fb->height, |
9236 | pipe_name(pipe), fb->width, fb->height, |
| Line 13248... | Line 13248... | ||
| 13248 | intel_post_plane_update(intel_crtc); |
13248 | intel_post_plane_update(intel_crtc); |
| 13249 | } |
13249 | } |
| Line 13250... | Line 13250... | ||
| 13250 | 13250 | ||
| Line 13251... | Line 13251... | ||
| 13251 | /* FIXME: add subpixel order */ |
13251 | /* FIXME: add subpixel order */ |
| 13252 | - | ||
| 13253 | // drm_atomic_helper_wait_for_vblanks(dev, state); |
13252 | |
| Line 13254... | Line 13253... | ||
| 13254 | 13253 | drm_atomic_helper_wait_for_vblanks(dev, state); |
|
| 13255 | drm_atomic_helper_cleanup_planes(dev, state); |
13254 | drm_atomic_helper_cleanup_planes(dev, state); |
| Line 14824... | Line 14823... | ||
| 14824 | { |
14823 | { |
| 14825 | struct drm_i915_private *dev_priv = dev->dev_private; |
14824 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 14826 | int sprite, ret; |
14825 | int sprite, ret; |
| 14827 | enum pipe pipe; |
14826 | enum pipe pipe; |
| 14828 | struct intel_crtc *crtc; |
14827 | struct intel_crtc *crtc; |
| 14829 | ENTER(); |
14828 | |
| 14830 | drm_mode_config_init(dev); |
14829 | drm_mode_config_init(dev); |
| Line 14831... | Line 14830... | ||
| 14831 | 14830 | ||
| 14832 | dev->mode_config.min_width = 0; |
14831 | dev->mode_config.min_width = 0; |
| Line 14947... | Line 14946... | ||
| 14947 | main_fb_obj->map_and_fenceable=true; |
14946 | main_fb_obj->map_and_fenceable=true; |
| 14948 | DRM_DEBUG_KMS("main_fb_obj %p gtt_offset 0x%08lx\n", main_fb_obj, i915_gem_obj_ggtt_offset(main_fb_obj)); |
14947 | DRM_DEBUG_KMS("main_fb_obj %p gtt_offset 0x%08lx\n", main_fb_obj, i915_gem_obj_ggtt_offset(main_fb_obj)); |
| 14949 | } |
14948 | } |
| Line 14950... | Line 14949... | ||
| 14950 | 14949 | ||
| 14951 | } |
- | |
| 14952 | - | ||
| 14953 | - | ||
| 14954 | LEAVE(); |
14950 | } |
| Line 14955... | Line 14951... | ||
| 14955 | } |
14951 | } |
| 14956 | 14952 | ||
| 14957 | static void intel_enable_pipe_a(struct drm_device *dev) |
14953 | static void intel_enable_pipe_a(struct drm_device *dev) |