瀏覽代碼

drm/i915: Set fb->dev early on for inherited fbs

We want the fbs inherited from the BIOS to be more or less fully working
prior to actually registering them. This will allow us to just pass the
fb to various helper function instead of having to pass all the
different parameters separately.

Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-18-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Ville Syrjälä 8 年之前
父節點
當前提交
d2e9f5fcc6
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      drivers/gpu/drm/i915/intel_display.c

+ 6 - 0
drivers/gpu/drm/i915/intel_display.c

@@ -8704,6 +8704,8 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
 
 
 	fb = &intel_fb->base;
 	fb = &intel_fb->base;
 
 
+	fb->dev = dev;
+
 	if (INTEL_GEN(dev_priv) >= 4) {
 	if (INTEL_GEN(dev_priv) >= 4) {
 		if (val & DISPPLANE_TILED) {
 		if (val & DISPPLANE_TILED) {
 			plane_config->tiling = I915_TILING_X;
 			plane_config->tiling = I915_TILING_X;
@@ -9734,6 +9736,8 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
 
 
 	fb = &intel_fb->base;
 	fb = &intel_fb->base;
 
 
+	fb->dev = dev;
+
 	val = I915_READ(PLANE_CTL(pipe, 0));
 	val = I915_READ(PLANE_CTL(pipe, 0));
 	if (!(val & PLANE_CTL_ENABLE))
 	if (!(val & PLANE_CTL_ENABLE))
 		goto error;
 		goto error;
@@ -9846,6 +9850,8 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
 
 
 	fb = &intel_fb->base;
 	fb = &intel_fb->base;
 
 
+	fb->dev = dev;
+
 	if (INTEL_GEN(dev_priv) >= 4) {
 	if (INTEL_GEN(dev_priv) >= 4) {
 		if (val & DISPPLANE_TILED) {
 		if (val & DISPPLANE_TILED) {
 			plane_config->tiling = I915_TILING_X;
 			plane_config->tiling = I915_TILING_X;