OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "msm/drm: Move msm_drm_config configuration into the GPUs"
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
gpu
/
drm
/
msm
/
sde
/
sde_kms.c
diff --git
a/drivers/gpu/drm/msm/sde/sde_kms.c
b/drivers/gpu/drm/msm/sde/sde_kms.c
index
581918d
..
f8c236f
100644
(file)
--- a/
drivers/gpu/drm/msm/sde/sde_kms.c
+++ b/
drivers/gpu/drm/msm/sde/sde_kms.c
@@
-41,10
+41,6
@@
#define CREATE_TRACE_POINTS
#include "sde_trace.h"
#define CREATE_TRACE_POINTS
#include "sde_trace.h"
-static const char * const iommu_ports[] = {
- "mdp_0",
-};
-
/**
* Controls size of event log buffer. Specified as a power of 2.
*/
/**
* Controls size of event log buffer. Specified as a power of 2.
*/
@@
-598,6
+594,7
@@
static int _sde_kms_setup_displays(struct drm_device *dev,
.get_modes = sde_hdmi_connector_get_modes,
.mode_valid = sde_hdmi_mode_valid,
.get_info = sde_hdmi_get_info,
.get_modes = sde_hdmi_connector_get_modes,
.mode_valid = sde_hdmi_mode_valid,
.get_info = sde_hdmi_get_info,
+ .set_property = sde_hdmi_set_property,
};
struct msm_display_info info = {0};
struct drm_encoder *encoder;
};
struct msm_display_info info = {0};
struct drm_encoder *encoder;
@@
-1076,8
+1073,7
@@
static int _sde_kms_mmu_init(struct sde_kms *sde_kms)
sde_kms->aspace[i] = aspace;
sde_kms->aspace[i] = aspace;
- ret = mmu->funcs->attach(mmu, (const char **)iommu_ports,
- ARRAY_SIZE(iommu_ports));
+ ret = mmu->funcs->attach(mmu, NULL, 0);
if (ret) {
SDE_ERROR("failed to attach iommu %d: %d\n", i, ret);
msm_gem_address_space_put(aspace);
if (ret) {
SDE_ERROR("failed to attach iommu %d: %d\n", i, ret);
msm_gem_address_space_put(aspace);