As intel_fb_plane_get_subsampling() returns the subsampling factor wrt. its main plane, for a CCS plane we need to apply both the main and the CCS plane's subsampling factor on the FB's dimensions to get the CCS plane's dimensions.
Unified · Split
| @@ -2913,11 +2913,15 @@ intel_fb_check_ccs_xy(struct drm_framebuffer *fb, int ccs_plane, int x, int y) · 2912 unmodified lines | |||
| 2913 | static void | 2913 | static void |
| 2914 | intel_fb_plane_dims(int *w, int *h, struct drm_framebuffer *fb, int color_plane) | 2914 | intel_fb_plane_dims(int *w, int *h, struct drm_framebuffer *fb, int color_plane) |
| 2915 | { | 2915 | { |
| 2916 | int main_plane = is_ccs_plane(fb, color_plane) ? | ||
| 2917 | ccs_to_main_plane(fb, color_plane) : 0; | ||
| 2918 | int main_hsub, main_vsub; | ||
| 2916 | int hsub, vsub; | 2919 | int hsub, vsub; |
| 2917 | 2920 | ||
| 2921 | intel_fb_plane_get_subsampling(&main_hsub, &main_vsub, fb, main_plane); | ||
| 2918 | intel_fb_plane_get_subsampling(&hsub, &vsub, fb, color_plane); | 2922 | intel_fb_plane_get_subsampling(&hsub, &vsub, fb, color_plane); |
| 2919 | *w = fb->width / hsub; | 2923 | *w = fb->width / main_hsub / hsub; |
| 2920 | *h = fb->height / vsub; | 2924 | *h = fb->height / main_vsub / vsub; |
| 2921 | } | 2925 | } |
| 2922 | 2926 | ||
| 2923 | /* | 2927 | /* |