[Libva] [Driver PATCH 1/5] dri: cope with drm-state changes

[Zhao Halley]

From: Gwenole Beauchesne <gwenole.beauchesne at intel.com>

---
 src/i965_drv_video.c |    4 ++--
 src/intel_driver.c   |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 src/intel_driver.c

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index bf8450b..81b0738 100755
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -3078,7 +3078,7 @@ i965_PutSurface(VADriverContextP ctx,
         return VA_STATUS_SUCCESS;
 #endif
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     struct i965_render_state *render_state = &i965->render_state;
     struct dri_drawable *dri_drawable;
     union dri_buffer *buffer;
@@ -3091,7 +3091,7 @@ i965_PutSurface(VADriverContextP ctx,
     int pp_flag = 0;
 
     /* Currently don't support DRI1 */
-    if (dri_state->driConnectedFlag != VA_DRI2)
+    if (dri_state->base.type != VA_DRI2)
         return VA_STATUS_ERROR_UNKNOWN;
 
     /* Some broken sources such as H.264 conformance case FM2_SVA_C
diff --git a/src/intel_driver.c b/src/intel_driver.c
old mode 100644
new mode 100755
index 4e6df81..e6aec09
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -50,15 +50,15 @@ Bool
 intel_driver_init(VADriverContextP ctx)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     int has_exec2, has_bsd, has_blt;
 
     assert(dri_state);
-    assert(dri_state->driConnectedFlag == VA_DRI2 || 
-           dri_state->driConnectedFlag == VA_DRI1);
+    assert(dri_state->base.type == VA_DRI2 || 
+           dri_state->base.type == VA_DRI1);
 
-    intel->fd = dri_state->fd;
-    intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
+    intel->fd = dri_state->base.fd;
+    intel->dri2Enabled = (dri_state->base.type == VA_DRI2);
 
     if (!intel->dri2Enabled) {
         return False;
-- 
1.7.5.4