Lines 1-68
Link Here
|
1 |
From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001 |
|
|
2 |
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com> |
3 |
Date: Fri, 06 Apr 2012 15:24:36 +0000 |
4 |
Subject: dri: cope with drm_state changes. |
5 |
|
6 |
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> |
7 |
--- |
8 |
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c |
9 |
index 3bea253..20fed99 100644 |
10 |
--- src/i965_drv_video.c |
11 |
+++ src/i965_drv_video.c |
12 |
@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx, |
13 |
unsigned int flags) /* de-interlacing flags */ |
14 |
{ |
15 |
struct i965_driver_data *i965 = i965_driver_data(ctx); |
16 |
- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; |
17 |
+ struct dri_state *dri_state = (struct dri_state *)ctx->drm_state; |
18 |
struct i965_render_state *render_state = &i965->render_state; |
19 |
struct dri_drawable *dri_drawable; |
20 |
union dri_buffer *buffer; |
21 |
@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx, |
22 |
int pp_flag = 0; |
23 |
|
24 |
/* Currently don't support DRI1 */ |
25 |
- if (dri_state->driConnectedFlag != VA_DRI2) |
26 |
+ if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2) |
27 |
return VA_STATUS_ERROR_UNKNOWN; |
28 |
|
29 |
/* Some broken sources such as H.264 conformance case FM2_SVA_C |
30 |
diff --git a/src/intel_driver.c b/src/intel_driver.c |
31 |
index 4e6df81..b34d9a1 100644 |
32 |
--- src/intel_driver.c |
33 |
+++ src/intel_driver.c |
34 |
@@ -29,7 +29,7 @@ |
35 |
|
36 |
#include <assert.h> |
37 |
|
38 |
-#include <va/va_dricommon.h> |
39 |
+#include <va/va_drmcommon.h> |
40 |
|
41 |
#include "intel_batchbuffer.h" |
42 |
#include "intel_memman.h" |
43 |
@@ -50,15 +50,17 @@ Bool |
44 |
intel_driver_init(VADriverContextP ctx) |
45 |
{ |
46 |
struct intel_driver_data *intel = intel_driver_data(ctx); |
47 |
- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; |
48 |
+ struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state; |
49 |
int has_exec2, has_bsd, has_blt; |
50 |
|
51 |
- assert(dri_state); |
52 |
- assert(dri_state->driConnectedFlag == VA_DRI2 || |
53 |
- dri_state->driConnectedFlag == VA_DRI1); |
54 |
+ assert(drm_state); |
55 |
+ assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 || |
56 |
+ drm_state->auth_type == VA_DRM_AUTH_DRI2 || |
57 |
+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); |
58 |
|
59 |
- intel->fd = dri_state->fd; |
60 |
- intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2); |
61 |
+ intel->fd = drm_state->fd; |
62 |
+ intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 || |
63 |
+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); |
64 |
|
65 |
if (!intel->dri2Enabled) { |
66 |
return False; |
67 |
-- |
68 |
cgit v0.9.0.2-2-gbebe |